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 d315b29cd0583213488a5018913414474904b024..e0d301682b957b329e0922e7725eb634c42821f2 100644 (file)
--- a/arch/arm/dts/armada-ap806.dtsi
+++ b/arch/arm/dts/armada-ap806.dtsi
@@ -140,6 +140,32 @@
                                marvell,spi-base = <128>, <136>, <144>, <152>;
                        };
 
+                       ap_pinctl: ap-pinctl@6F4000 {
+                               compatible = "marvell,armada-ap806-pinctrl";
+                               bank-name ="apn-806";
+                               reg = <0x6F4000 0x10>;
+                               pin-count = <20>;
+                               max-func = <3>;
+
+                               ap_i2c0_pins: i2c-pins-0 {
+                                       marvell,pins = < 4 5 >;
+                                       marvell,function = <3>;
+                               };
+                               ap_emmc_pins: emmc-pins-0 {
+                                       marvell,pins = < 0 1 2 3 4 5 6 7
+                                                        8 9 10 >;
+                                       marvell,function = <1>;
+                               };
+                       };
+
+                       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>,
@@ -216,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";