mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
195 lines
4.5 KiB
Diff
195 lines
4.5 KiB
Diff
From a1905aed89ee45f6662f03b77dc604ff1a169671 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Wahren <wahrenst@gmx.net>
|
|
Date: Tue, 17 Sep 2019 19:16:17 +0200
|
|
Subject: [PATCH] ARM: dts: bcm283x: Define MMC interfaces at board
|
|
level
|
|
|
|
commit e7774049ff255c8ba72bcee9c7ab307a95e8d7bc upstream.
|
|
|
|
Starting with RPi 4 this is the first board, which doesn't use sdhost
|
|
as default SD interface. So the MMC interfaces should be defined finally at
|
|
board level. Since all boards using sdhci already does this, we can drop the
|
|
pinctrl part from bcm2835-rpi.dtsi.
|
|
|
|
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
|
|
Acked-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 7 +++++++
|
|
arch/arm/boot/dts/bcm2835-rpi-a.dts | 7 +++++++
|
|
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 7 +++++++
|
|
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 7 +++++++
|
|
arch/arm/boot/dts/bcm2835-rpi-b.dts | 7 +++++++
|
|
arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 7 +++++++
|
|
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 7 +++++++
|
|
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 7 +++++++
|
|
arch/arm/boot/dts/bcm2835-rpi.dtsi | 13 -------------
|
|
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 7 +++++++
|
|
10 files changed, 63 insertions(+), 13 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
|
@@ -108,6 +108,13 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&sdhost {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio14>;
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
|
@@ -103,6 +103,13 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&sdhost {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio14>;
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
|
@@ -110,6 +110,13 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&sdhost {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio14>;
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
|
@@ -103,6 +103,13 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&sdhost {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio14>;
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
|
@@ -98,6 +98,13 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&sdhost {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio14>;
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
|
|
@@ -81,6 +81,13 @@
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
};
|
|
|
|
+&sdhost {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio14>;
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
|
|
@@ -129,6 +129,13 @@
|
|
};
|
|
};
|
|
|
|
+&sdhost {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio32 &uart0_ctsrts_gpio30>;
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
|
|
@@ -105,6 +105,13 @@
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
};
|
|
|
|
+&sdhost {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio14>;
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
@@ -84,19 +84,6 @@
|
|
status = "okay";
|
|
};
|
|
|
|
-&sdhci {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&emmc_gpio48>;
|
|
- bus-width = <4>;
|
|
-};
|
|
-
|
|
-&sdhost {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&sdhost_gpio48>;
|
|
- status = "okay";
|
|
- bus-width = <4>;
|
|
-};
|
|
-
|
|
&usb {
|
|
power-domains = <&power RPI_POWER_DOMAIN_USB>;
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
|
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
|
@@ -48,6 +48,13 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&sdhost {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio14>;
|