Merge git://git.denx.de/u-boot-video

[oweals/u-boot.git] / arch / arm / dts / armada-ap806.dtsi

diff --git a/arch/arm/dts/armada-ap806.dtsi b/arch/arm/dts/armada-ap806.dtsi
index efb383b9f394cd29bdc3e5e67bff778bd3e14852..e0d301682b957b329e0922e7725eb634c42821f2 100644 (file)
--- a/arch/arm/dts/armada-ap806.dtsi
+++ b/arch/arm/dts/armada-ap806.dtsi
@@ -158,6 +158,14 @@
                                };
                        };
 
+                       ap_gpio0: gpio@6F5040 {
+                               compatible = "marvell,orion-gpio";
+                               reg = <0x6F5040 0x40>;
+                               ngpios = <20>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                       };
+
                        xor@400000 {
                                compatible = "marvell,mv-xor-v2";
                                reg = <0x400000 0x1000>,
@@ -234,6 +242,14 @@
 
                        };
 
+                       ap_sdhci0: sdhci@6e0000 {
+                               compatible = "marvell,armada-8k-sdhci";
+                               reg = <0x6e0000 0x300>;
+                               interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+                               dma-coherent;
+                               status = "disabled";
+                       };
+
                        ap_syscon: system-controller@6f4000 {
                                compatible = "marvell,ap806-system-controller",
                                             "syscon";