ARM: dts: kirkwood: add kirkwood-km_common DTSI files

This file allows to factor the common parts between the various Keymile
Kirkwood Designs.

kirkwood-km_common configures the peripherals that are currently
common to all our Kirkwood designs: PCIe, pinctrl, bitbang I2C, NAND
Flash controller.

The kirkwood-km_kirkwood file is then changed to include this common
file.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Link: https://lkml.kernel.org/r/1400230143-15620-3-git-send-email-valentin.longchamp@keymile.com
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-km_common.dtsi b/arch/arm/boot/dts/kirkwood-km_common.dtsi
new file mode 100644 (file)
index 0000000..8367c77
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-km_common.dtsi
@@ -0,0 +1,48 @@
+/ {
+       chosen {
+               bootargs = "console=ttyS0,115200n8 earlyprintk";
+               stdout-path = &uart0;
+       };
+
+       mbus {
+               pcie-controller {
+                       status = "okay";
+
+                       pcie@1,0 {
+                               status = "okay";
+                       };
+               };
+       };
+
+       ocp@f1000000 {
+               pinctrl: pin-controller@10000 {
+                       pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
+                       pinctrl-names = "default";
+
+                       pmx_i2c_gpio_sda: pmx-gpio-sda {
+                               marvell,pins = "mpp8";
+                               marvell,function = "gpio";
+                       };
+                       pmx_i2c_gpio_scl: pmx-gpio-scl {
+                               marvell,pins = "mpp9";
+                               marvell,function = "gpio";
+                       };
+               };
+
+               serial@12000 {
+                       status = "okay";
+               };
+       };
+
+       i2c@0 {
+               compatible = "i2c-gpio";
+               gpios = < &gpio0 8 GPIO_ACTIVE_HIGH             /* sda */
+                         &gpio0 9 GPIO_ACTIVE_HIGH>;           /* scl */
+               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
+       };
+};
+
+&nand {
+       status = "okay";
+       chip-delay = <25>;
+};

diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index 61139bf309858cba22f6c678e087fdd7e5cdd32c..235bf382fff936fce858296c7357a37811146595 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -2,6 +2,7 @@
 
 #include "kirkwood.dtsi"
 #include "kirkwood-98dx4122.dtsi"
+#include "kirkwood-km_common.dtsi"
 
 / {
        model = "Keymile Kirkwood Reference Design";
@@ -11,43 +12,6 @@
                device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
-
-       chosen {
-               bootargs = "console=ttyS0,115200n8 earlyprintk";
-               stdout-path = &uart0;
-       };
-
-       ocp@f1000000 {
-               pinctrl: pin-controller@10000 {
-                       pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
-                       pinctrl-names = "default";
-
-                       pmx_i2c_gpio_sda: pmx-gpio-sda {
-                               marvell,pins = "mpp8";
-                               marvell,function = "gpio";
-                       };
-                       pmx_i2c_gpio_scl: pmx-gpio-scl {
-                               marvell,pins = "mpp9";
-                               marvell,function = "gpio";
-                       };
-               };
-
-               serial@12000 {
-                       status = "ok";
-               };
-       };
-
-       i2c@0 {
-               compatible = "i2c-gpio";
-               gpios = < &gpio0 8 GPIO_ACTIVE_HIGH             /* sda */
-                         &gpio0 9 GPIO_ACTIVE_HIGH>;           /* scl */
-               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
-       };
-};
-
-&nand {
-       status = "okay";
-       chip-delay = <25>;
 };
 
 &mdio {