From: andrew@lunn.ch (Andrew Lunn) Date: Mon, 23 Dec 2013 17:02:38 +0100 Subject: [PATCH 2/2] ARM: Kirkwood: DT board setup for LaPlug In-Reply-To: <1387813346-16741-2-git-send-email-maxime.hadjinlian@gmail.com> References: <1387813346-16741-1-git-send-email-maxime.hadjinlian@gmail.com> <1387813346-16741-2-git-send-email-maxime.hadjinlian@gmail.com> Message-ID: <20131223160238.GB7746@lunn.ch> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Dec 23, 2013 at 04:42:26PM +0100, Maxime Hadjinlian wrote: > This patch adds DT board setup for the LaCie NAS LaPlug. > > Chipset list: > - CPU MARVELL 88FR131 800Mhz > - SDRAM memory: 128MB DDR2-800 400Mhz > - 1 Ethernet Gigabit port (PHY MARVELL 88E1318) > - 1 Mini PCI-Express port > - 1 NAND 512 MB > - 1 push button > - 2 LEDs (red and blue) > - 4 USB Ports > > Signed-off-by: Maxime Hadjinlian > --- > Changes v1 -> v2: > - Rename the board from ns-plug to laplug, changes everywhere > accordingly > - Retab the files > - Use defines for GPIO active state and key input's name. > - Remove #*-cells in gpio-keys as this is not a bus > - Use kirkwood-6192.dtsi > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/kirkwood-laplug.dts | 175 ++++++++++++++++++++++++++++++++++ > 2 files changed, 176 insertions(+) > create mode 100644 arch/arm/boot/dts/kirkwood-laplug.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index d57c1a6..4c4ff37 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -85,6 +85,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ > kirkwood-iomega_ix2_200.dtb \ > kirkwood-is2.dtb \ > kirkwood-km_kirkwood.dtb \ > + kirkwood-laplug.dtb \ > kirkwood-lschlv2.dtb \ > kirkwood-lsxhl.dtb \ > kirkwood-mplcec4.dtb \ > diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts > new file mode 100644 > index 0000000..cf34eb0 > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-laplug.dts > @@ -0,0 +1,175 @@ > +/* > + * Copyright (C) 2013 Maxime Hadjinlian > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any > + * warranty of any kind, whether express or implied. > + */ > + > +/dts-v1/; > + > +#include > +#include > +#include "kirkwood.dtsi" > +#include "kirkwood-6192.dtsi" Hi Maxime Thanks for the v2. Looks good. When using Jason's DT branch, the includes for gpio and input are no longer needed, kirkwood.dtsi has them. > + > +/ { > + model = "LaCie LaPlug"; > + compatible = "lacie,laplug", "marvell,kirkwood-88f6192", "marvell,kirkwood"; > + > + memory { > + device_type = "memory"; > + reg = <0x00000000 0x8000000>; /* 128 MB */ > + }; > + > + chosen { > + bootargs = "console=ttyS0,115200n8 earlyprintk"; > + }; > + > + mbus { > + ranges = ; > + pcie-controller { > + status = "okay"; > + pcie at 1,0 { > + status = "okay"; > + }; > + }; > + }; > + > + ocp at f1000000 { > + serial at 12000 { > + pinctrl-0 = <&pmx_uart0>; > + pinctrl-names = "default"; > + status = "okay"; > + }; > + > + i2c at 11000 { > + pinctrl-0 = <&pmx_twsi0>; > + pinctrl-names = "default"; > + status = "okay"; > + > + eeprom at 50 { > + compatible = "at,24c04"; > + pagesize = <16>; > + reg = <0x50>; > + }; > + }; > + > + pinctrl: pinctrl at 10000 { > + pmx_usb_power_enable: pmx-usb-power-enable { > + marvell,pins = "mpp14"; > + marvell,function = "gpio"; > + }; > + }; > + }; > + > + gpio_keys { > + compatible = "gpio-keys"; > + > + button at 1{ > + label = "Power push button"; > + linux,code = ; > + gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; > + }; > + }; > + > + gpio-leds { > + compatible = "gpio-leds"; > + > + red-fail { > + label = "laplug_v2:red:power"; > + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; > + }; > + blue-power { > + label = "laplug_v2:blue:power"; > + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; > + linux,default-trigger = "default-on"; > + }; > + }; > + > + gpio_poweroff { > + compatible = "gpio-poweroff"; > + gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; > + }; > + > + regulators { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_usb_power_enable>; > + pinctrl-names = "default"; > + > + usb_power_back1: regulator at 1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "USB Power Back 1"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio0 15 GPIO_ACTIVE_HIGH>; > + }; > + > + usb_power_back2: regulator at 2 { > + compatible = "regulator-fixed"; > + reg = <2>; > + regulator-name = "USB Power Back 2"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; > + }; > + > + usb_power_front: regulator at 3 { > + compatible = "regulator-fixed"; > + reg = <3>; > + regulator-name = "USB Power Front"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio1 3 GPIO_ACTIVE_HIGH>; > + }; > + }; > +}; > + > +&nand { > + /* Total size : 512MB */ > + status = "okay"; > + > + partition at 0 { > + label = "u-boot"; > + reg = <0x0 0x100000>; /* 1MB */ > + read-only; > + }; > + > + partition at 100000 { > + label = "uImage"; > + reg = <0x100000 0x1000000>; /* 16MB */ > + }; > + > + partition at 1100000 { > + label = "rootfs"; > + reg = <0x1100000 0x1EF00000>; /* 495MB */ > + }; > +}; > + > +&mdio { > + status = "okay"; > + > + ethphy0: ethernet-phy at 0 { > + device_type = "ethernet-phy"; > + reg = <0>; > + }; > +}; > + > +ð0 { > + status = "okay"; > + ethernet0-port at 0 { > + phy-handle = <ðphy0>; > + }; > +}; > -- > 1.8.5.1 > Acked-by: Andrew Lunn Thanks Andrew