ARM: bcm2835: add SDHCI node to DT

Add the SDHCI device node to the SoC DT file. Add a dummy fixed-clock
to satisfy the SDHCI driver's clock lookup; eventually this should be
replaced by a real clock implementation. Add board specific properties
to the Raspberry Pi board file.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 6ff26f99cacd1cb86e733eab8d574e509e275c48..0544ef86062319250da5f2d3d5d3220f1945791f 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -24,3 +24,8 @@
                brcm,function = <7>; /* alt3 */
        };
 };
+
+&sdhci {
+       status = "okay";
+       bus-width = <4>;
+};

diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 8917550fd1bbd0f632e4739f2a477c8455af6f94..1d7e4f5c0b1e1748853e999f53d2770222a97a2c 100644 (file)
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -63,5 +63,19 @@
                        interrupt-controller;
                        #interrupt-cells = <2>;
                };
+
+               sdhci: sdhci {
+                       compatible = "brcm,bcm2835-sdhci";
+                       reg = <0x7e300000 0x100>;
+                       interrupts = <2 30>;
+                       clocks = <&clk_mmc>;
+                       status = "disabled";
+               };
+       };
+
+       clk_mmc: clock {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <100000000>;
        };
 };