git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From a1905aed89ee45f6662f03b77dc604ff1a169671 Mon Sep 17 00:00:00 2001
   2 From: Stefan Wahren <wahrenst@gmx.net>
   3 Date: Tue, 17 Sep 2019 19:16:17 +0200
   4 Subject: [PATCH] ARM: dts: bcm283x: Define MMC interfaces at board
   5  level
   6
   7 commit e7774049ff255c8ba72bcee9c7ab307a95e8d7bc upstream.
   8
   9 Starting with RPi 4 this is the first board, which doesn't use sdhost
  10 as default SD interface. So the MMC interfaces should be defined finally at
  11 board level. Since all boards using sdhci already does this, we can drop the
  12 pinctrl part from bcm2835-rpi.dtsi.
  13
  14 Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  15 Acked-by: Eric Anholt <eric@anholt.net>
  16 ---
  17  arch/arm/boot/dts/bcm2835-rpi-a-plus.dts  |  7 +++++++
  18  arch/arm/boot/dts/bcm2835-rpi-a.dts       |  7 +++++++
  19  arch/arm/boot/dts/bcm2835-rpi-b-plus.dts  |  7 +++++++
  20  arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts  |  7 +++++++
  21  arch/arm/boot/dts/bcm2835-rpi-b.dts       |  7 +++++++
  22  arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts |  7 +++++++
  23  arch/arm/boot/dts/bcm2835-rpi-zero-w.dts  |  7 +++++++
  24  arch/arm/boot/dts/bcm2835-rpi-zero.dts    |  7 +++++++
  25  arch/arm/boot/dts/bcm2835-rpi.dtsi        | 13 -------------
  26  arch/arm/boot/dts/bcm2836-rpi-2-b.dts     |  7 +++++++
  27  10 files changed, 63 insertions(+), 13 deletions(-)
  28
  29 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
  30 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
  31 @@ -108,6 +108,13 @@
  32         status = "okay";
  33  };
  34
  35 +&sdhost {
  36 +       pinctrl-names = "default";
  37 +       pinctrl-0 = <&sdhost_gpio48>;
  38 +       bus-width = <4>;
  39 +       status = "okay";
  40 +};
  41 +
  42  &uart0 {
  43         pinctrl-names = "default";
  44         pinctrl-0 = <&uart0_gpio14>;
  45 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
  46 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
  47 @@ -103,6 +103,13 @@
  48         status = "okay";
  49  };
  50
  51 +&sdhost {
  52 +       pinctrl-names = "default";
  53 +       pinctrl-0 = <&sdhost_gpio48>;
  54 +       bus-width = <4>;
  55 +       status = "okay";
  56 +};
  57 +
  58  &uart0 {
  59         pinctrl-names = "default";
  60         pinctrl-0 = <&uart0_gpio14>;
  61 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
  62 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
  63 @@ -110,6 +110,13 @@
  64         status = "okay";
  65  };
  66
  67 +&sdhost {
  68 +       pinctrl-names = "default";
  69 +       pinctrl-0 = <&sdhost_gpio48>;
  70 +       bus-width = <4>;
  71 +       status = "okay";
  72 +};
  73 +
  74  &uart0 {
  75         pinctrl-names = "default";
  76         pinctrl-0 = <&uart0_gpio14>;
  77 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
  78 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
  79 @@ -103,6 +103,13 @@
  80         status = "okay";
  81  };
  82
  83 +&sdhost {
  84 +       pinctrl-names = "default";
  85 +       pinctrl-0 = <&sdhost_gpio48>;
  86 +       bus-width = <4>;
  87 +       status = "okay";
  88 +};
  89 +
  90  &uart0 {
  91         pinctrl-names = "default";
  92         pinctrl-0 = <&uart0_gpio14>;
  93 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
  94 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
  95 @@ -98,6 +98,13 @@
  96         status = "okay";
  97  };
  98
  99 +&sdhost {
 100 +       pinctrl-names = "default";
 101 +       pinctrl-0 = <&sdhost_gpio48>;
 102 +       bus-width = <4>;
 103 +       status = "okay";
 104 +};
 105 +
 106  &uart0 {
 107         pinctrl-names = "default";
 108         pinctrl-0 = <&uart0_gpio14>;
 109 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
 110 +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
 111 @@ -81,6 +81,13 @@
 112         hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 113  };
 114
 115 +&sdhost {
 116 +       pinctrl-names = "default";
 117 +       pinctrl-0 = <&sdhost_gpio48>;
 118 +       bus-width = <4>;
 119 +       status = "okay";
 120 +};
 121 +
 122  &uart0 {
 123         pinctrl-names = "default";
 124         pinctrl-0 = <&uart0_gpio14>;
 125 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
 126 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
 127 @@ -129,6 +129,13 @@
 128         };
 129  };
 130
 131 +&sdhost {
 132 +       pinctrl-names = "default";
 133 +       pinctrl-0 = <&sdhost_gpio48>;
 134 +       bus-width = <4>;
 135 +       status = "okay";
 136 +};
 137 +
 138  &uart0 {
 139         pinctrl-names = "default";
 140         pinctrl-0 = <&uart0_gpio32 &uart0_ctsrts_gpio30>;
 141 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 142 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 143 @@ -105,6 +105,13 @@
 144         hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 145  };
 146
 147 +&sdhost {
 148 +       pinctrl-names = "default";
 149 +       pinctrl-0 = <&sdhost_gpio48>;
 150 +       bus-width = <4>;
 151 +       status = "okay";
 152 +};
 153 +
 154  &uart0 {
 155         pinctrl-names = "default";
 156         pinctrl-0 = <&uart0_gpio14>;
 157 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
 158 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
 159 @@ -84,19 +84,6 @@
 160         status = "okay";
 161  };
 162
 163 -&sdhci {
 164 -       pinctrl-names = "default";
 165 -       pinctrl-0 = <&emmc_gpio48>;
 166 -       bus-width = <4>;
 167 -};
 168 -
 169 -&sdhost {
 170 -       pinctrl-names = "default";
 171 -       pinctrl-0 = <&sdhost_gpio48>;
 172 -       status = "okay";
 173 -       bus-width = <4>;
 174 -};
 175 -
 176  &usb {
 177         power-domains = <&power RPI_POWER_DOMAIN_USB>;
 178  };
 179 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 180 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 181 @@ -48,6 +48,13 @@
 182         status = "okay";
 183  };
 184
 185 +&sdhost {
 186 +       pinctrl-names = "default";
 187 +       pinctrl-0 = <&sdhost_gpio48>;
 188 +       bus-width = <4>;
 189 +       status = "okay";
 190 +};
 191 +
 192  &uart0 {
 193         pinctrl-names = "default";
 194         pinctrl-0 = <&uart0_gpio14>;