Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Valentin Longchamp and committed by
Jason Cooper
35f5c69b d584a10d

+49 -37
+48
arch/arm/boot/dts/kirkwood-km_common.dtsi
··· 1 + / { 2 + chosen { 3 + bootargs = "console=ttyS0,115200n8 earlyprintk"; 4 + stdout-path = &uart0; 5 + }; 6 + 7 + mbus { 8 + pcie-controller { 9 + status = "okay"; 10 + 11 + pcie@1,0 { 12 + status = "okay"; 13 + }; 14 + }; 15 + }; 16 + 17 + ocp@f1000000 { 18 + pinctrl: pin-controller@10000 { 19 + pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >; 20 + pinctrl-names = "default"; 21 + 22 + pmx_i2c_gpio_sda: pmx-gpio-sda { 23 + marvell,pins = "mpp8"; 24 + marvell,function = "gpio"; 25 + }; 26 + pmx_i2c_gpio_scl: pmx-gpio-scl { 27 + marvell,pins = "mpp9"; 28 + marvell,function = "gpio"; 29 + }; 30 + }; 31 + 32 + serial@12000 { 33 + status = "okay"; 34 + }; 35 + }; 36 + 37 + i2c@0 { 38 + compatible = "i2c-gpio"; 39 + gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */ 40 + &gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */ 41 + i2c-gpio,delay-us = <2>; /* ~100 kHz */ 42 + }; 43 + }; 44 + 45 + &nand { 46 + status = "okay"; 47 + chip-delay = <25>; 48 + };
+1 -37
arch/arm/boot/dts/kirkwood-km_kirkwood.dts
··· 2 2 3 3 #include "kirkwood.dtsi" 4 4 #include "kirkwood-98dx4122.dtsi" 5 + #include "kirkwood-km_common.dtsi" 5 6 6 7 / { 7 8 model = "Keymile Kirkwood Reference Design"; ··· 12 11 device_type = "memory"; 13 12 reg = <0x00000000 0x08000000>; 14 13 }; 15 - 16 - chosen { 17 - bootargs = "console=ttyS0,115200n8 earlyprintk"; 18 - stdout-path = &uart0; 19 - }; 20 - 21 - ocp@f1000000 { 22 - pinctrl: pin-controller@10000 { 23 - pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >; 24 - pinctrl-names = "default"; 25 - 26 - pmx_i2c_gpio_sda: pmx-gpio-sda { 27 - marvell,pins = "mpp8"; 28 - marvell,function = "gpio"; 29 - }; 30 - pmx_i2c_gpio_scl: pmx-gpio-scl { 31 - marvell,pins = "mpp9"; 32 - marvell,function = "gpio"; 33 - }; 34 - }; 35 - 36 - serial@12000 { 37 - status = "ok"; 38 - }; 39 - }; 40 - 41 - i2c@0 { 42 - compatible = "i2c-gpio"; 43 - gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */ 44 - &gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */ 45 - i2c-gpio,delay-us = <2>; /* ~100 kHz */ 46 - }; 47 - }; 48 - 49 - &nand { 50 - status = "okay"; 51 - chip-delay = <25>; 52 14 }; 53 15 54 16 &mdio {