Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / arch / arm / boot / dts / armada-xp.dtsi

diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index e170713..62c3ba9 100644 (file)
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -35,6 +35,11 @@
                };
 
                internal-regs {
+                       sdramc@1400 {
+                               compatible = "marvell,armada-xp-sdram-controller";
+                               reg = <0x1400 0x500>;
+                       };
+
                        L2: l2-cache {
                                compatible = "marvell,aurora-system-cache";
                                reg = <0x08000 0x1000>;
@@ -43,6 +48,11 @@
                                wt-override;
                        };
 
+                       spi0: spi@10600 {
+                               pinctrl-0 = <&spi0_pins>;
+                               pinctrl-names = "default";
+                       };
+
                        i2c0: i2c@11000 {
                                compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
                                reg = <0x11000 0x100>;
@@ -53,8 +63,10 @@
                                reg = <0x11100 0x100>;
                        };
 
-                       serial@12200 {
+                       uart2: serial@12200 {
                                compatible = "snps,dw-apb-uart";
+                               pinctrl-0 = <&uart2_pins>;
+                               pinctrl-names = "default";
                                reg = <0x12200 0x100>;
                                reg-shift = <2>;
                                interrupts = <43>;
@@ -62,8 +74,11 @@
                                clocks = <&coreclk 0>;
                                status = "disabled";
                        };
-                       serial@12300 {
+
+                       uart3: serial@12300 {
                                compatible = "snps,dw-apb-uart";
+                               pinctrl-0 = <&uart3_pins>;
+                               pinctrl-names = "default";
                                reg = <0x12300 0x100>;
                                reg-shift = <2>;
                                interrupts = <44>;
@@ -200,3 +215,54 @@
                };
        };
 };
+
+&pinctrl {
+       ge0_gmii_pins: ge0-gmii-pins {
+               marvell,pins =
+                    "mpp0",  "mpp1",  "mpp2",  "mpp3",
+                    "mpp4",  "mpp5",  "mpp6",  "mpp7",
+                    "mpp8",  "mpp9",  "mpp10", "mpp11",
+                    "mpp12", "mpp13", "mpp14", "mpp15",
+                    "mpp16", "mpp17", "mpp18", "mpp19",
+                    "mpp20", "mpp21", "mpp22", "mpp23";
+               marvell,function = "ge0";
+       };
+
+       ge0_rgmii_pins: ge0-rgmii-pins {
+               marvell,pins =
+                    "mpp0", "mpp1", "mpp2", "mpp3",
+                    "mpp4", "mpp5", "mpp6", "mpp7",
+                    "mpp8", "mpp9", "mpp10", "mpp11";
+               marvell,function = "ge0";
+       };
+
+       ge1_rgmii_pins: ge1-rgmii-pins {
+               marvell,pins =
+                    "mpp12", "mpp13", "mpp14", "mpp15",
+                    "mpp16", "mpp17", "mpp18", "mpp19",
+                    "mpp20", "mpp21", "mpp22", "mpp23";
+               marvell,function = "ge1";
+       };
+
+       sdio_pins: sdio-pins {
+               marvell,pins = "mpp30", "mpp31", "mpp32",
+                              "mpp33", "mpp34", "mpp35";
+               marvell,function = "sd0";
+       };
+
+       spi0_pins: spi0-pins {
+               marvell,pins = "mpp36", "mpp37",
+                              "mpp38", "mpp39";
+               marvell,function = "spi";
+       };
+
+       uart2_pins: uart2-pins {
+               marvell,pins = "mpp42", "mpp43";
+               marvell,function = "uart2";
+       };
+
+       uart3_pins: uart3-pins {
+               marvell,pins = "mpp44", "mpp45";
+               marvell,function = "uart3";
+       };
+};