1 From cf6eb4599d60cb9fa81465aa018c71d11e19ea6a Mon Sep 17 00:00:00 2001
2 From: Simon Baatz <gmbnomis@gmail.com>
3 Date: Mon, 13 May 2013 23:18:58 +0200
4 Subject: [PATCH 002/203] ARM: mvebu: Use standard MMC binding for all users of
7 In order to prepare the switch to the standard MMC device tree parser
8 for mvsdio, adapt all current uses of mvsdio in the dts files to the
11 Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
12 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
14 arch/arm/boot/dts/armada-370-db.dts | 1 +
15 arch/arm/boot/dts/armada-370-mirabox.dts | 1 +
16 arch/arm/boot/dts/armada-370-rd.dts | 1 +
17 arch/arm/boot/dts/armada-370-xp.dtsi | 4 ++++
18 arch/arm/boot/dts/armada-xp-db.dts | 1 +
19 arch/arm/boot/dts/kirkwood-dreamplug.dts | 1 +
20 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | 2 ++
21 arch/arm/boot/dts/kirkwood-mplcec4.dts | 2 +-
22 arch/arm/boot/dts/kirkwood-topkick.dts | 1 +
23 arch/arm/boot/dts/kirkwood.dtsi | 4 ++++
24 10 files changed, 17 insertions(+), 1 deletion(-)
26 --- a/arch/arm/boot/dts/armada-370-db.dts
27 +++ b/arch/arm/boot/dts/armada-370-db.dts
31 /* No CD or WP GPIOs */
36 --- a/arch/arm/boot/dts/armada-370-mirabox.dts
37 +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
39 * No CD or WP GPIOs: SDIO interface used for
46 --- a/arch/arm/boot/dts/armada-370-rd.dts
47 +++ b/arch/arm/boot/dts/armada-370-rd.dts
49 pinctrl-names = "default";
51 /* No CD or WP GPIOs */
56 --- a/arch/arm/boot/dts/armada-370-xp.dtsi
57 +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
59 reg = <0xd4000 0x200>;
61 clocks = <&gateclk 17>;
69 --- a/arch/arm/boot/dts/armada-xp-db.dts
70 +++ b/arch/arm/boot/dts/armada-xp-db.dts
72 pinctrl-names = "default";
74 /* No CD or WP GPIOs */
79 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
80 +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
82 pinctrl-names = "default";
84 /* No CD or WP GPIOs */
89 --- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
90 +++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
95 + /* No CD or WP GPIOs */
100 --- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
101 +++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
103 pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;
104 pinctrl-names = "default";
106 - cd-gpios = <&gpio1 15 0>;
107 + cd-gpios = <&gpio1 15 1>;
111 --- a/arch/arm/boot/dts/kirkwood-topkick.dts
112 +++ b/arch/arm/boot/dts/kirkwood-topkick.dts
114 pinctrl-names = "default";
116 /* No CD or WP GPIOs */
121 --- a/arch/arm/boot/dts/kirkwood.dtsi
122 +++ b/arch/arm/boot/dts/kirkwood.dtsi
124 reg = <0x90000 0x200>;
126 clocks = <&gate_clk 4>;