Merge branch 'armsoc/for-3.11/dt' of git://github.com/broadcom/bcm11351 into next/dt

From Christian Daudt:

* 'armsoc/for-3.11/dt' of git://github.com/broadcom/bcm11351:
  ARM: dts: bcm281xx: change comment to C89 style
  ARM: mmc: bcm281xx SDHCI driver (dt mods)
  ARM: dts: bcm281xx: use existing defines for irqs
  ARM: dts: bcm281xx: use #include for device tree files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

3 files changed, 69 insertions, 5 deletions

diff --git a/Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt b/Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt
new file mode 100644
index 000000000000..094ae010f2fb
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt
@@ -0,0 +1,16 @@
+Broadcom BCM281xx SDHCI
+
+This file documents differences between the core properties in mmc.txt
+and the properties present in the bcm281xx SDHCI
+
+Required properties:
+- compatible : Should be "bcm,kona-sdhci"
+
+Example:
+
+sdio2: sdio@0x3f1a0000 {
+        compatible = "bcm,kona-sdhci";
+        reg = <0x3f1a0000 0x10000>;
+        interrupts = <0x0 74 0x4>;
+};
+
diff --git a/arch/arm/boot/dts/bcm11351-brt.dts b/arch/arm/boot/dts/bcm11351-brt.dts
index 248067cf7069..67ec524098b5 100644
--- a/arch/arm/boot/dts/bcm11351-brt.dts
+++ b/arch/arm/boot/dts/bcm11351-brt.dts
@@ -13,7 +13,7 @@
 
 /dts-v1/;
 
-/include/ "bcm11351.dtsi"
+#include "bcm11351.dtsi"
 
 / {
         model = "BCM11351 BRT board";
@@ -27,4 +27,21 @@
                 status = "okay";
         };
 
+        sdio0: sdio@0x3f180000 {
+                max-frequency = <48000000>;
+                status = "okay";
+        };
+
+        sdio1: sdio@0x3f190000 {
+                non-removable;
+                max-frequency = <48000000>;
+                status = "okay";
+        };
+
+        sdio3: sdio@0x3f1b0000 {
+                max-frequency = <48000000>;
+                status = "okay";
+        };
+
+
 };
diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
index 41b2c6c33f09..17979d5f23b4 100644
--- a/arch/arm/boot/dts/bcm11351.dtsi
+++ b/arch/arm/boot/dts/bcm11351.dtsi
@@ -11,7 +11,10 @@
  * GNU General Public License for more details.
  */
 
-/include/ "skeleton.dtsi"
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+#include "skeleton.dtsi"
 
 / {
         model = "BCM11351 SoC";
@@ -33,7 +36,7 @@
 
         smc@0x3404c000 {
                 compatible = "bcm,bcm11351-smc", "bcm,kona-smc";
-                reg = <0x3404c000 0x400>; //1 KiB in SRAM
+                reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */
         };
 
         uart@3e000000 {
@@ -41,7 +44,7 @@
                 status = "disabled";
                 reg = <0x3e000000 0x1000>;
                 clock-frequency = <13000000>;
-                interrupts = <0x0 67 0x4>;
+                interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
                 reg-shift = <2>;
                 reg-io-width = <4>;
         };
@@ -56,8 +59,36 @@
         timer@35006000 {
                 compatible = "bcm,kona-timer";
                 reg = <0x35006000 0x1000>;
-                interrupts = <0x0 7 0x4>;
+                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
                 clock-frequency = <32768>;
         };
 
+        sdio0: sdio@0x3f180000 {
+                compatible = "bcm,kona-sdhci";
+                reg = <0x3f180000 0x10000>;
+                interrupts = <0x0 77 0x4>;
+                status = "disabled";
+        };
+
+        sdio1: sdio@0x3f190000 {
+                compatible = "bcm,kona-sdhci";
+                reg = <0x3f190000 0x10000>;
+                interrupts = <0x0 76 0x4>;
+                status = "disabled";
+        };
+
+        sdio2: sdio@0x3f1a0000 {
+                compatible = "bcm,kona-sdhci";
+                reg = <0x3f1a0000 0x10000>;
+                interrupts = <0x0 74 0x4>;
+                status = "disabled";
+        };
+
+        sdio3: sdio@0x3f1b0000 {
+                compatible = "bcm,kona-sdhci";
+                reg = <0x3f1b0000 0x10000>;
+                interrupts = <0x0 73 0x4>;
+                status = "disabled";
+        };
+
 };