* [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320
@ 2014-04-06 21:37 Adam Baker
2014-04-06 21:42 ` [PATCH 1/3] ARM: kirkwood: Move NSA310 common parts to include file Adam Baker
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Adam Baker @ 2014-04-06 21:37 UTC (permalink / raw)
To: linux-arm-kernel
As promised here are my sequence of patches to add support for the
Zyxel NSA 320
The three patches are as previously discussed
1 - Move some things that are common to both nsa310, nsa310a and nsa320 into
kirkwood-nsa310-common.dtsi
2 - add the dts for nsa320
3 - rename kirkwood-nsa310-common.dtsi to kirkwood-nsa3x0-common.dtsi (I suspect
the nsa325 is sufficiently different to not share this file). I suggest
making this change last as it can easily be dropped till later if it causes
conflicts.
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/3] ARM: kirkwood: Move NSA310 common parts to include file 2014-04-06 21:37 [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Adam Baker @ 2014-04-06 21:42 ` Adam Baker 2014-04-06 21:42 ` [PATCH 2/3] ARM: kirkwood: Add DTS file for NSA320 Adam Baker 2014-04-06 21:42 ` [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common Adam Baker 2014-04-08 19:27 ` [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Andrew Lunn 2014-04-24 4:44 ` Jason Cooper 2 siblings, 2 replies; 10+ messages in thread From: Adam Baker @ 2014-04-06 21:42 UTC (permalink / raw) To: linux-arm-kernel Move definitions that are common to both nsa-310.dts and nsa310a.dts and that will also be used in nsa320 into kirkwood-nsa310-common.dtsi. Also rename the USB Regulator to remove the word off from its name as the state of a regulator shouldn't be part of its name. Signed-off-by: Adam Baker <linux@baker-net.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 58 +++++++++++++++++++++++-- arch/arm/boot/dts/kirkwood-nsa310.dts | 48 -------------------- arch/arm/boot/dts/kirkwood-nsa310a.dts | 52 ---------------------- 3 files changed, 54 insertions(+), 104 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi index aa78c2d..843b8b5 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi @@ -7,15 +7,40 @@ ocp at f1000000 { pinctrl: pinctrl at 10000 { - pmx_usb_power_off: pmx-usb-power-off { + pmx_usb_power: pmx-usb-power { marvell,pins = "mpp21"; marvell,function = "gpio"; }; + pmx_pwr_off: pmx-pwr-off { marvell,pins = "mpp48"; marvell,function = "gpio"; }; + pmx_btn_reset: pmx-btn-reset { + marvell,pins = "mpp36"; + marvell,function = "gpio"; + }; + + pmx_btn_copy: pmx-btn-copy { + marvell,pins = "mpp37"; + marvell,function = "gpio"; + }; + + pmx_btn_power: pmx-btn-power { + marvell,pins = "mpp46"; + marvell,function = "gpio"; + }; + + pmx_led_copy_green: pmx-led-copy-green { + marvell,pins = "mpp39"; + marvell,function = "gpio"; + }; + + pmx_led_copy_red: pmx-led-copy-red { + marvell,pins = "mpp40"; + marvell,function = "gpio"; + }; }; serial at 12000 { @@ -43,17 +68,42 @@ gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; }; + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; + pinctrl-names = "default"; + + button at 1 { + label = "Power Button"; + linux,code = <KEY_POWER>; + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; + }; + button at 2 { + label = "Copy Button"; + linux,code = <KEY_COPY>; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + }; + button at 3 { + label = "Reset Button"; + linux,code = <KEY_RESTART>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + }; + }; + + regulators { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <0>; - pinctrl-0 = <&pmx_usb_power_off>; + pinctrl-0 = <&pmx_usb_power>; pinctrl-names = "default"; - usb0_power_off: regulator at 1 { + usb0_power: regulator at 1 { compatible = "regulator-fixed"; reg = <1>; - regulator-name = "USB Power Off"; + regulator-name = "USB Power"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 03fa24c..372f701 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts @@ -59,26 +59,6 @@ marvell,function = "gpio"; }; - pmx_btn_reset: pmx-btn-reset { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - - pmx_btn_copy: pmx-btn-copy { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - - pmx_led_copy_green: pmx-led-copy-green { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - - pmx_led_copy_red: pmx-led-copy-red { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_led_hdd_green: pmx-led-hdd-green { marvell,pins = "mpp41"; marvell,function = "gpio"; @@ -94,10 +74,6 @@ marvell,function = "gpio"; }; - pmx_btn_power: pmx-btn-power { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; }; i2c at 11000 { @@ -110,30 +86,6 @@ }; }; - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; - pinctrl-names = "default"; - - button at 1 { - label = "Power Button"; - linux,code = <KEY_POWER>; - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; - }; - button at 2 { - label = "Copy Button"; - linux,code = <KEY_COPY>; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; - }; - button at 3 { - label = "Reset Button"; - linux,code = <KEY_RESTART>; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - }; - }; - gpio-leds { compatible = "gpio-leds"; pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts index a5e7794..ead7a36 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts @@ -38,11 +38,6 @@ marvell,function = "gpio"; }; - pmx_usb_power_off: pmx-usb-power-off { - marvell,pins = "mpp21"; - marvell,function = "gpio"; - }; - pmx_led_sys_green: pmx-led-sys-green { marvell,pins = "mpp28"; marvell,function = "gpio"; @@ -53,26 +48,6 @@ marvell,function = "gpio"; }; - pmx_btn_reset: pmx-btn-reset { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - - pmx_btn_copy: pmx-btn-copy { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - - pmx_led_copy_green: pmx-led-copy-green { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - - pmx_led_copy_red: pmx-led-copy-red { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_led_hdd_green: pmx-led-hdd-green { marvell,pins = "mpp41"; marvell,function = "gpio"; @@ -83,11 +58,6 @@ marvell,function = "gpio"; }; - pmx_btn_power: pmx-btn-power { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - }; i2c@11000 { @@ -100,28 +70,6 @@ }; }; - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - - button at 1 { - label = "Power Button"; - linux,code = <KEY_POWER>; - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; - }; - button at 2 { - label = "Copy Button"; - linux,code = <KEY_COPY>; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; - }; - button at 3 { - label = "Reset Button"; - linux,code = <KEY_RESTART>; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - }; - }; - gpio-leds { compatible = "gpio-leds"; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] ARM: kirkwood: Add DTS file for NSA320 2014-04-06 21:42 ` [PATCH 1/3] ARM: kirkwood: Move NSA310 common parts to include file Adam Baker @ 2014-04-06 21:42 ` Adam Baker 2014-04-06 21:42 ` [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common Adam Baker 1 sibling, 0 replies; 10+ messages in thread From: Adam Baker @ 2014-04-06 21:42 UTC (permalink / raw) To: linux-arm-kernel Add a new DTS file to support the Zyxel NSA320 dual bay NAS Drive. This DTS just describes the features that work with the current kernel drivers. New drivers still need writing to support the temperature sensor, the power on behaviour control and the buzzer. Signed-off-by: Adam Baker <linux@baker-net.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/kirkwood-nsa320.dts | 214 +++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 arch/arm/boot/dts/kirkwood-nsa320.dts diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts new file mode 100644 index 0000000..6c8f692 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-nsa320.dts @@ -0,0 +1,214 @@ +/* Device tree file for the Zyxel NSA 320 NAS box. + * + * Copyright (c) 2014, Adam Baker <linux@baker-net.org.uk> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + * + * Based upon the board setup file created by Peter Schildmann */ + +/dts-v1/; + +#include "kirkwood-nsa310-common.dtsi" + +/ { + model = "Zyxel NSA320"; + compatible = "zyxel,nsa320", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + + memory { + device_type = "memory"; + reg = <0x00000000 0x20000000>; + }; + + chosen { + bootargs = "console=ttyS0,115200"; + }; + + mbus { + pcie-controller { + status = "okay"; + + pcie at 1,0 { + status = "okay"; + }; + }; + }; + + ocp at f1000000 { + pinctrl: pinctrl at 10000 { + pinctrl-names = "default"; + + /* SATA Activity and Present pins are not connected */ + pmx_sata0: pmx-sata0 { + marvell,pins ; + marvell,function = "sata0"; + }; + + pmx_sata1: pmx-sata1 { + marvell,pins ; + marvell,function = "sata1"; + }; + + pmx_led_hdd2_green: pmx-led-hdd2-green { + marvell,pins = "mpp12"; + marvell,function = "gpio"; + }; + + pmx_led_hdd2_red: pmx-led-hdd2-red { + marvell,pins = "mpp13"; + marvell,function = "gpio"; + }; + + pmx_mcu_data: pmx-mcu-data { + marvell,pins = "mpp14"; + marvell,function = "gpio"; + }; + + pmx_led_usb_green: pmx-led-usb-green { + marvell,pins = "mpp15"; + marvell,function = "gpio"; + }; + + pmx_mcu_clk: pmx-mcu-clk { + marvell,pins = "mpp16"; + marvell,function = "gpio"; + }; + + pmx_mcu_act: pmx-mcu-act { + marvell,pins = "mpp17"; + marvell,function = "gpio"; + }; + + pmx_led_sys_green: pmx-led-sys-green { + marvell,pins = "mpp28"; + marvell,function = "gpio"; + }; + + pmx_led_sys_orange: pmx-led-sys-orange { + marvell,pins = "mpp29"; + marvell,function = "gpio"; + }; + + pmx_led_hdd1_green: pmx-led-hdd1-green { + marvell,pins = "mpp41"; + marvell,function = "gpio"; + }; + + pmx_led_hdd1_red: pmx-led-hdd1-red { + marvell,pins = "mpp42"; + marvell,function = "gpio"; + }; + + pmx_htp: pmx-htp { + marvell,pins = "mpp43"; + marvell,function = "gpio"; + }; + + /* Buzzer needs to be switched at around 1kHz so is + not compatible with the gpio-beeper driver. */ + pmx_buzzer: pmx-buzzer { + marvell,pins = "mpp44"; + marvell,function = "gpio"; + }; + + pmx_vid_b1: pmx-vid-b1 { + marvell,pins = "mpp45"; + marvell,function = "gpio"; + }; + + pmx_power_resume_data: pmx-power-resume-data { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; + + pmx_power_resume_clk: pmx-power-resume-clk { + marvell,pins = "mpp49"; + marvell,function = "gpio"; + }; + }; + + i2c at 11000 { + status = "okay"; + + pcf8563: pcf8563 at 51 { + compatible = "nxp,pcf8563"; + reg = <0x51>; + }; + }; + }; + + regulators { + usb0_power: regulator at 1 { + enable-active-high; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + pinctrl-0 = <&pmx_led_hdd2_green &pmx_led_hdd2_red + &pmx_led_usb_green + &pmx_led_sys_green &pmx_led_sys_orange + &pmx_led_copy_green &pmx_led_copy_red + &pmx_led_hdd1_green &pmx_led_hdd1_red>; + pinctrl-names = "default"; + + green-sys { + label = "nsa320:green:sys"; + gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; + }; + orange-sys { + label = "nsa320:orange:sys"; + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; + }; + green-hdd1 { + label = "nsa320:green:hdd1"; + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; + }; + red-hdd1 { + label = "nsa320:red:hdd1"; + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + }; + green-hdd2 { + label = "nsa320:green:hdd2"; + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; + }; + red-hdd2 { + label = "nsa320:red:hdd2"; + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; + }; + green-usb { + label = "nsa320:green:usb"; + gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; + }; + green-copy { + label = "nsa320:green:copy"; + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + }; + red-copy { + label = "nsa320:red:copy"; + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; + }; + }; + + /* The following pins are currently not assigned to a driver, + some of them should be configured as inputs. + pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act + &pmx_htp &pmx_vid_b1 + &pmx_power_resume_data &pmx_power_resume_clk>; */ +}; + +&mdio { + status = "okay"; + ethphy0: ethernet-phy at 1 { + reg = <1>; + }; +}; + +ð0 { + status = "okay"; + ethernet0-port at 0 { + phy-handle = <ðphy0>; + }; +}; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common 2014-04-06 21:42 ` [PATCH 1/3] ARM: kirkwood: Move NSA310 common parts to include file Adam Baker 2014-04-06 21:42 ` [PATCH 2/3] ARM: kirkwood: Add DTS file for NSA320 Adam Baker @ 2014-04-06 21:42 ` Adam Baker 2014-04-08 19:26 ` Andrew Lunn 1 sibling, 1 reply; 10+ messages in thread From: Adam Baker @ 2014-04-06 21:42 UTC (permalink / raw) To: linux-arm-kernel Rename the include file kirkwood-nsa310-common.dtsi as it is now also used for NSA320. There is also an NSA325 but that appears not to be as similar so is unlikely to want to share an include file. Signed-off-by: Adam Baker <linux@baker-net.org.uk> --- arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 157 ------------------------- arch/arm/boot/dts/kirkwood-nsa310.dts | 2 +- arch/arm/boot/dts/kirkwood-nsa310a.dts | 2 +- arch/arm/boot/dts/kirkwood-nsa320.dts | 2 +- arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 157 +++++++++++++++++++++++++ 5 files changed, 160 insertions(+), 160 deletions(-) delete mode 100644 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi deleted file mode 100644 index 843b8b5..0000000 --- a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi +++ /dev/null @@ -1,157 +0,0 @@ -#include "kirkwood.dtsi" -#include "kirkwood-6281.dtsi" - -/ { - model = "ZyXEL NSA310"; - - ocp at f1000000 { - pinctrl: pinctrl at 10000 { - - pmx_usb_power: pmx-usb-power { - marvell,pins = "mpp21"; - marvell,function = "gpio"; - }; - - pmx_pwr_off: pmx-pwr-off { - marvell,pins = "mpp48"; - marvell,function = "gpio"; - }; - - pmx_btn_reset: pmx-btn-reset { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - - pmx_btn_copy: pmx-btn-copy { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - - pmx_btn_power: pmx-btn-power { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - - pmx_led_copy_green: pmx-led-copy-green { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - - pmx_led_copy_red: pmx-led-copy-red { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - }; - - serial at 12000 { - status = "ok"; - }; - - sata at 80000 { - status = "okay"; - nr-ports = <2>; - }; - - pcie-controller { - status = "okay"; - - pcie at 1,0 { - status = "okay"; - }; - }; - }; - - gpio_poweroff { - compatible = "gpio-poweroff"; - pinctrl-0 = <&pmx_pwr_off>; - pinctrl-names = "default"; - gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; - }; - - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; - pinctrl-names = "default"; - - button at 1 { - label = "Power Button"; - linux,code = <KEY_POWER>; - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; - }; - button at 2 { - label = "Copy Button"; - linux,code = <KEY_COPY>; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; - }; - button at 3 { - label = "Reset Button"; - linux,code = <KEY_RESTART>; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - }; - }; - - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_usb_power>; - pinctrl-names = "default"; - - usb0_power: regulator at 1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&nand { - status = "okay"; - chip-delay = <35>; - - partition at 0 { - label = "uboot"; - reg = <0x0000000 0x0100000>; - read-only; - }; - partition at 100000 { - label = "uboot_env"; - reg = <0x0100000 0x0080000>; - }; - partition at 180000 { - label = "key_store"; - reg = <0x0180000 0x0080000>; - }; - partition at 200000 { - label = "info"; - reg = <0x0200000 0x0080000>; - }; - partition at 280000 { - label = "etc"; - reg = <0x0280000 0x0a00000>; - }; - partition at c80000 { - label = "kernel_1"; - reg = <0x0c80000 0x0a00000>; - }; - partition at 1680000 { - label = "rootfs1"; - reg = <0x1680000 0x2fc0000>; - }; - partition at 4640000 { - label = "kernel_2"; - reg = <0x4640000 0x0a00000>; - }; - partition at 5040000 { - label = "rootfs2"; - reg = <0x5040000 0x2fc0000>; - }; -}; diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 372f701..989846a 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "kirkwood-nsa310-common.dtsi" +#include "kirkwood-nsa3x0-common.dtsi" / { compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood"; diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts index ead7a36..d0a6025 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "kirkwood-nsa310-common.dtsi" +#include "kirkwood-nsa3x0-common.dtsi" /* * There are at least two different NSA310 designs. This variant does diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts index 6c8f692..fc20baf 100644 --- a/arch/arm/boot/dts/kirkwood-nsa320.dts +++ b/arch/arm/boot/dts/kirkwood-nsa320.dts @@ -11,7 +11,7 @@ /dts-v1/; -#include "kirkwood-nsa310-common.dtsi" +#include "kirkwood-nsa3x0-common.dtsi" / { model = "Zyxel NSA320"; diff --git a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi new file mode 100644 index 0000000..843b8b5 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi @@ -0,0 +1,157 @@ +#include "kirkwood.dtsi" +#include "kirkwood-6281.dtsi" + +/ { + model = "ZyXEL NSA310"; + + ocp at f1000000 { + pinctrl: pinctrl at 10000 { + + pmx_usb_power: pmx-usb-power { + marvell,pins = "mpp21"; + marvell,function = "gpio"; + }; + + pmx_pwr_off: pmx-pwr-off { + marvell,pins = "mpp48"; + marvell,function = "gpio"; + }; + + pmx_btn_reset: pmx-btn-reset { + marvell,pins = "mpp36"; + marvell,function = "gpio"; + }; + + pmx_btn_copy: pmx-btn-copy { + marvell,pins = "mpp37"; + marvell,function = "gpio"; + }; + + pmx_btn_power: pmx-btn-power { + marvell,pins = "mpp46"; + marvell,function = "gpio"; + }; + + pmx_led_copy_green: pmx-led-copy-green { + marvell,pins = "mpp39"; + marvell,function = "gpio"; + }; + + pmx_led_copy_red: pmx-led-copy-red { + marvell,pins = "mpp40"; + marvell,function = "gpio"; + }; + }; + + serial at 12000 { + status = "ok"; + }; + + sata at 80000 { + status = "okay"; + nr-ports = <2>; + }; + + pcie-controller { + status = "okay"; + + pcie at 1,0 { + status = "okay"; + }; + }; + }; + + gpio_poweroff { + compatible = "gpio-poweroff"; + pinctrl-0 = <&pmx_pwr_off>; + pinctrl-names = "default"; + gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; + }; + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; + pinctrl-names = "default"; + + button at 1 { + label = "Power Button"; + linux,code = <KEY_POWER>; + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; + }; + button at 2 { + label = "Copy Button"; + linux,code = <KEY_COPY>; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + }; + button at 3 { + label = "Reset Button"; + linux,code = <KEY_RESTART>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + }; + }; + + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&pmx_usb_power>; + pinctrl-names = "default"; + + usb0_power: regulator at 1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "USB Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&nand { + status = "okay"; + chip-delay = <35>; + + partition at 0 { + label = "uboot"; + reg = <0x0000000 0x0100000>; + read-only; + }; + partition at 100000 { + label = "uboot_env"; + reg = <0x0100000 0x0080000>; + }; + partition at 180000 { + label = "key_store"; + reg = <0x0180000 0x0080000>; + }; + partition at 200000 { + label = "info"; + reg = <0x0200000 0x0080000>; + }; + partition at 280000 { + label = "etc"; + reg = <0x0280000 0x0a00000>; + }; + partition at c80000 { + label = "kernel_1"; + reg = <0x0c80000 0x0a00000>; + }; + partition at 1680000 { + label = "rootfs1"; + reg = <0x1680000 0x2fc0000>; + }; + partition at 4640000 { + label = "kernel_2"; + reg = <0x4640000 0x0a00000>; + }; + partition at 5040000 { + label = "rootfs2"; + reg = <0x5040000 0x2fc0000>; + }; +}; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common 2014-04-06 21:42 ` [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common Adam Baker @ 2014-04-08 19:26 ` Andrew Lunn 2014-04-08 21:26 ` Jason Cooper 2014-04-08 21:43 ` Adam Baker 0 siblings, 2 replies; 10+ messages in thread From: Andrew Lunn @ 2014-04-08 19:26 UTC (permalink / raw) To: linux-arm-kernel On Sun, Apr 06, 2014 at 10:42:49PM +0100, Adam Baker wrote: > Rename the include file kirkwood-nsa310-common.dtsi as > it is now also used for NSA320. There is also an NSA325 > but that appears not to be as similar so is unlikely to > want to share an include file. > > Signed-off-by: Adam Baker <linux@baker-net.org.uk> > --- > arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 157 ------------------------- ... > arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 157 +++++++++++++++++++++++++ > 5 files changed, 160 insertions(+), 160 deletions(-) > delete mode 100644 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi > create mode 100644 arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi Hi Adam git should be able to do that as a straight rename, rather than two big patch hunks, removing and adding. Try using git mv. Jason: Are you O.K. with it like this? Or do you want a new minimal patch? Andrew > > diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi > deleted file mode 100644 > index 843b8b5..0000000 > --- a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi > +++ /dev/null > @@ -1,157 +0,0 @@ > -#include "kirkwood.dtsi" > -#include "kirkwood-6281.dtsi" > - > -/ { > - model = "ZyXEL NSA310"; > - > - ocp at f1000000 { > - pinctrl: pinctrl at 10000 { > - > - pmx_usb_power: pmx-usb-power { > - marvell,pins = "mpp21"; > - marvell,function = "gpio"; > - }; > - > - pmx_pwr_off: pmx-pwr-off { > - marvell,pins = "mpp48"; > - marvell,function = "gpio"; > - }; > - > - pmx_btn_reset: pmx-btn-reset { > - marvell,pins = "mpp36"; > - marvell,function = "gpio"; > - }; > - > - pmx_btn_copy: pmx-btn-copy { > - marvell,pins = "mpp37"; > - marvell,function = "gpio"; > - }; > - > - pmx_btn_power: pmx-btn-power { > - marvell,pins = "mpp46"; > - marvell,function = "gpio"; > - }; > - > - pmx_led_copy_green: pmx-led-copy-green { > - marvell,pins = "mpp39"; > - marvell,function = "gpio"; > - }; > - > - pmx_led_copy_red: pmx-led-copy-red { > - marvell,pins = "mpp40"; > - marvell,function = "gpio"; > - }; > - }; > - > - serial at 12000 { > - status = "ok"; > - }; > - > - sata at 80000 { > - status = "okay"; > - nr-ports = <2>; > - }; > - > - pcie-controller { > - status = "okay"; > - > - pcie at 1,0 { > - status = "okay"; > - }; > - }; > - }; > - > - gpio_poweroff { > - compatible = "gpio-poweroff"; > - pinctrl-0 = <&pmx_pwr_off>; > - pinctrl-names = "default"; > - gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; > - }; > - > - gpio_keys { > - compatible = "gpio-keys"; > - #address-cells = <1>; > - #size-cells = <0>; > - pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; > - pinctrl-names = "default"; > - > - button at 1 { > - label = "Power Button"; > - linux,code = <KEY_POWER>; > - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; > - }; > - button at 2 { > - label = "Copy Button"; > - linux,code = <KEY_COPY>; > - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; > - }; > - button at 3 { > - label = "Reset Button"; > - linux,code = <KEY_RESTART>; > - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; > - }; > - }; > - > - > - regulators { > - compatible = "simple-bus"; > - #address-cells = <1>; > - #size-cells = <0>; > - pinctrl-0 = <&pmx_usb_power>; > - pinctrl-names = "default"; > - > - usb0_power: regulator at 1 { > - compatible = "regulator-fixed"; > - reg = <1>; > - regulator-name = "USB Power"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - regulator-always-on; > - regulator-boot-on; > - gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; > - }; > - }; > -}; > - > -&nand { > - status = "okay"; > - chip-delay = <35>; > - > - partition at 0 { > - label = "uboot"; > - reg = <0x0000000 0x0100000>; > - read-only; > - }; > - partition at 100000 { > - label = "uboot_env"; > - reg = <0x0100000 0x0080000>; > - }; > - partition at 180000 { > - label = "key_store"; > - reg = <0x0180000 0x0080000>; > - }; > - partition at 200000 { > - label = "info"; > - reg = <0x0200000 0x0080000>; > - }; > - partition at 280000 { > - label = "etc"; > - reg = <0x0280000 0x0a00000>; > - }; > - partition at c80000 { > - label = "kernel_1"; > - reg = <0x0c80000 0x0a00000>; > - }; > - partition at 1680000 { > - label = "rootfs1"; > - reg = <0x1680000 0x2fc0000>; > - }; > - partition at 4640000 { > - label = "kernel_2"; > - reg = <0x4640000 0x0a00000>; > - }; > - partition at 5040000 { > - label = "rootfs2"; > - reg = <0x5040000 0x2fc0000>; > - }; > -}; > diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts > index 372f701..989846a 100644 > --- a/arch/arm/boot/dts/kirkwood-nsa310.dts > +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts > @@ -1,6 +1,6 @@ > /dts-v1/; > > -#include "kirkwood-nsa310-common.dtsi" > +#include "kirkwood-nsa3x0-common.dtsi" > > / { > compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood"; > diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts > index ead7a36..d0a6025 100644 > --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts > +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts > @@ -1,6 +1,6 @@ > /dts-v1/; > > -#include "kirkwood-nsa310-common.dtsi" > +#include "kirkwood-nsa3x0-common.dtsi" > > /* > * There are at least two different NSA310 designs. This variant does > diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts > index 6c8f692..fc20baf 100644 > --- a/arch/arm/boot/dts/kirkwood-nsa320.dts > +++ b/arch/arm/boot/dts/kirkwood-nsa320.dts > @@ -11,7 +11,7 @@ > > /dts-v1/; > > -#include "kirkwood-nsa310-common.dtsi" > +#include "kirkwood-nsa3x0-common.dtsi" > > / { > model = "Zyxel NSA320"; > diff --git a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi > new file mode 100644 > index 0000000..843b8b5 > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi > @@ -0,0 +1,157 @@ > +#include "kirkwood.dtsi" > +#include "kirkwood-6281.dtsi" > + > +/ { > + model = "ZyXEL NSA310"; > + > + ocp at f1000000 { > + pinctrl: pinctrl at 10000 { > + > + pmx_usb_power: pmx-usb-power { > + marvell,pins = "mpp21"; > + marvell,function = "gpio"; > + }; > + > + pmx_pwr_off: pmx-pwr-off { > + marvell,pins = "mpp48"; > + marvell,function = "gpio"; > + }; > + > + pmx_btn_reset: pmx-btn-reset { > + marvell,pins = "mpp36"; > + marvell,function = "gpio"; > + }; > + > + pmx_btn_copy: pmx-btn-copy { > + marvell,pins = "mpp37"; > + marvell,function = "gpio"; > + }; > + > + pmx_btn_power: pmx-btn-power { > + marvell,pins = "mpp46"; > + marvell,function = "gpio"; > + }; > + > + pmx_led_copy_green: pmx-led-copy-green { > + marvell,pins = "mpp39"; > + marvell,function = "gpio"; > + }; > + > + pmx_led_copy_red: pmx-led-copy-red { > + marvell,pins = "mpp40"; > + marvell,function = "gpio"; > + }; > + }; > + > + serial at 12000 { > + status = "ok"; > + }; > + > + sata at 80000 { > + status = "okay"; > + nr-ports = <2>; > + }; > + > + pcie-controller { > + status = "okay"; > + > + pcie at 1,0 { > + status = "okay"; > + }; > + }; > + }; > + > + gpio_poweroff { > + compatible = "gpio-poweroff"; > + pinctrl-0 = <&pmx_pwr_off>; > + pinctrl-names = "default"; > + gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; > + }; > + > + gpio_keys { > + compatible = "gpio-keys"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; > + pinctrl-names = "default"; > + > + button at 1 { > + label = "Power Button"; > + linux,code = <KEY_POWER>; > + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; > + }; > + button at 2 { > + label = "Copy Button"; > + linux,code = <KEY_COPY>; > + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; > + }; > + button at 3 { > + label = "Reset Button"; > + linux,code = <KEY_RESTART>; > + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; > + }; > + }; > + > + > + regulators { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_usb_power>; > + pinctrl-names = "default"; > + > + usb0_power: regulator at 1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "USB Power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; > + }; > + }; > +}; > + > +&nand { > + status = "okay"; > + chip-delay = <35>; > + > + partition at 0 { > + label = "uboot"; > + reg = <0x0000000 0x0100000>; > + read-only; > + }; > + partition at 100000 { > + label = "uboot_env"; > + reg = <0x0100000 0x0080000>; > + }; > + partition at 180000 { > + label = "key_store"; > + reg = <0x0180000 0x0080000>; > + }; > + partition at 200000 { > + label = "info"; > + reg = <0x0200000 0x0080000>; > + }; > + partition at 280000 { > + label = "etc"; > + reg = <0x0280000 0x0a00000>; > + }; > + partition at c80000 { > + label = "kernel_1"; > + reg = <0x0c80000 0x0a00000>; > + }; > + partition at 1680000 { > + label = "rootfs1"; > + reg = <0x1680000 0x2fc0000>; > + }; > + partition at 4640000 { > + label = "kernel_2"; > + reg = <0x4640000 0x0a00000>; > + }; > + partition at 5040000 { > + label = "rootfs2"; > + reg = <0x5040000 0x2fc0000>; > + }; > +}; > -- > 1.7.10.4 > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common 2014-04-08 19:26 ` Andrew Lunn @ 2014-04-08 21:26 ` Jason Cooper 2014-04-08 21:43 ` Adam Baker 1 sibling, 0 replies; 10+ messages in thread From: Jason Cooper @ 2014-04-08 21:26 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 08, 2014 at 09:26:25PM +0200, Andrew Lunn wrote: > Jason: Are you O.K. with it like this? Or do you want a new minimal > patch? new, minimal please. thx, Jason. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common 2014-04-08 19:26 ` Andrew Lunn 2014-04-08 21:26 ` Jason Cooper @ 2014-04-08 21:43 ` Adam Baker 2014-04-08 22:34 ` [PATCH v2 " Adam Baker 1 sibling, 1 reply; 10+ messages in thread From: Adam Baker @ 2014-04-08 21:43 UTC (permalink / raw) To: linux-arm-kernel On 08/04/14 20:26, Andrew Lunn wrote: > On Sun, Apr 06, 2014 at 10:42:49PM +0100, Adam Baker wrote: >> Rename the include file kirkwood-nsa310-common.dtsi as >> it is now also used for NSA320. There is also an NSA325 >> but that appears not to be as similar so is unlikely to >> want to share an include file. >> >> Signed-off-by: Adam Baker <linux@baker-net.org.uk> >> --- >> arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 157 ------------------------- > ... >> arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 157 +++++++++++++++++++++++++ >> 5 files changed, 160 insertions(+), 160 deletions(-) >> delete mode 100644 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi >> create mode 100644 arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi > > > Hi Adam > > git should be able to do that as a straight rename, rather than two > big patch hunks, removing and adding. Try using git mv. > > Jason: Are you O.K. with it like this? Or do you want a new minimal > patch? > I did originally perform the rename using git mv but according to gitref.org "although the git mv command exists, it is superfluous - all it does is a git rm --cached, moves the file on disk, then runs a git add on the new file.". Is this something that works better in recent git versions, I'm running on Debian stable which uses 1.7.10.4 Adam ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common 2014-04-08 21:43 ` Adam Baker @ 2014-04-08 22:34 ` Adam Baker 0 siblings, 0 replies; 10+ messages in thread From: Adam Baker @ 2014-04-08 22:34 UTC (permalink / raw) To: linux-arm-kernel Rename the include file kirkwood-nsa310-common.dtsi as it is now also used for NSA320. There is also an NSA325 but that appears not to be as similar so is unlikely to want to share an include file. Signed-off-by: Adam Baker <linux@baker-net.org.uk> --- I've discovered that if I don't change the git repository but pass the -M option to git format-patch it generates a patch that describes the rename rather than deleting and re-adding the entire file. --- arch/arm/boot/dts/kirkwood-nsa310.dts | 2 +- arch/arm/boot/dts/kirkwood-nsa310a.dts | 2 +- arch/arm/boot/dts/kirkwood-nsa320.dts | 2 +- .../dts/{kirkwood-nsa310-common.dtsi => kirkwood-nsa3x0-common.dtsi} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename arch/arm/boot/dts/{kirkwood-nsa310-common.dtsi => kirkwood-nsa3x0-common.dtsi} (100%) diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 372f701..989846a 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "kirkwood-nsa310-common.dtsi" +#include "kirkwood-nsa3x0-common.dtsi" / { compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood"; diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts index ead7a36..d0a6025 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "kirkwood-nsa310-common.dtsi" +#include "kirkwood-nsa3x0-common.dtsi" /* * There are at least two different NSA310 designs. This variant does diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts index 6c8f692..fc20baf 100644 --- a/arch/arm/boot/dts/kirkwood-nsa320.dts +++ b/arch/arm/boot/dts/kirkwood-nsa320.dts @@ -11,7 +11,7 @@ /dts-v1/; -#include "kirkwood-nsa310-common.dtsi" +#include "kirkwood-nsa3x0-common.dtsi" / { model = "Zyxel NSA320"; diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi similarity index 100% rename from arch/arm/boot/dts/kirkwood-nsa310-common.dtsi rename to arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 2014-04-06 21:37 [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Adam Baker 2014-04-06 21:42 ` [PATCH 1/3] ARM: kirkwood: Move NSA310 common parts to include file Adam Baker @ 2014-04-08 19:27 ` Andrew Lunn 2014-04-24 4:44 ` Jason Cooper 2 siblings, 0 replies; 10+ messages in thread From: Andrew Lunn @ 2014-04-08 19:27 UTC (permalink / raw) To: linux-arm-kernel On Sun, Apr 06, 2014 at 10:37:33PM +0100, Adam Baker wrote: > As promised here are my sequence of patches to add support for the > Zyxel NSA 320 > > The three patches are as previously discussed > > 1 - Move some things that are common to both nsa310, nsa310a and nsa320 into > kirkwood-nsa310-common.dtsi > 2 - add the dts for nsa320 > 3 - rename kirkwood-nsa310-common.dtsi to kirkwood-nsa3x0-common.dtsi (I suspect > the nsa325 is sufficiently different to not share this file). I suggest > making this change last as it can easily be dropped till later if it causes > conflicts. Apart from the issue in mentioned in the 3rd patch: Acked-by: Andrew Lunn <andrew@lunn.ch> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 2014-04-06 21:37 [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Adam Baker 2014-04-06 21:42 ` [PATCH 1/3] ARM: kirkwood: Move NSA310 common parts to include file Adam Baker 2014-04-08 19:27 ` [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Andrew Lunn @ 2014-04-24 4:44 ` Jason Cooper 2 siblings, 0 replies; 10+ messages in thread From: Jason Cooper @ 2014-04-24 4:44 UTC (permalink / raw) To: linux-arm-kernel On Sun, Apr 06, 2014 at 10:37:33PM +0100, Adam Baker wrote: > As promised here are my sequence of patches to add support for the > Zyxel NSA 320 > > The three patches are as previously discussed > > 1 - Move some things that are common to both nsa310, nsa310a and nsa320 into > kirkwood-nsa310-common.dtsi > 2 - add the dts for nsa320 > 3 - rename kirkwood-nsa310-common.dtsi to kirkwood-nsa3x0-common.dtsi (I suspect > the nsa325 is sufficiently different to not share this file). I suggest > making this change last as it can easily be dropped till later if it causes > conflicts. Whole series applied to mvebu/dt with Andrew's Ack. thx, Jason. ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-04-24 4:44 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-04-06 21:37 [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Adam Baker 2014-04-06 21:42 ` [PATCH 1/3] ARM: kirkwood: Move NSA310 common parts to include file Adam Baker 2014-04-06 21:42 ` [PATCH 2/3] ARM: kirkwood: Add DTS file for NSA320 Adam Baker 2014-04-06 21:42 ` [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common Adam Baker 2014-04-08 19:26 ` Andrew Lunn 2014-04-08 21:26 ` Jason Cooper 2014-04-08 21:43 ` Adam Baker 2014-04-08 22:34 ` [PATCH v2 " Adam Baker 2014-04-08 19:27 ` [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Andrew Lunn 2014-04-24 4:44 ` Jason Cooper
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.