1 From 702070d58bb61bcdcc46f28b6cef7f269ef14c3e Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Tue, 8 Dec 2015 16:23:33 +0000
4 Subject: [PATCH 221/222] bcm270x_dt: Use the sdhost MMC controller by default
6 The "mmc" overlay reverts to using the other controller.
8 arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 11 ++++--
9 arch/arm/boot/dts/bcm2708-rpi-b.dts | 11 ++++--
10 arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 14 ++++++--
11 arch/arm/boot/dts/bcm2708_common.dtsi | 13 +++++++
12 arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 11 ++++--
13 arch/arm/boot/dts/overlays/mmc-overlay.dts | 22 +++++++++++-
14 arch/arm/boot/dts/overlays/sdhost-overlay.dts | 49 ++++++---------------------
15 arch/arm/boot/dts/overlays/sdio-overlay.dts | 1 -
16 8 files changed, 84 insertions(+), 48 deletions(-)
18 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
19 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
24 + sdhost_pins: sdhost_pins {
25 + brcm,pins = <48 49 50 51 52 53>;
26 + brcm,function = <4>; /* alt0 */
29 spi0_pins: spi0_pins {
30 brcm,pins = <7 8 9 10 11>;
31 brcm,function = <4>; /* alt0 */
39 + pinctrl-names = "default";
40 + pinctrl-0 = <&sdhost_pins>;
46 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
47 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
52 + sdhost_pins: sdhost_pins {
53 + brcm,pins = <48 49 50 51 52 53>;
54 + brcm,function = <4>; /* alt0 */
57 spi0_pins: spi0_pins {
58 brcm,pins = <7 8 9 10 11>;
59 brcm,function = <4>; /* alt0 */
67 + pinctrl-names = "default";
68 + pinctrl-0 = <&sdhost_pins>;
74 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
75 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
77 /include/ "bcm2708.dtsi"
80 + sdhost_pins: sdhost_pins {
81 + brcm,pins = <48 49 50 51 52 53>;
82 + brcm,function = <4>; /* alt0 */
96 + pinctrl-names = "default";
97 + pinctrl-0 = <&sdhost_pins>;
104 --- a/arch/arm/boot/dts/bcm2708_common.dtsi
105 +++ b/arch/arm/boot/dts/bcm2708_common.dtsi
118 + sdhost: sdhost@7e202000 {
119 + compatible = "brcm,bcm2835-sdhost";
120 + reg = <0x7e202000 0x100>;
121 + interrupts = <2 24>;
122 + clocks = <&clk_core>;
125 + dma-names = "tx", "rx";
126 + brcm,pio-limit = <1>;
127 + status = "disabled";
131 compatible = "brcm,bcm2708-i2s";
132 reg = <0x7e203000 0x24>,
133 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
134 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
139 + sdhost_pins: sdhost_pins {
140 + brcm,pins = <48 49 50 51 52 53>;
141 + brcm,function = <4>; /* alt0 */
144 spi0_pins: spi0_pins {
145 brcm,pins = <7 8 9 10 11>;
146 brcm,function = <4>; /* alt0 */
154 + pinctrl-names = "default";
155 + pinctrl-0 = <&sdhost_pins>;
161 --- a/arch/arm/boot/dts/overlays/mmc-overlay.dts
162 +++ b/arch/arm/boot/dts/overlays/mmc-overlay.dts
169 + pinctrl-names = "default";
170 + pinctrl-0 = <&mmc_pins>;
172 brcm,overclock-50 = <0>;
180 + mmc_pins: mmc_pins {
181 + brcm,pins = <48 49 50 51 52 53>;
182 + brcm,function = <7>; /* alt3 */
188 + target = <&sdhost>;
190 + status = "disabled";
194 --- a/arch/arm/boot/dts/overlays/sdhost-overlay.dts
195 +++ b/arch/arm/boot/dts/overlays/sdhost-overlay.dts
197 compatible = "brcm,bcm2708";
203 - #address-cells = <1>;
206 - sdhost: sdhost@7e202000 {
207 - compatible = "brcm,bcm2835-sdhost";
208 - reg = <0x7e202000 0x100>;
209 - pinctrl-names = "default";
210 - pinctrl-0 = <&sdhost_pins>;
211 - interrupts = <2 24>;
212 - clocks = <&clk_core>;
215 - dma-names = "tx", "rx";
216 - brcm,delay-after-stop = <0>;
217 - brcm,overclock-50 = <0>;
218 - brcm,pio-limit = <1>;
221 + status = "disabled";
228 - sdhost_pins: sdhost_pins {
229 - brcm,pins = <48 49 50 51 52 53>;
230 - brcm,function = <4>; /* alt0 */
238 - /* Find a way to disable the other driver */
240 - status = "disabled";
241 + target = <&sdhost>;
242 + frag1: __overlay__ {
243 + brcm,overclock-50 = <0>;
244 + brcm,pio-limit = <1>;
250 - overclock_50 = <&sdhost>,"brcm,overclock-50:0";
251 - force_pio = <&sdhost>,"brcm,force-pio?";
252 - pio_limit = <&sdhost>,"brcm,pio-limit:0";
253 - debug = <&sdhost>,"brcm,debug?";
254 + overclock_50 = <&frag1>,"brcm,overclock-50:0";
255 + force_pio = <&frag1>,"brcm,force-pio?";
256 + pio_limit = <&frag1>,"brcm,pio-limit:0";
257 + debug = <&frag1>,"brcm,debug?";
260 --- a/arch/arm/boot/dts/overlays/sdio-overlay.dts
261 +++ b/arch/arm/boot/dts/overlays/sdio-overlay.dts
265 sdio_mmc: __overlay__ {
266 - compatible = "brcm,bcm2835-mmc";
267 pinctrl-names = "default";
268 pinctrl-0 = <&sdio_pins>;