Skip to content

Commit

Permalink
ARM: dts: bcm283x: Define MMC interfaces at board level
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Eric Anholt <[email protected]>
  • Loading branch information
lategoodbye committed Aug 12, 2019
1 parent 939b482 commit e777404
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 13 deletions.
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@
status = "okay";
};

&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2835-rpi-a.dts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@
status = "okay";
};

&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@
status = "okay";
};

&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@
status = "okay";
};

&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2835-rpi-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@
status = "okay";
};

&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,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>;
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2835-rpi-zero.dts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,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>;
Expand Down
13 changes: 0 additions & 13 deletions arch/arm/boot/dts/bcm2835-rpi.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,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>;
};
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2836-rpi-2-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@
status = "okay";
};

&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@
hpd-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
};

&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
Expand Down

0 comments on commit e777404

Please sign in to comment.