* [PATCH 0/2] ARM: dts: kirkwood: split lswxl and lswvl with fixes
@ 2016-01-19 13:49 Roger Shimizu
2016-01-19 13:49 ` [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl Roger Shimizu
` (3 more replies)
0 siblings, 4 replies; 40+ messages in thread
From: Roger Shimizu @ 2016-01-19 13:49 UTC (permalink / raw)
To: linux-arm-kernel
In order to support more buffalo linkstation devices in convenient way,
I split current 2 dts files into a few comoon dtsi files and device specific
dts files.
And I also fixed a few gpio/led pin, including fix for the issue mentioned
in Debian BTS #810894.
Roger Shimizu (2):
ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl
ARM: dts: kirkwood: split lswvl into linkstation lsvl and lswvl
.../devicetree/bindings/arm/marvell,kirkwood.txt | 6 +-
arch/arm/boot/dts/Makefile | 6 +-
arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 190 +++++++++++++
.../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 185 +++++++++++++
arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 ++++
arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++
arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 ++++++++
arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 113 ++++++++
arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 ++++++++++++++
arch/arm/boot/dts/kirkwood-lswvl.dts | 301 ---------------------
arch/arm/boot/dts/kirkwood-lswxl.dts | 301 ---------------------
11 files changed, 924 insertions(+), 606 deletions(-)
create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts
create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts
create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts
create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts
create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi
delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts
delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts
--
2.1.4
^ permalink raw reply [flat|nested] 40+ messages in thread* [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl 2016-01-19 13:49 [PATCH 0/2] ARM: dts: kirkwood: split lswxl and lswvl with fixes Roger Shimizu @ 2016-01-19 13:49 ` Roger Shimizu 2016-01-19 14:05 ` Andrew Lunn 2016-01-20 1:08 ` Andrew Lunn 2016-01-19 13:49 ` [PATCH 2/2] ARM: dts: kirkwood: split lswvl into linkstation lsvl and lswvl Roger Shimizu ` (2 subsequent siblings) 3 siblings, 2 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-19 13:49 UTC (permalink / raw) To: linux-arm-kernel LS-WXL/WSXL are both kirkwood-6281 based 2-Bay NAS devices, which share many MPP pins. However they are slightly different: - There're two red LED indicator on LS-WXL to show when HDD fails, but there's no such on LS-WSXL. - There's 4-level speed adjustable FAN on LS-WXL, but not LS-WSXL. So after the split, common part goes into .dtsi file: - kirkwood-linkstation.dtsi - kirkwood-linkstation-duo-6281.dtsi while all rest part goes into device specific .dts file: - kirkwood-linkstation-lswsxl.dts - kirkwood-linkstation-lswxl.dts With a few gpio/led-pin changes, including fix for the issue mentioned in Debian BTS #810894. License all newly created files under GPLv2/X11. Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> --- .../devicetree/bindings/arm/marvell,kirkwood.txt | 3 +- arch/arm/boot/dts/Makefile | 4 +- .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 185 +++++++++++++ arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 113 ++++++++ arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 ++++++++++++++ arch/arm/boot/dts/kirkwood-lswxl.dts | 301 --------------------- 7 files changed, 561 insertions(+), 304 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt index 5171ad8..c7f8e3e 100644 --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt @@ -19,9 +19,10 @@ SoC. Currently known SoC compatibles are: And in addition, the compatible shall be extended with the specific board. Currently known boards are: +"buffalo,linkstation-lswsxl" +"buffalo,linkstation-lswxl" "buffalo,lschlv2" "buffalo,lswvl" -"buffalo,lswxl" "buffalo,lsxhl" "buffalo,lsxl" "dlink,dns-320" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 30bbc37..6dff6af 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -183,9 +183,9 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-is2.dtb \ kirkwood-km_kirkwood.dtb \ kirkwood-laplug.dtb \ + kirkwood-linkstation-lswsxl.dtb \ + kirkwood-linkstation-lswxl.dtb \ kirkwood-lschlv2.dtb \ - kirkwood-lswvl.dtb \ - kirkwood-lswxl.dtb \ kirkwood-lsxhl.dtb \ kirkwood-mplcec4.dtb \ kirkwood-mv88f6281gtw-ge.dtb \ diff --git a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi new file mode 100644 index 0000000..d83ae8e --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi @@ -0,0 +1,185 @@ +/* + * Device Tree common file for kirkwood-6281 based 2-Bay Buffalo Linkstation + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "kirkwood.dtsi" +#include "kirkwood-6281.dtsi" +#include "kirkwood-linkstation.dtsi" + +/ { + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd0: pmx-power-hdd0 { + marvell,pins = "mpp28"; + marvell,function = "gpio"; + }; + pmx_power_hdd1: pmx-power-hdd1 { + marvell,pins = "mpp29"; + marvell,function = "gpio"; + }; + pmx_usb_vbus: pmx-usb-vbus { + marvell,pins = "mpp37"; + marvell,function = "gpio"; + }; + pmx_led_alarm: pmx-led-alarm { + marvell,pins = "mpp49"; + marvell,function = "gpio"; + }; + pmx_led_function_red: pmx-led-function-red { + marvell,pins = "mpp34"; + marvell,function = "gpio"; + }; + pmx_led_function_blue: pmx-led-function-blue { + marvell,pins = "mpp36"; + marvell,function = "gpio"; + }; + pmx_led_info: pmx-led-info { + marvell,pins = "mpp38"; + marvell,function = "gpio"; + }; + pmx_led_power: pmx-led-power { + marvell,pins = "mpp39"; + marvell,function = "gpio"; + }; + pmx_button_function: pmx-button-function { + marvell,pins = "mpp41"; + marvell,function = "gpio"; + }; + pmx_power_switch: pmx-power-switch { + marvell,pins = "mpp42"; + marvell,function = "gpio"; + }; + pmx_power_auto_switch: pmx-power-auto-switch { + marvell,pins = "mpp43"; + marvell,function = "gpio"; + }; + }; + + sata at 80000 { + nr-ports = <2>; + }; + }; + + gpio_keys { + function-button { + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + }; + + power-on-switch { + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; + + power-auto-switch { + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + }; + }; + + gpio_leds { + red-alarm-led { + label = "red:alarm"; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + }; + + red-function-led { + label = "red:function"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + }; + + amber-info-led { + label = "amber:info"; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + }; + + blue-function-led { + label = "blue:function"; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + }; + + blue-power-led { + label = "blue:power"; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + }; + }; + + regulators { + pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; + + usb_power: regulator at 1 { + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; + }; + + hdd_power0: regulator at 2 { + gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; + }; + + hdd_power1: regulator at 3 { + compatible = "regulator-fixed"; + reg = <3>; + regulator-name = "HDD1 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy1: ethernet-phy at 8 { + device_type = "ethernet-phy"; + reg = <8>; + }; +}; + +ð1 { + status = "okay"; + + ethernet1-port at 0 { + phy-handle = <ðphy1>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts new file mode 100644 index 0000000..4b64501 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts @@ -0,0 +1,57 @@ +/* + * Device Tree file for Buffalo Linkstation LS-WSXL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-duo-6281.dtsi" + +/ { + model = "Buffalo Linkstation LS-WSXL"; + compatible = "buffalo,lswsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + + memory { /* 128 MB */ + device_type = "memory"; + reg = <0x00000000 0x8000000>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts new file mode 100644 index 0000000..027f622 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts @@ -0,0 +1,113 @@ +/* + * Device Tree file for Buffalo Linkstation LS-WXL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-duo-6281.dtsi" + +/ { + model = "Buffalo Linkstation LS-WXL"; + compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + + memory { /* 128 MB */ + device_type = "memory"; + reg = <0x00000000 0x8000000>; + }; + + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_led_hdderr0: pmx-led-hdderr0 { + marvell,pins = "mpp8"; + marvell,function = "gpio"; + }; + pmx_led_hdderr1: pmx-led-hdderr1 { + marvell,pins = "mpp46"; + marvell,function = "gpio"; + }; + pmx_fan_lock: pmx-fan-lock { + marvell,pins = "mpp40"; + marvell,function = "gpio"; + }; + pmx_fan_high: pmx-fan-high { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; + pmx_fan_low: pmx-fan-low { + marvell,pins = "mpp48"; + marvell,function = "gpio"; + }; + }; + }; + + gpio_leds { + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm + &pmx_led_info &pmx_led_power + &pmx_led_function_blue + &pmx_led_hdderr0 + &pmx_led_hdderr1>; + + red-hdderr0-led { + label = "red:hdderr0"; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + }; + + red-hdderr1-led { + label = "red:hdderr1"; + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; + }; + }; + + gpio_fan { + compatible = "gpio-fan"; + pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; + pinctrl-names = "default"; + gpios = <&gpio1 16 GPIO_ACTIVE_LOW + &gpio1 15 GPIO_ACTIVE_LOW>; + + gpio-fan,speed-map = <0 3 + 1500 2 + 3250 1 + 5000 0>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/kirkwood-linkstation.dtsi new file mode 100644 index 0000000..69061b6 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation.dtsi @@ -0,0 +1,202 @@ +/* + * Device Tree common file for kirkwood based Buffalo Linkstation + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/ { + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + stdout-path = &uart0; + }; + + mbus { + pcie-controller { + status = "okay"; + pcie at 1,0 { + status = "okay"; + }; + }; + }; + + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd0: pmx-power-hdd0 { + marvell,function = "gpio"; + }; + pmx_usb_vbus: pmx-usb-vbus { + marvell,function = "gpio"; + }; + pmx_led_alarm: pmx-led-alarm { + marvell,function = "gpio"; + }; + pmx_led_function_red: pmx-led-function-red { + marvell,function = "gpio"; + }; + pmx_led_function_blue: pmx-led-function-blue { + marvell,function = "gpio"; + }; + pmx_led_info: pmx-led-info { + marvell,function = "gpio"; + }; + pmx_led_power: pmx-led-power { + marvell,function = "gpio"; + }; + pmx_button_function: pmx-button-function { + marvell,function = "gpio"; + }; + pmx_power_switch: pmx-power-switch { + marvell,function = "gpio"; + }; + pmx_power_auto_switch: pmx-power-auto-switch { + marvell,function = "gpio"; + }; + }; + + serial at 12000 { + status = "okay"; + }; + + sata at 80000 { + status = "okay"; + nr-ports = <1>; + }; + + spi at 10600 { + status = "okay"; + + m25p40 at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p40", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + mode = <0>; + + partition at 0 { + reg = <0x0 0x60000>; + label = "uboot"; + read-only; + }; + + partition at 60000 { + reg = <0x60000 0x10000>; + label = "dtb"; + read-only; + }; + + partition at 70000 { + reg = <0x70000 0x10000>; + label = "uboot_env"; + }; + }; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&pmx_button_function &pmx_power_switch + &pmx_power_auto_switch>; + pinctrl-names = "default"; + + function-button { + label = "Function Button"; + linux,code = <KEY_OPTION>; + }; + + power-on-switch { + label = "Power-on Switch"; + linux,code = <KEY_RESERVED>; + linux,input-type = <5>; + }; + + power-auto-switch { + label = "Power-auto Switch"; + linux,code = <KEY_ESC>; + linux,input-type = <5>; + }; + }; + + gpio_leds { + compatible = "gpio-leds"; + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm + &pmx_led_info &pmx_led_power + &pmx_led_function_blue>; + pinctrl-names = "default"; + }; + + restart_poweroff { + compatible = "restart-poweroff"; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&pmx_power_hdd0 &pmx_usb_vbus>; + pinctrl-names = "default"; + + usb_power: regulator at 1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "USB Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + }; + + hdd_power0: regulator at 2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "HDD0 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + }; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts deleted file mode 100644 index f5db16a..0000000 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ /dev/null @@ -1,301 +0,0 @@ -/* - * Device Tree file for Buffalo Linkstation LS-WXL/WSXL - * - * Copyright (C) 2015, rogershimizu at gmail.com - * - * 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. - */ - -/dts-v1/; - -#include "kirkwood.dtsi" -#include "kirkwood-6281.dtsi" - -/ { - model = "Buffalo Linkstation LS-WXL/WSXL"; - compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; - - memory { /* 128 MB */ - device_type = "memory"; - reg = <0x00000000 0x8000000>; - }; - - chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk"; - stdout-path = &uart0; - }; - - mbus { - pcie-controller { - status = "okay"; - pcie at 1,0 { - status = "okay"; - }; - }; - }; - - ocp at f1000000 { - pinctrl: pin-controller at 10000 { - pmx_power_hdd0: pmx-power-hdd0 { - marvell,pins = "mpp28"; - marvell,function = "gpio"; - }; - pmx_power_hdd1: pmx-power-hdd1 { - marvell,pins = "mpp29"; - marvell,function = "gpio"; - }; - pmx_usb_vbus: pmx-usb-vbus { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_fan_high: pmx-fan-high { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - pmx_fan_low: pmx-fan-low { - marvell,pins = "mpp48"; - marvell,function = "gpio"; - }; - pmx_led_hdderr0: pmx-led-hdderr0 { - marvell,pins = "mpp8"; - marvell,function = "gpio"; - }; - pmx_led_hdderr1: pmx-led-hdderr1 { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_led_alarm: pmx-led-alarm { - marvell,pins = "mpp49"; - marvell,function = "gpio"; - }; - pmx_led_function_red: pmx-led-function-red { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; - pmx_led_function_blue: pmx-led-function-blue { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_led_info: pmx-led-info { - marvell,pins = "mpp38"; - marvell,function = "gpio"; - }; - pmx_led_power: pmx-led-power { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_fan_lock: pmx-fan-lock { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_button_function: pmx-button-function { - marvell,pins = "mpp41"; - marvell,function = "gpio"; - }; - pmx_power_switch: pmx-power-switch { - marvell,pins = "mpp42"; - marvell,function = "gpio"; - }; - pmx_power_auto_switch: pmx-power-auto-switch { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - }; - - serial at 12000 { - status = "okay"; - }; - - sata at 80000 { - status = "okay"; - nr-ports = <2>; - }; - - spi at 10600 { - status = "okay"; - - m25p40 at 0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "st,m25p40", "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - mode = <0>; - - partition at 0 { - reg = <0x0 0x60000>; - label = "uboot"; - read-only; - }; - - partition at 60000 { - reg = <0x60000 0x10000>; - label = "dtb"; - read-only; - }; - - partition at 70000 { - reg = <0x70000 0x10000>; - label = "uboot_env"; - }; - }; - }; - }; - - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_button_function &pmx_power_switch - &pmx_power_auto_switch>; - pinctrl-names = "default"; - - button at 1 { - label = "Function Button"; - linux,code = <KEY_OPTION>; - gpios = <&gpio1 41 GPIO_ACTIVE_LOW>; - }; - - button at 2 { - label = "Power-on Switch"; - linux,code = <KEY_RESERVED>; - linux,input-type = <5>; - gpios = <&gpio1 42 GPIO_ACTIVE_LOW>; - }; - - button at 3 { - label = "Power-auto Switch"; - linux,code = <KEY_ESC>; - linux,input-type = <5>; - gpios = <&gpio1 43 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_leds { - compatible = "gpio-leds"; - pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm - &pmx_led_info &pmx_led_power - &pmx_led_function_blue - &pmx_led_hdderr0 - &pmx_led_hdderr1>; - pinctrl-names = "default"; - - led at 1 { - label = "lswxl:blue:func"; - gpios = <&gpio1 36 GPIO_ACTIVE_LOW>; - }; - - led at 2 { - label = "lswxl:red:alarm"; - gpios = <&gpio1 49 GPIO_ACTIVE_LOW>; - }; - - led at 3 { - label = "lswxl:amber:info"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; - }; - - led at 4 { - label = "lswxl:blue:power"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; - }; - - led at 5 { - label = "lswxl:red:func"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; - default-state = "keep"; - }; - - led at 6 { - label = "lswxl:red:hdderr0"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; - }; - - led at 7 { - label = "lswxl:red:hdderr1"; - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_fan { - compatible = "gpio-fan"; - pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; - pinctrl-names = "default"; - - gpios = <&gpio0 47 GPIO_ACTIVE_LOW - &gpio0 48 GPIO_ACTIVE_LOW>; - - gpio-fan,speed-map = <0 3 - 1500 2 - 3250 1 - 5000 0>; - - alarm-gpios = <&gpio1 49 GPIO_ACTIVE_HIGH>; - }; - - restart_poweroff { - compatible = "restart-poweroff"; - }; - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; - pinctrl-names = "default"; - - usb_power: regulator at 1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 37 GPIO_ACTIVE_HIGH>; - }; - hdd_power0: regulator at 2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "HDD0 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; - }; - hdd_power1: regulator at 3 { - compatible = "regulator-fixed"; - reg = <3>; - regulator-name = "HDD1 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&mdio { - status = "okay"; - - ethphy1: ethernet-phy at 8 { - device_type = "ethernet-phy"; - reg = <8>; - }; -}; - -ð1 { - status = "okay"; - - ethernet1-port at 0 { - phy-handle = <ðphy1>; - }; -}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl 2016-01-19 13:49 ` [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl Roger Shimizu @ 2016-01-19 14:05 ` Andrew Lunn 2016-01-19 14:15 ` Roger Shimizu 2016-01-20 1:08 ` Andrew Lunn 1 sibling, 1 reply; 40+ messages in thread From: Andrew Lunn @ 2016-01-19 14:05 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jan 19, 2016 at 10:49:01PM +0900, Roger Shimizu wrote: > LS-WXL/WSXL are both kirkwood-6281 based 2-Bay NAS devices, which share > many MPP pins. However they are slightly different: > - There're two red LED indicator on LS-WXL to show when HDD fails, > but there's no such on LS-WSXL. > - There's 4-level speed adjustable FAN on LS-WXL, but not LS-WSXL. > > So after the split, common part goes into .dtsi file: > - kirkwood-linkstation.dtsi > - kirkwood-linkstation-duo-6281.dtsi > while all rest part goes into device specific .dts file: > - kirkwood-linkstation-lswsxl.dts > - kirkwood-linkstation-lswxl.dts > > With a few gpio/led-pin changes, including fix for the issue mentioned > in Debian BTS #810894. Hi Roger This fix should be a separate patch. We can then get it applied to stable, so it makes its way back to older kernels. Andrew > > License all newly created files under GPLv2/X11. > > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> > --- > .../devicetree/bindings/arm/marvell,kirkwood.txt | 3 +- > arch/arm/boot/dts/Makefile | 4 +- > .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 185 +++++++++++++ > arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++ > arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 113 ++++++++ > arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 ++++++++++++++ > arch/arm/boot/dts/kirkwood-lswxl.dts | 301 --------------------- > 7 files changed, 561 insertions(+), 304 deletions(-) > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi > delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts > > diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt > index 5171ad8..c7f8e3e 100644 > --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt > +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt > @@ -19,9 +19,10 @@ SoC. Currently known SoC compatibles are: > And in addition, the compatible shall be extended with the specific > board. Currently known boards are: > > +"buffalo,linkstation-lswsxl" > +"buffalo,linkstation-lswxl" > "buffalo,lschlv2" > "buffalo,lswvl" > -"buffalo,lswxl" > "buffalo,lsxhl" > "buffalo,lsxl" > "dlink,dns-320" > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 30bbc37..6dff6af 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -183,9 +183,9 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ > kirkwood-is2.dtb \ > kirkwood-km_kirkwood.dtb \ > kirkwood-laplug.dtb \ > + kirkwood-linkstation-lswsxl.dtb \ > + kirkwood-linkstation-lswxl.dtb \ > kirkwood-lschlv2.dtb \ > - kirkwood-lswvl.dtb \ > - kirkwood-lswxl.dtb \ > kirkwood-lsxhl.dtb \ > kirkwood-mplcec4.dtb \ > kirkwood-mv88f6281gtw-ge.dtb \ > diff --git a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > new file mode 100644 > index 0000000..d83ae8e > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > @@ -0,0 +1,185 @@ > +/* > + * Device Tree common file for kirkwood-6281 based 2-Bay Buffalo Linkstation > + * > + * Copyright (C) 2015, 2016 > + * Roger Shimizu <rogershimizu@gmail.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +#include "kirkwood.dtsi" > +#include "kirkwood-6281.dtsi" > +#include "kirkwood-linkstation.dtsi" > + > +/ { > + ocp at f1000000 { > + pinctrl: pin-controller at 10000 { > + pmx_power_hdd0: pmx-power-hdd0 { > + marvell,pins = "mpp28"; > + marvell,function = "gpio"; > + }; > + pmx_power_hdd1: pmx-power-hdd1 { > + marvell,pins = "mpp29"; > + marvell,function = "gpio"; > + }; > + pmx_usb_vbus: pmx-usb-vbus { > + marvell,pins = "mpp37"; > + marvell,function = "gpio"; > + }; > + pmx_led_alarm: pmx-led-alarm { > + marvell,pins = "mpp49"; > + marvell,function = "gpio"; > + }; > + pmx_led_function_red: pmx-led-function-red { > + marvell,pins = "mpp34"; > + marvell,function = "gpio"; > + }; > + pmx_led_function_blue: pmx-led-function-blue { > + marvell,pins = "mpp36"; > + marvell,function = "gpio"; > + }; > + pmx_led_info: pmx-led-info { > + marvell,pins = "mpp38"; > + marvell,function = "gpio"; > + }; > + pmx_led_power: pmx-led-power { > + marvell,pins = "mpp39"; > + marvell,function = "gpio"; > + }; > + pmx_button_function: pmx-button-function { > + marvell,pins = "mpp41"; > + marvell,function = "gpio"; > + }; > + pmx_power_switch: pmx-power-switch { > + marvell,pins = "mpp42"; > + marvell,function = "gpio"; > + }; > + pmx_power_auto_switch: pmx-power-auto-switch { > + marvell,pins = "mpp43"; > + marvell,function = "gpio"; > + }; > + }; > + > + sata at 80000 { > + nr-ports = <2>; > + }; > + }; > + > + gpio_keys { > + function-button { > + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; > + }; > + > + power-on-switch { > + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; > + }; > + > + power-auto-switch { > + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; > + }; > + }; > + > + gpio_leds { > + red-alarm-led { > + label = "red:alarm"; > + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; > + }; > + > + red-function-led { > + label = "red:function"; > + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; > + }; > + > + amber-info-led { > + label = "amber:info"; > + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; > + }; > + > + blue-function-led { > + label = "blue:function"; > + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; > + }; > + > + blue-power-led { > + label = "blue:power"; > + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; > + }; > + }; > + > + regulators { > + pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; > + > + usb_power: regulator at 1 { > + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; > + }; > + > + hdd_power0: regulator at 2 { > + gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; > + }; > + > + hdd_power1: regulator at 3 { > + compatible = "regulator-fixed"; > + reg = <3>; > + regulator-name = "HDD1 Power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; > + }; > + }; > +}; > + > +&mdio { > + status = "okay"; > + > + ethphy1: ethernet-phy at 8 { > + device_type = "ethernet-phy"; > + reg = <8>; > + }; > +}; > + > +ð1 { > + status = "okay"; > + > + ethernet1-port at 0 { > + phy-handle = <ðphy1>; > + }; > +}; > diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts > new file mode 100644 > index 0000000..4b64501 > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts > @@ -0,0 +1,57 @@ > +/* > + * Device Tree file for Buffalo Linkstation LS-WSXL > + * > + * Copyright (C) 2015, 2016 > + * Roger Shimizu <rogershimizu@gmail.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > +#include "kirkwood-linkstation-duo-6281.dtsi" > + > +/ { > + model = "Buffalo Linkstation LS-WSXL"; > + compatible = "buffalo,lswsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; > + > + memory { /* 128 MB */ > + device_type = "memory"; > + reg = <0x00000000 0x8000000>; > + }; > +}; > diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > new file mode 100644 > index 0000000..027f622 > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > @@ -0,0 +1,113 @@ > +/* > + * Device Tree file for Buffalo Linkstation LS-WXL > + * > + * Copyright (C) 2015, 2016 > + * Roger Shimizu <rogershimizu@gmail.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > +#include "kirkwood-linkstation-duo-6281.dtsi" > + > +/ { > + model = "Buffalo Linkstation LS-WXL"; > + compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; > + > + memory { /* 128 MB */ > + device_type = "memory"; > + reg = <0x00000000 0x8000000>; > + }; > + > + ocp at f1000000 { > + pinctrl: pin-controller at 10000 { > + pmx_led_hdderr0: pmx-led-hdderr0 { > + marvell,pins = "mpp8"; > + marvell,function = "gpio"; > + }; > + pmx_led_hdderr1: pmx-led-hdderr1 { > + marvell,pins = "mpp46"; > + marvell,function = "gpio"; > + }; > + pmx_fan_lock: pmx-fan-lock { > + marvell,pins = "mpp40"; > + marvell,function = "gpio"; > + }; > + pmx_fan_high: pmx-fan-high { > + marvell,pins = "mpp47"; > + marvell,function = "gpio"; > + }; > + pmx_fan_low: pmx-fan-low { > + marvell,pins = "mpp48"; > + marvell,function = "gpio"; > + }; > + }; > + }; > + > + gpio_leds { > + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm > + &pmx_led_info &pmx_led_power > + &pmx_led_function_blue > + &pmx_led_hdderr0 > + &pmx_led_hdderr1>; > + > + red-hdderr0-led { > + label = "red:hdderr0"; > + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; > + }; > + > + red-hdderr1-led { > + label = "red:hdderr1"; > + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; > + }; > + }; > + > + gpio_fan { > + compatible = "gpio-fan"; > + pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; > + pinctrl-names = "default"; > + gpios = <&gpio1 16 GPIO_ACTIVE_LOW > + &gpio1 15 GPIO_ACTIVE_LOW>; > + > + gpio-fan,speed-map = <0 3 > + 1500 2 > + 3250 1 > + 5000 0>; > + }; > +}; > diff --git a/arch/arm/boot/dts/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/kirkwood-linkstation.dtsi > new file mode 100644 > index 0000000..69061b6 > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-linkstation.dtsi > @@ -0,0 +1,202 @@ > +/* > + * Device Tree common file for kirkwood based Buffalo Linkstation > + * > + * Copyright (C) 2015, 2016 > + * Roger Shimizu <rogershimizu@gmail.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/ { > + chosen { > + bootargs = "console=ttyS0,115200n8 earlyprintk"; > + stdout-path = &uart0; > + }; > + > + mbus { > + pcie-controller { > + status = "okay"; > + pcie at 1,0 { > + status = "okay"; > + }; > + }; > + }; > + > + ocp at f1000000 { > + pinctrl: pin-controller at 10000 { > + pmx_power_hdd0: pmx-power-hdd0 { > + marvell,function = "gpio"; > + }; > + pmx_usb_vbus: pmx-usb-vbus { > + marvell,function = "gpio"; > + }; > + pmx_led_alarm: pmx-led-alarm { > + marvell,function = "gpio"; > + }; > + pmx_led_function_red: pmx-led-function-red { > + marvell,function = "gpio"; > + }; > + pmx_led_function_blue: pmx-led-function-blue { > + marvell,function = "gpio"; > + }; > + pmx_led_info: pmx-led-info { > + marvell,function = "gpio"; > + }; > + pmx_led_power: pmx-led-power { > + marvell,function = "gpio"; > + }; > + pmx_button_function: pmx-button-function { > + marvell,function = "gpio"; > + }; > + pmx_power_switch: pmx-power-switch { > + marvell,function = "gpio"; > + }; > + pmx_power_auto_switch: pmx-power-auto-switch { > + marvell,function = "gpio"; > + }; > + }; > + > + serial at 12000 { > + status = "okay"; > + }; > + > + sata at 80000 { > + status = "okay"; > + nr-ports = <1>; > + }; > + > + spi at 10600 { > + status = "okay"; > + > + m25p40 at 0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "st,m25p40", "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <25000000>; > + mode = <0>; > + > + partition at 0 { > + reg = <0x0 0x60000>; > + label = "uboot"; > + read-only; > + }; > + > + partition at 60000 { > + reg = <0x60000 0x10000>; > + label = "dtb"; > + read-only; > + }; > + > + partition at 70000 { > + reg = <0x70000 0x10000>; > + label = "uboot_env"; > + }; > + }; > + }; > + }; > + > + gpio_keys { > + compatible = "gpio-keys"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_button_function &pmx_power_switch > + &pmx_power_auto_switch>; > + pinctrl-names = "default"; > + > + function-button { > + label = "Function Button"; > + linux,code = <KEY_OPTION>; > + }; > + > + power-on-switch { > + label = "Power-on Switch"; > + linux,code = <KEY_RESERVED>; > + linux,input-type = <5>; > + }; > + > + power-auto-switch { > + label = "Power-auto Switch"; > + linux,code = <KEY_ESC>; > + linux,input-type = <5>; > + }; > + }; > + > + gpio_leds { > + compatible = "gpio-leds"; > + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm > + &pmx_led_info &pmx_led_power > + &pmx_led_function_blue>; > + pinctrl-names = "default"; > + }; > + > + restart_poweroff { > + compatible = "restart-poweroff"; > + }; > + > + regulators { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_power_hdd0 &pmx_usb_vbus>; > + pinctrl-names = "default"; > + > + usb_power: regulator at 1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "USB Power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + }; > + > + hdd_power0: regulator at 2 { > + compatible = "regulator-fixed"; > + reg = <2>; > + regulator-name = "HDD0 Power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + }; > + }; > +}; > diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts > deleted file mode 100644 > index f5db16a..0000000 > --- a/arch/arm/boot/dts/kirkwood-lswxl.dts > +++ /dev/null > @@ -1,301 +0,0 @@ > -/* > - * Device Tree file for Buffalo Linkstation LS-WXL/WSXL > - * > - * Copyright (C) 2015, rogershimizu at gmail.com > - * > - * 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. > - */ > - > -/dts-v1/; > - > -#include "kirkwood.dtsi" > -#include "kirkwood-6281.dtsi" > - > -/ { > - model = "Buffalo Linkstation LS-WXL/WSXL"; > - compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; > - > - memory { /* 128 MB */ > - device_type = "memory"; > - reg = <0x00000000 0x8000000>; > - }; > - > - chosen { > - bootargs = "console=ttyS0,115200n8 earlyprintk"; > - stdout-path = &uart0; > - }; > - > - mbus { > - pcie-controller { > - status = "okay"; > - pcie at 1,0 { > - status = "okay"; > - }; > - }; > - }; > - > - ocp at f1000000 { > - pinctrl: pin-controller at 10000 { > - pmx_power_hdd0: pmx-power-hdd0 { > - marvell,pins = "mpp28"; > - marvell,function = "gpio"; > - }; > - pmx_power_hdd1: pmx-power-hdd1 { > - marvell,pins = "mpp29"; > - marvell,function = "gpio"; > - }; > - pmx_usb_vbus: pmx-usb-vbus { > - marvell,pins = "mpp37"; > - marvell,function = "gpio"; > - }; > - pmx_fan_high: pmx-fan-high { > - marvell,pins = "mpp47"; > - marvell,function = "gpio"; > - }; > - pmx_fan_low: pmx-fan-low { > - marvell,pins = "mpp48"; > - marvell,function = "gpio"; > - }; > - pmx_led_hdderr0: pmx-led-hdderr0 { > - marvell,pins = "mpp8"; > - marvell,function = "gpio"; > - }; > - pmx_led_hdderr1: pmx-led-hdderr1 { > - marvell,pins = "mpp46"; > - marvell,function = "gpio"; > - }; > - pmx_led_alarm: pmx-led-alarm { > - marvell,pins = "mpp49"; > - marvell,function = "gpio"; > - }; > - pmx_led_function_red: pmx-led-function-red { > - marvell,pins = "mpp34"; > - marvell,function = "gpio"; > - }; > - pmx_led_function_blue: pmx-led-function-blue { > - marvell,pins = "mpp36"; > - marvell,function = "gpio"; > - }; > - pmx_led_info: pmx-led-info { > - marvell,pins = "mpp38"; > - marvell,function = "gpio"; > - }; > - pmx_led_power: pmx-led-power { > - marvell,pins = "mpp39"; > - marvell,function = "gpio"; > - }; > - pmx_fan_lock: pmx-fan-lock { > - marvell,pins = "mpp40"; > - marvell,function = "gpio"; > - }; > - pmx_button_function: pmx-button-function { > - marvell,pins = "mpp41"; > - marvell,function = "gpio"; > - }; > - pmx_power_switch: pmx-power-switch { > - marvell,pins = "mpp42"; > - marvell,function = "gpio"; > - }; > - pmx_power_auto_switch: pmx-power-auto-switch { > - marvell,pins = "mpp43"; > - marvell,function = "gpio"; > - }; > - }; > - > - serial at 12000 { > - status = "okay"; > - }; > - > - sata at 80000 { > - status = "okay"; > - nr-ports = <2>; > - }; > - > - spi at 10600 { > - status = "okay"; > - > - m25p40 at 0 { > - #address-cells = <1>; > - #size-cells = <1>; > - compatible = "st,m25p40", "jedec,spi-nor"; > - reg = <0>; > - spi-max-frequency = <25000000>; > - mode = <0>; > - > - partition at 0 { > - reg = <0x0 0x60000>; > - label = "uboot"; > - read-only; > - }; > - > - partition at 60000 { > - reg = <0x60000 0x10000>; > - label = "dtb"; > - read-only; > - }; > - > - partition at 70000 { > - reg = <0x70000 0x10000>; > - label = "uboot_env"; > - }; > - }; > - }; > - }; > - > - gpio_keys { > - compatible = "gpio-keys"; > - #address-cells = <1>; > - #size-cells = <0>; > - pinctrl-0 = <&pmx_button_function &pmx_power_switch > - &pmx_power_auto_switch>; > - pinctrl-names = "default"; > - > - button at 1 { > - label = "Function Button"; > - linux,code = <KEY_OPTION>; > - gpios = <&gpio1 41 GPIO_ACTIVE_LOW>; > - }; > - > - button at 2 { > - label = "Power-on Switch"; > - linux,code = <KEY_RESERVED>; > - linux,input-type = <5>; > - gpios = <&gpio1 42 GPIO_ACTIVE_LOW>; > - }; > - > - button at 3 { > - label = "Power-auto Switch"; > - linux,code = <KEY_ESC>; > - linux,input-type = <5>; > - gpios = <&gpio1 43 GPIO_ACTIVE_LOW>; > - }; > - }; > - > - gpio_leds { > - compatible = "gpio-leds"; > - pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm > - &pmx_led_info &pmx_led_power > - &pmx_led_function_blue > - &pmx_led_hdderr0 > - &pmx_led_hdderr1>; > - pinctrl-names = "default"; > - > - led at 1 { > - label = "lswxl:blue:func"; > - gpios = <&gpio1 36 GPIO_ACTIVE_LOW>; > - }; > - > - led at 2 { > - label = "lswxl:red:alarm"; > - gpios = <&gpio1 49 GPIO_ACTIVE_LOW>; > - }; > - > - led at 3 { > - label = "lswxl:amber:info"; > - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; > - }; > - > - led at 4 { > - label = "lswxl:blue:power"; > - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; > - }; > - > - led at 5 { > - label = "lswxl:red:func"; > - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; > - default-state = "keep"; > - }; > - > - led at 6 { > - label = "lswxl:red:hdderr0"; > - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; > - }; > - > - led at 7 { > - label = "lswxl:red:hdderr1"; > - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; > - }; > - }; > - > - gpio_fan { > - compatible = "gpio-fan"; > - pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; > - pinctrl-names = "default"; > - > - gpios = <&gpio0 47 GPIO_ACTIVE_LOW > - &gpio0 48 GPIO_ACTIVE_LOW>; > - > - gpio-fan,speed-map = <0 3 > - 1500 2 > - 3250 1 > - 5000 0>; > - > - alarm-gpios = <&gpio1 49 GPIO_ACTIVE_HIGH>; > - }; > - > - restart_poweroff { > - compatible = "restart-poweroff"; > - }; > - > - regulators { > - compatible = "simple-bus"; > - #address-cells = <1>; > - #size-cells = <0>; > - pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; > - pinctrl-names = "default"; > - > - usb_power: regulator at 1 { > - compatible = "regulator-fixed"; > - reg = <1>; > - regulator-name = "USB Power"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - enable-active-high; > - regulator-always-on; > - regulator-boot-on; > - gpio = <&gpio0 37 GPIO_ACTIVE_HIGH>; > - }; > - hdd_power0: regulator at 2 { > - compatible = "regulator-fixed"; > - reg = <2>; > - regulator-name = "HDD0 Power"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - enable-active-high; > - regulator-always-on; > - regulator-boot-on; > - gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; > - }; > - hdd_power1: regulator at 3 { > - compatible = "regulator-fixed"; > - reg = <3>; > - regulator-name = "HDD1 Power"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - enable-active-high; > - regulator-always-on; > - regulator-boot-on; > - gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; > - }; > - }; > -}; > - > -&mdio { > - status = "okay"; > - > - ethphy1: ethernet-phy at 8 { > - device_type = "ethernet-phy"; > - reg = <8>; > - }; > -}; > - > -ð1 { > - status = "okay"; > - > - ethernet1-port at 0 { > - phy-handle = <ðphy1>; > - }; > -}; > -- > 2.1.4 > ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl 2016-01-19 14:05 ` Andrew Lunn @ 2016-01-19 14:15 ` Roger Shimizu 2016-01-19 14:48 ` Andrew Lunn 0 siblings, 1 reply; 40+ messages in thread From: Roger Shimizu @ 2016-01-19 14:15 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jan 19, 2016 at 11:05 PM, Andrew Lunn <andrew@lunn.ch> wrote: > On Tue, Jan 19, 2016 at 10:49:01PM +0900, Roger Shimizu wrote: >> With a few gpio/led-pin changes, including fix for the issue mentioned >> in Debian BTS #810894. > > Hi Roger > > This fix should be a separate patch. We can then get it applied to > stable, so it makes its way back to older kernels. Dear Andrew, So this patchset would be reviewed or not? Or I have to create another patchset including both fix for "kirkwood-lswxl.dts" and the dts split? Cheers, Roger ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl 2016-01-19 14:15 ` Roger Shimizu @ 2016-01-19 14:48 ` Andrew Lunn 2016-01-19 14:56 ` Roger Shimizu 0 siblings, 1 reply; 40+ messages in thread From: Andrew Lunn @ 2016-01-19 14:48 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jan 19, 2016 at 11:15:35PM +0900, Roger Shimizu wrote: > On Tue, Jan 19, 2016 at 11:05 PM, Andrew Lunn <andrew@lunn.ch> wrote: > > On Tue, Jan 19, 2016 at 10:49:01PM +0900, Roger Shimizu wrote: > >> With a few gpio/led-pin changes, including fix for the issue mentioned > >> in Debian BTS #810894. > > > > Hi Roger > > > > This fix should be a separate patch. We can then get it applied to > > stable, so it makes its way back to older kernels. > > Dear Andrew, > > So this patchset would be reviewed or not? I will review it and give comments, but won't accept it. > Or I have to create another patchset including both fix for > "kirkwood-lswxl.dts" and the dts split? Yes please. And the fix patch should come first, and have a fixes: tag. As a general rule of thumb, it is better to have lots of small, easy to review patches, than an couple of big patch. So i would probably have: 1) Fix 2) License change. 3) Split patch LS-WXL/WSXL 4) Split patch LS-WVL/VL The license change needs a different sort of review to the other patches, so having it as a separate patch helps with the review process. Andrew ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl 2016-01-19 14:48 ` Andrew Lunn @ 2016-01-19 14:56 ` Roger Shimizu 0 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-19 14:56 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jan 19, 2016 at 11:48 PM, Andrew Lunn <andrew@lunn.ch> wrote: > On Tue, Jan 19, 2016 at 11:15:35PM +0900, Roger Shimizu wrote: >> On Tue, Jan 19, 2016 at 11:05 PM, Andrew Lunn <andrew@lunn.ch> wrote: >> > On Tue, Jan 19, 2016 at 10:49:01PM +0900, Roger Shimizu wrote: >> >> With a few gpio/led-pin changes, including fix for the issue mentioned >> >> in Debian BTS #810894. >> > >> > Hi Roger >> > >> > This fix should be a separate patch. We can then get it applied to >> > stable, so it makes its way back to older kernels. >> >> Dear Andrew, >> >> So this patchset would be reviewed or not? > > I will review it and give comments, but won't accept it. Please do. I'll modify accordingly and include it in v2 patchset. >> Or I have to create another patchset including both fix for >> "kirkwood-lswxl.dts" and the dts split? > > Yes please. And the fix patch should come first, and have a fixes: > tag. > > As a general rule of thumb, it is better to have lots of small, easy > to review patches, than an couple of big patch. So i would probably > have: > > 1) Fix > 2) License change. > 3) Split patch LS-WXL/WSXL > 4) Split patch LS-WVL/VL > > The license change needs a different sort of review to the other > patches, so having it as a separate patch helps with the review > process. Thanks for your clarify! Now I understand how to proceed. Will send out my v2 patchset within this week. Cheers, Roger ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl 2016-01-19 13:49 ` [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl Roger Shimizu 2016-01-19 14:05 ` Andrew Lunn @ 2016-01-20 1:08 ` Andrew Lunn 1 sibling, 0 replies; 40+ messages in thread From: Andrew Lunn @ 2016-01-20 1:08 UTC (permalink / raw) To: linux-arm-kernel > + gpio_leds { > + red-alarm-led { > + label = "red:alarm"; Led labels are supposed to have the machine name in them. This used to be "lswxl:red:alarm". It cannot be so specific now that it is in a dtsi file. So i would suggest "linkstation:red:alarm". Otherwise, these changes look O.K. Andrew ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 2/2] ARM: dts: kirkwood: split lswvl into linkstation lsvl and lswvl 2016-01-19 13:49 [PATCH 0/2] ARM: dts: kirkwood: split lswxl and lswvl with fixes Roger Shimizu 2016-01-19 13:49 ` [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl Roger Shimizu @ 2016-01-19 13:49 ` Roger Shimizu 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu 3 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-19 13:49 UTC (permalink / raw) To: linux-arm-kernel LS-WVL/VL are both kirkwood-6282 based NAS devices, which share many MPP pins. However they are slightly different: - There're two red LED indicator on LS-WVL to show when HDD fails, which is similar to LS-WXL, but there's no such on LS-VL. - LS-WVL is 2-Bay NAS, and LS-VL is only 1-Bay. So after the split, common part goes into .dtsi file: - kirkwood-linkstation-6282.dtsi while all rest part goes into device specific .dts file: - kirkwood-linkstation-lsvl.dts - kirkwood-linkstation-lswvl.dts License all newly created files under GPLv2/X11. Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> --- .../devicetree/bindings/arm/marvell,kirkwood.txt | 3 +- arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 190 +++++++++++++ arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 ++++++++ arch/arm/boot/dts/kirkwood-lswvl.dts | 301 --------------------- 6 files changed, 363 insertions(+), 302 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt index c7f8e3e..0d5d0f6 100644 --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt @@ -19,10 +19,11 @@ SoC. Currently known SoC compatibles are: And in addition, the compatible shall be extended with the specific board. Currently known boards are: +"buffalo,linkstation-lsvl" "buffalo,linkstation-lswsxl" "buffalo,linkstation-lswxl" +"buffalo,linkstation-lswvl" "buffalo,lschlv2" -"buffalo,lswvl" "buffalo,lsxhl" "buffalo,lsxl" "dlink,dns-320" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 6dff6af..3e2cf27 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -183,7 +183,9 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-is2.dtb \ kirkwood-km_kirkwood.dtb \ kirkwood-laplug.dtb \ + kirkwood-linkstation-lsvl.dtb \ kirkwood-linkstation-lswsxl.dtb \ + kirkwood-linkstation-lswvl.dtb \ kirkwood-linkstation-lswxl.dtb \ kirkwood-lschlv2.dtb \ kirkwood-lsxhl.dtb \ diff --git a/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi new file mode 100644 index 0000000..73594d1 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi @@ -0,0 +1,190 @@ +/* + * Device Tree common file for kirkwood-6282 based Buffalo Linkstation + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "kirkwood.dtsi" +#include "kirkwood-6282.dtsi" +#include "kirkwood-linkstation.dtsi" + +/ { + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd0: pmx-power-hdd0 { + marvell,pins = "mpp8"; + marvell,function = "gpio"; + }; + pmx_usb_vbus: pmx-usb-vbus { + marvell,pins = "mpp12"; + marvell,function = "gpio"; + }; + pmx_fan_high: pmx-fan-high { + marvell,pins = "mpp16"; + marvell,function = "gpio"; + }; + pmx_fan_low: pmx-fan-low { + marvell,pins = "mpp17"; + marvell,function = "gpio"; + }; + pmx_led_alarm: pmx-led-alarm { + marvell,pins = "mpp36"; + marvell,function = "gpio"; + }; + pmx_led_function_red: pmx-led-function-red { + marvell,pins = "mpp37"; + marvell,function = "gpio"; + }; + pmx_led_function_blue: pmx-led-function-blue { + marvell,pins = "mpp39"; + marvell,function = "gpio"; + }; + pmx_led_info: pmx-led-info { + marvell,pins = "mpp38"; + marvell,function = "gpio"; + }; + pmx_led_power: pmx-led-power { + marvell,pins = "mpp40"; + marvell,function = "gpio"; + }; + pmx_fan_lock: pmx-fan-lock { + marvell,pins = "mpp43"; + marvell,function = "gpio"; + }; + pmx_button_function: pmx-button-function { + marvell,pins = "mpp45"; + marvell,function = "gpio"; + }; + pmx_power_switch: pmx-power-switch { + marvell,pins = "mpp46"; + marvell,function = "gpio"; + }; + pmx_power_auto_switch: pmx-power-auto-switch { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; + }; + }; + + gpio_keys { + function-button { + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + }; + + power-on-switch { + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + }; + + power-auto-switch { + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + }; + }; + + gpio_leds { + red-alarm-led { + label = "red:alarm"; + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; + }; + + red-function-led { + label = "red:function"; + gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; + }; + + amber-info-led { + label = "amber:info"; + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; + }; + + blue-function-led { + label = "blue:function"; + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + }; + + blue-power-led { + label = "blue:power"; + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; + }; + }; + + gpio_fan { + compatible = "gpio-fan"; + pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; + pinctrl-names = "default"; + gpios = <&gpio0 17 GPIO_ACTIVE_LOW + &gpio0 16 GPIO_ACTIVE_LOW>; + + gpio-fan,speed-map = <0 3 + 1500 2 + 3250 1 + 5000 0>; + + alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; + }; + + regulators { + usb_power: regulator at 1 { + gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; + }; + + hdd_power0: regulator at 2 { + gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy0: ethernet-phy at 0 { + device_type = "ethernet-phy"; + reg = <0>; + }; +}; + +ð0 { + status = "okay"; + + ethernet0-port at 0 { + phy-handle = <ðphy0>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts new file mode 100644 index 0000000..edcba5c --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts @@ -0,0 +1,57 @@ +/* + * Device Tree file for Buffalo Linkstation LS-VL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-6282.dtsi" + +/ { + model = "Buffalo Linkstation LS-VL"; + compatible = "buffalo,lsvl", "marvell,kirkwood-88f6282", "marvell,kirkwood"; + + memory { /* 256 MB */ + device_type = "memory"; + reg = <0x00000000 0x10000000>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts new file mode 100644 index 0000000..cc369c0 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts @@ -0,0 +1,112 @@ +/* + * Device Tree file for Buffalo Linkstation LS-WVL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-6282.dtsi" + +/ { + model = "Buffalo Linkstation LS-WVL"; + compatible = "buffalo,lswvl","marvell,kirkwood-88f6282", "marvell,kirkwood"; + + memory { /* 256 MB */ + device_type = "memory"; + reg = <0x00000000 0x10000000>; + }; + + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd1: pmx-power-hdd1 { + marvell,pins = "mpp9"; + marvell,function = "gpio"; + }; + pmx_led_hdderr0: pmx-led-hdderr0 { + marvell,pins = "mpp34"; + marvell,function = "gpio"; + }; + pmx_led_hdderr1: pmx-led-hdderr1 { + marvell,pins = "mpp35"; + marvell,function = "gpio"; + }; + }; + + sata at 80000 { + nr-ports = <2>; + }; + }; + + gpio_leds { + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm + &pmx_led_info &pmx_led_power + &pmx_led_function_blue + &pmx_led_hdderr0 + &pmx_led_hdderr1>; + + red-hdderr0-led { + label = "red:hdderr0"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + }; + + red-hdderr1-led { + label = "red:hdderr1"; + gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; + }; + }; + + regulators { + pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; + + hdd_power1: regulator at 3 { + compatible = "regulator-fixed"; + reg = <3>; + regulator-name = "HDD1 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; + }; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts deleted file mode 100644 index 09eed3c..0000000 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ /dev/null @@ -1,301 +0,0 @@ -/* - * Device Tree file for Buffalo Linkstation LS-WVL/VL - * - * Copyright (C) 2015, rogershimizu at gmail.com - * - * 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. - */ - -/dts-v1/; - -#include "kirkwood.dtsi" -#include "kirkwood-6282.dtsi" - -/ { - model = "Buffalo Linkstation LS-WVL/VL"; - compatible = "buffalo,lswvl", "buffalo,lsvl", "marvell,kirkwood-88f6282", "marvell,kirkwood"; - - memory { /* 256 MB */ - device_type = "memory"; - reg = <0x00000000 0x10000000>; - }; - - chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk"; - stdout-path = &uart0; - }; - - mbus { - pcie-controller { - status = "okay"; - pcie at 1,0 { - status = "okay"; - }; - }; - }; - - ocp at f1000000 { - pinctrl: pin-controller at 10000 { - pmx_power_hdd0: pmx-power-hdd0 { - marvell,pins = "mpp8"; - marvell,function = "gpio"; - }; - pmx_power_hdd1: pmx-power-hdd1 { - marvell,pins = "mpp9"; - marvell,function = "gpio"; - }; - pmx_usb_vbus: pmx-usb-vbus { - marvell,pins = "mpp12"; - marvell,function = "gpio"; - }; - pmx_fan_high: pmx-fan-high { - marvell,pins = "mpp16"; - marvell,function = "gpio"; - }; - pmx_fan_low: pmx-fan-low { - marvell,pins = "mpp17"; - marvell,function = "gpio"; - }; - pmx_led_hdderr0: pmx-led-hdderr0 { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; - pmx_led_hdderr1: pmx-led-hdderr1 { - marvell,pins = "mpp35"; - marvell,function = "gpio"; - }; - pmx_led_alarm: pmx-led-alarm { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_led_function_red: pmx-led-function-red { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_led_info: pmx-led-info { - marvell,pins = "mpp38"; - marvell,function = "gpio"; - }; - pmx_led_function_blue: pmx-led-function-blue { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_led_power: pmx-led-power { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_fan_lock: pmx-fan-lock { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - pmx_button_function: pmx-button-function { - marvell,pins = "mpp45"; - marvell,function = "gpio"; - }; - pmx_power_switch: pmx-power-switch { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_power_auto_switch: pmx-power-auto-switch { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - }; - - serial at 12000 { - status = "okay"; - }; - - sata at 80000 { - status = "okay"; - nr-ports = <2>; - }; - - spi at 10600 { - status = "okay"; - - m25p40 at 0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "st,m25p40", "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - mode = <0>; - - partition at 0 { - reg = <0x0 0x60000>; - label = "uboot"; - read-only; - }; - - partition at 60000 { - reg = <0x60000 0x10000>; - label = "dtb"; - read-only; - }; - - partition at 70000 { - reg = <0x70000 0x10000>; - label = "uboot_env"; - }; - }; - }; - }; - - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_button_function &pmx_power_switch - &pmx_power_auto_switch>; - pinctrl-names = "default"; - - button at 1 { - label = "Function Button"; - linux,code = <KEY_OPTION>; - gpios = <&gpio0 45 GPIO_ACTIVE_LOW>; - }; - - button at 2 { - label = "Power-on Switch"; - linux,code = <KEY_RESERVED>; - linux,input-type = <5>; - gpios = <&gpio0 46 GPIO_ACTIVE_LOW>; - }; - - button at 3 { - label = "Power-auto Switch"; - linux,code = <KEY_ESC>; - linux,input-type = <5>; - gpios = <&gpio0 47 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_leds { - compatible = "gpio-leds"; - pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm - &pmx_led_info &pmx_led_power - &pmx_led_function_blue - &pmx_led_hdderr0 - &pmx_led_hdderr1>; - pinctrl-names = "default"; - - led at 1 { - label = "lswvl:red:alarm"; - gpios = <&gpio0 36 GPIO_ACTIVE_LOW>; - }; - - led at 2 { - label = "lswvl:red:func"; - gpios = <&gpio0 37 GPIO_ACTIVE_LOW>; - }; - - led at 3 { - label = "lswvl:amber:info"; - gpios = <&gpio0 38 GPIO_ACTIVE_LOW>; - }; - - led at 4 { - label = "lswvl:blue:func"; - gpios = <&gpio0 39 GPIO_ACTIVE_LOW>; - }; - - led at 5 { - label = "lswvl:blue:power"; - gpios = <&gpio0 40 GPIO_ACTIVE_LOW>; - default-state = "keep"; - }; - - led at 6 { - label = "lswvl:red:hdderr0"; - gpios = <&gpio0 34 GPIO_ACTIVE_LOW>; - }; - - led at 7 { - label = "lswvl:red:hdderr1"; - gpios = <&gpio0 35 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_fan { - compatible = "gpio-fan"; - pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; - pinctrl-names = "default"; - - gpios = <&gpio0 17 GPIO_ACTIVE_LOW - &gpio0 16 GPIO_ACTIVE_LOW>; - - gpio-fan,speed-map = <0 3 - 1500 2 - 3250 1 - 5000 0>; - - alarm-gpios = <&gpio0 43 GPIO_ACTIVE_HIGH>; - }; - - restart_poweroff { - compatible = "restart-poweroff"; - }; - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; - pinctrl-names = "default"; - - usb_power: regulator at 1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; - }; - hdd_power0: regulator at 2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "HDD0 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; - }; - hdd_power1: regulator at 3 { - compatible = "regulator-fixed"; - reg = <3>; - regulator-name = "HDD1 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&mdio { - status = "okay"; - - ethphy0: ethernet-phy at 0 { - device_type = "ethernet-phy"; - reg = <0>; - }; -}; - -ð0 { - status = "okay"; - - ethernet0-port at 0 { - phy-handle = <ðphy0>; - }; -}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl 2016-01-19 13:49 [PATCH 0/2] ARM: dts: kirkwood: split lswxl and lswvl with fixes Roger Shimizu 2016-01-19 13:49 ` [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl Roger Shimizu 2016-01-19 13:49 ` [PATCH 2/2] ARM: dts: kirkwood: split lswvl into linkstation lsvl and lswvl Roger Shimizu @ 2016-01-20 15:33 ` Roger Shimizu 2016-01-20 15:33 ` [PATCH v2 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu ` (6 more replies) 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu 3 siblings, 7 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-20 15:33 UTC (permalink / raw) To: linux-arm-kernel Dear kirkwood maintainers, Linkstation dts for ls-wxl and ls-wvl need some fixes: - [patch 1/7] and [patch 2/7] are fixes for gpio pin - [patch 3/7] and [patch 4/7] are fixes for gpio led Above 4 patches can be safely backported to 4.3/4.4 stable kernel. And in order to support more buffalo linkstation devices in convenient way, I split current 2 dts files into a few comoon dtsi files and device specific dts files. - [patch 5/7] relicense dts under GPLv2/X11 - [patch 6/7] split dts for lswxl - [patch 7/7] split dts for lswvl Changes in v2: - separate the fix and relicense patch - add "linkstation:" to all led labels Cheers. Roger Shimizu (7): ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl .../devicetree/bindings/arm/marvell,kirkwood.txt | 6 +- arch/arm/boot/dts/Makefile | 6 +- arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 191 +++++++++++++ .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 185 +++++++++++++ arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 ++++++++ arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 ++++++++ arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 ++++++++++++++ arch/arm/boot/dts/kirkwood-lswvl.dts | 301 --------------------- arch/arm/boot/dts/kirkwood-lswxl.dts | 301 --------------------- 11 files changed, 928 insertions(+), 606 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts -- 2.1.4 ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu @ 2016-01-20 15:33 ` Roger Shimizu 2016-01-20 17:11 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl Roger Shimizu ` (5 subsequent siblings) 6 siblings, 1 reply; 40+ messages in thread From: Roger Shimizu @ 2016-01-20 15:33 UTC (permalink / raw) To: linux-arm-kernel For kirkwood, gpio pins starts from 32 are in the 2nd bank, so it should be converted to "gpio1 <pin minus 32>" in dts file. e.g. gpio 40 should be "gpio1 8" Besides, a few other pin fixes for ls-wxl/wsxl, to match with mpp pin definition: - gpio-leds: "lswxl:blue:power" pin - gpio-leds: "lswxl:red:func" pin - gpio-leds: "lswxl:red:hdderr0" pin - gpio-leds: "lswxl:red:hdderr1" pin - gpio-fan: low/high/alarm pin The pin/bank issue was found when discussing Debian Bug #810894 [https://bugs.debian.org/810894#47] Fixes: e54e4b1b622e ("ARM: dts: add buffalo linkstation ls-wxl/wsxl") Reported-by: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> --- arch/arm/boot/dts/kirkwood-lswxl.dts | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts index f5db16a08597..0e93f6d19259 100644 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts @@ -1,7 +1,8 @@ /* * Device Tree file for Buffalo Linkstation LS-WXL/WSXL * - * Copyright (C) 2015, rogershimizu at gmail.com + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -156,21 +157,21 @@ button at 1 { label = "Function Button"; linux,code = <KEY_OPTION>; - gpios = <&gpio1 41 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; button at 2 { label = "Power-on Switch"; linux,code = <KEY_RESERVED>; linux,input-type = <5>; - gpios = <&gpio1 42 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; }; button at 3 { label = "Power-auto Switch"; linux,code = <KEY_ESC>; linux,input-type = <5>; - gpios = <&gpio1 43 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; }; @@ -185,12 +186,12 @@ led at 1 { label = "lswxl:blue:func"; - gpios = <&gpio1 36 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; led at 2 { label = "lswxl:red:alarm"; - gpios = <&gpio1 49 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; }; led at 3 { @@ -200,23 +201,23 @@ led at 4 { label = "lswxl:blue:power"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; }; led at 5 { label = "lswxl:red:func"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; default-state = "keep"; }; led at 6 { label = "lswxl:red:hdderr0"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led at 7 { label = "lswxl:red:hdderr1"; - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; @@ -225,15 +226,15 @@ pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; pinctrl-names = "default"; - gpios = <&gpio0 47 GPIO_ACTIVE_LOW - &gpio0 48 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 16 GPIO_ACTIVE_LOW + &gpio1 15 GPIO_ACTIVE_LOW>; gpio-fan,speed-map = <0 3 1500 2 3250 1 5000 0>; - alarm-gpios = <&gpio1 49 GPIO_ACTIVE_HIGH>; + alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; }; restart_poweroff { @@ -256,7 +257,7 @@ enable-active-high; regulator-always-on; regulator-boot-on; - gpio = <&gpio0 37 GPIO_ACTIVE_HIGH>; + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; }; hdd_power0: regulator at 2 { compatible = "regulator-fixed"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v2 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl 2016-01-20 15:33 ` [PATCH v2 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu @ 2016-01-20 17:11 ` Andrew Lunn 0 siblings, 0 replies; 40+ messages in thread From: Andrew Lunn @ 2016-01-20 17:11 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 12:33:52AM +0900, Roger Shimizu wrote: > For kirkwood, gpio pins starts from 32 are in the 2nd bank, so it should be > converted to "gpio1 <pin minus 32>" in dts file. > e.g. gpio 40 should be "gpio1 8" > > Besides, a few other pin fixes for ls-wxl/wsxl, to match with mpp pin > definition: > - gpio-leds: "lswxl:blue:power" pin > - gpio-leds: "lswxl:red:func" pin > - gpio-leds: "lswxl:red:hdderr0" pin > - gpio-leds: "lswxl:red:hdderr1" pin > - gpio-fan: low/high/alarm pin > > The pin/bank issue was found when discussing Debian Bug #810894 > [https://bugs.debian.org/810894#47] > > Fixes: e54e4b1b622e ("ARM: dts: add buffalo linkstation ls-wxl/wsxl") > Reported-by: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewd-by: Andrew Lunn <andrew@lunn.ch> Thanks Andrew ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu 2016-01-20 15:33 ` [PATCH v2 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu @ 2016-01-20 15:33 ` Roger Shimizu 2016-01-20 17:12 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu ` (4 subsequent siblings) 6 siblings, 1 reply; 40+ messages in thread From: Roger Shimizu @ 2016-01-20 15:33 UTC (permalink / raw) To: linux-arm-kernel For kirkwood, gpio pins starts from 32 are in the 2nd bank, so it should be converted to "gpio1 <pin minus 32>" in dts file. e.g. gpio 40 should be "gpio1 8" The pin/bank issue was found when discussing Debian Bug #810894 [https://bugs.debian.org/810894#47] Fixes: c43379e150aa ("ARM: dts: add buffalo linkstation ls-wvl/vl") Reported-by: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> --- arch/arm/boot/dts/kirkwood-lswvl.dts | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts index 09eed3cea0af..28fd9abd7a57 100644 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ b/arch/arm/boot/dts/kirkwood-lswvl.dts @@ -1,7 +1,8 @@ /* * Device Tree file for Buffalo Linkstation LS-WVL/VL * - * Copyright (C) 2015, rogershimizu at gmail.com + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -156,21 +157,21 @@ button at 1 { label = "Function Button"; linux,code = <KEY_OPTION>; - gpios = <&gpio0 45 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; }; button at 2 { label = "Power-on Switch"; linux,code = <KEY_RESERVED>; linux,input-type = <5>; - gpios = <&gpio0 46 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; button at 3 { label = "Power-auto Switch"; linux,code = <KEY_ESC>; linux,input-type = <5>; - gpios = <&gpio0 47 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; @@ -185,38 +186,38 @@ led at 1 { label = "lswvl:red:alarm"; - gpios = <&gpio0 36 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; led at 2 { label = "lswvl:red:func"; - gpios = <&gpio0 37 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; led at 3 { label = "lswvl:amber:info"; - gpios = <&gpio0 38 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; led at 4 { label = "lswvl:blue:func"; - gpios = <&gpio0 39 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; }; led at 5 { label = "lswvl:blue:power"; - gpios = <&gpio0 40 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; default-state = "keep"; }; led at 6 { label = "lswvl:red:hdderr0"; - gpios = <&gpio0 34 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; }; led at 7 { label = "lswvl:red:hdderr1"; - gpios = <&gpio0 35 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; }; }; @@ -233,7 +234,7 @@ 3250 1 5000 0>; - alarm-gpios = <&gpio0 43 GPIO_ACTIVE_HIGH>; + alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; }; restart_poweroff { -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v2 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl 2016-01-20 15:33 ` [PATCH v2 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl Roger Shimizu @ 2016-01-20 17:12 ` Andrew Lunn 0 siblings, 0 replies; 40+ messages in thread From: Andrew Lunn @ 2016-01-20 17:12 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 12:33:53AM +0900, Roger Shimizu wrote: > For kirkwood, gpio pins starts from 32 are in the 2nd bank, so it should be > converted to "gpio1 <pin minus 32>" in dts file. > e.g. gpio 40 should be "gpio1 8" > > The pin/bank issue was found when discussing Debian Bug #810894 > [https://bugs.debian.org/810894#47] > > Fixes: c43379e150aa ("ARM: dts: add buffalo linkstation ls-wvl/vl") > Reported-by: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewd-by: Andrew Lunn <andrew@lunn.ch> Thanks Andrew ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu 2016-01-20 15:33 ` [PATCH v2 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu 2016-01-20 15:33 ` [PATCH v2 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl Roger Shimizu @ 2016-01-20 15:33 ` Roger Shimizu 2016-01-20 17:16 ` Andrew Lunn 2016-01-21 0:30 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl Roger Shimizu ` (3 subsequent siblings) 6 siblings, 2 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-20 15:33 UTC (permalink / raw) To: linux-arm-kernel Make all leds initially to "off" state except power indicator, so pins below change from active_low to active_high: - gpio-leds: "lswxl:red:func" pin - gpio-leds: "lswxl:red:hdderr{0,1}" pin Fixes: e54e4b1b622e ("ARM: dts: add buffalo linkstation ls-wxl/wsxl") Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> --- arch/arm/boot/dts/kirkwood-lswxl.dts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts index 0e93f6d19259..f4700a60065b 100644 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts @@ -206,18 +206,17 @@ led at 5 { label = "lswxl:red:func"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; - default-state = "keep"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; }; led at 6 { label = "lswxl:red:hdderr0"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; led at 7 { label = "lswxl:red:hdderr1"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; }; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl 2016-01-20 15:33 ` [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu @ 2016-01-20 17:16 ` Andrew Lunn 2016-01-21 0:16 ` Roger Shimizu 2016-01-21 0:30 ` Andrew Lunn 1 sibling, 1 reply; 40+ messages in thread From: Andrew Lunn @ 2016-01-20 17:16 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 12:33:54AM +0900, Roger Shimizu wrote: > Make all leds initially to "off" state except power indicator, so pins below > change from active_low to active_high: So what happens when you echo 1 to /sys/class/led/lswxl:red:func/brightness ? 1 should turn the LED on, 0 off. This is what GPIO_ACTIVE_LOW/GPIO_ACTIVE_HIGH is about, and these are independent of the initial off/on state. Andrew > - gpio-leds: "lswxl:red:func" pin > - gpio-leds: "lswxl:red:hdderr{0,1}" pin > > Fixes: e54e4b1b622e ("ARM: dts: add buffalo linkstation ls-wxl/wsxl") > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> > --- > arch/arm/boot/dts/kirkwood-lswxl.dts | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts > index 0e93f6d19259..f4700a60065b 100644 > --- a/arch/arm/boot/dts/kirkwood-lswxl.dts > +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts > @@ -206,18 +206,17 @@ > > led at 5 { > label = "lswxl:red:func"; > - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; > - default-state = "keep"; > + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; > }; > > led at 6 { > label = "lswxl:red:hdderr0"; > - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; > + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; > }; > > led at 7 { > label = "lswxl:red:hdderr1"; > - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; > + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; > }; > }; > > -- > 2.1.4 > ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl 2016-01-20 17:16 ` Andrew Lunn @ 2016-01-21 0:16 ` Roger Shimizu 0 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 0:16 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 2:16 AM, Andrew Lunn <andrew@lunn.ch> wrote: > On Thu, Jan 21, 2016 at 12:33:54AM +0900, Roger Shimizu wrote: >> Make all leds initially to "off" state except power indicator, so pins below >> change from active_low to active_high: > > So what happens when you echo 1 to /sys/class/led/lswxl:red:func/brightness ? > > 1 should turn the LED on, 0 off. This is what > GPIO_ACTIVE_LOW/GPIO_ACTIVE_HIGH is about, and these are independent > of the initial off/on state. after reboot, # cat /sys/class/leds/lswxl\:red\:func/brightness 0 # echo 1 > /sys/class/leds/lswxl\:red\:func/brightness 1st command shows the initial value is 0. 2nd command will turn the LED to on state. I guess board will set the value to 0 when boot, so as GPIO_ACTIVE_LOW/GPIO_ACTIVE_HIGH can change the initial state of LED. Cheers, Roger ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl 2016-01-20 15:33 ` [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu 2016-01-20 17:16 ` Andrew Lunn @ 2016-01-21 0:30 ` Andrew Lunn 1 sibling, 0 replies; 40+ messages in thread From: Andrew Lunn @ 2016-01-21 0:30 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 12:33:54AM +0900, Roger Shimizu wrote: > Make all leds initially to "off" state except power indicator, so pins below > change from active_low to active_high: > - gpio-leds: "lswxl:red:func" pin > - gpio-leds: "lswxl:red:hdderr{0,1}" pin Hi Roger So the patch is correct, but the changelog is not really correct. Better to say: The GPIOs controlling the LEDs are active high, not low. Please resend, and add my: Reviewd-by: Andrew Lunn <andrew@lunn.ch> Andrew > > Fixes: e54e4b1b622e ("ARM: dts: add buffalo linkstation ls-wxl/wsxl") > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> > --- > arch/arm/boot/dts/kirkwood-lswxl.dts | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts > index 0e93f6d19259..f4700a60065b 100644 > --- a/arch/arm/boot/dts/kirkwood-lswxl.dts > +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts > @@ -206,18 +206,17 @@ > > led at 5 { > label = "lswxl:red:func"; > - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; > - default-state = "keep"; > + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; > }; > > led at 6 { > label = "lswxl:red:hdderr0"; > - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; > + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; > }; > > led at 7 { > label = "lswxl:red:hdderr1"; > - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; > + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; > }; > }; > > -- > 2.1.4 > ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (2 preceding siblings ...) 2016-01-20 15:33 ` [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu @ 2016-01-20 15:33 ` Roger Shimizu 2016-01-21 0:31 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 Roger Shimizu ` (2 subsequent siblings) 6 siblings, 1 reply; 40+ messages in thread From: Roger Shimizu @ 2016-01-20 15:33 UTC (permalink / raw) To: linux-arm-kernel Make all leds initially to "off" state except power indicator, so pins below change from active_low to active_high: - gpio-leds: "lswvl:red:alarm" pin - gpio-leds: "lswvl:red:func" pin - gpio-leds: "lswvl:amber:info" pin - gpio-leds: "lswvl:blue:func" pin - gpio-leds: "lswvl:blue:power" pin - gpio-leds: "lswvl:red:hdderr{0,1}" pin Fixes: c43379e150aa ("ARM: dts: add buffalo linkstation ls-wvl/vl") Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> --- arch/arm/boot/dts/kirkwood-lswvl.dts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts index 28fd9abd7a57..20b6b0c8b3ec 100644 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ b/arch/arm/boot/dts/kirkwood-lswvl.dts @@ -186,38 +186,37 @@ led at 1 { label = "lswvl:red:alarm"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; }; led at 2 { label = "lswvl:red:func"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; }; led at 3 { label = "lswvl:amber:info"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; }; led at 4 { label = "lswvl:blue:func"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; }; led at 5 { label = "lswvl:blue:power"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; - default-state = "keep"; + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; }; led at 6 { label = "lswvl:red:hdderr0"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; }; led at 7 { label = "lswvl:red:hdderr1"; - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; }; }; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v2 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl 2016-01-20 15:33 ` [PATCH v2 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl Roger Shimizu @ 2016-01-21 0:31 ` Andrew Lunn 0 siblings, 0 replies; 40+ messages in thread From: Andrew Lunn @ 2016-01-21 0:31 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 12:33:55AM +0900, Roger Shimizu wrote: > Make all leds initially to "off" state except power indicator, so pins below > change from active_low to active_high: > - gpio-leds: "lswvl:red:alarm" pin > - gpio-leds: "lswvl:red:func" pin > - gpio-leds: "lswvl:amber:info" pin > - gpio-leds: "lswvl:blue:func" pin > - gpio-leds: "lswvl:blue:power" pin > - gpio-leds: "lswvl:red:hdderr{0,1}" pin Hi Roger So the comments want changes, but otherwise: Reviewd-by: Andrew Lunn <andrew@lunn.ch> Thanks Andrew > > Fixes: c43379e150aa ("ARM: dts: add buffalo linkstation ls-wvl/vl") > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> > --- > arch/arm/boot/dts/kirkwood-lswvl.dts | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts > index 28fd9abd7a57..20b6b0c8b3ec 100644 > --- a/arch/arm/boot/dts/kirkwood-lswvl.dts > +++ b/arch/arm/boot/dts/kirkwood-lswvl.dts > @@ -186,38 +186,37 @@ > > led at 1 { > label = "lswvl:red:alarm"; > - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; > + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; > }; > > led at 2 { > label = "lswvl:red:func"; > - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; > + gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; > }; > > led at 3 { > label = "lswvl:amber:info"; > - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; > + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; > }; > > led at 4 { > label = "lswvl:blue:func"; > - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; > + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; > }; > > led at 5 { > label = "lswvl:blue:power"; > - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; > - default-state = "keep"; > + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; > }; > > led at 6 { > label = "lswvl:red:hdderr0"; > - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; > + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; > }; > > led at 7 { > label = "lswvl:red:hdderr1"; > - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; > + gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; > }; > }; > > -- > 2.1.4 > ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (3 preceding siblings ...) 2016-01-20 15:33 ` [PATCH v2 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl Roger Shimizu @ 2016-01-20 15:33 ` Roger Shimizu 2016-01-20 17:18 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu 2016-01-20 15:33 ` [PATCH v2 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl Roger Shimizu 6 siblings, 1 reply; 40+ messages in thread From: Roger Shimizu @ 2016-01-20 15:33 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> --- arch/arm/boot/dts/kirkwood-lswvl.dts | 41 ++++++++++++++++++++++++++++++++---- arch/arm/boot/dts/kirkwood-lswxl.dts | 41 ++++++++++++++++++++++++++++++++---- 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts index 20b6b0c8b3ec..59ac94cc93e9 100644 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ b/arch/arm/boot/dts/kirkwood-lswvl.dts @@ -4,10 +4,43 @@ * Copyright (C) 2015, 2016 * Roger Shimizu <rogershimizu@gmail.com> * - * 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. + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts index f4700a60065b..5bc0b597c9c2 100644 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts @@ -4,10 +4,43 @@ * Copyright (C) 2015, 2016 * Roger Shimizu <rogershimizu@gmail.com> * - * 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. + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v2 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 2016-01-20 15:33 ` [PATCH v2 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 Roger Shimizu @ 2016-01-20 17:18 ` Andrew Lunn 0 siblings, 0 replies; 40+ messages in thread From: Andrew Lunn @ 2016-01-20 17:18 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 12:33:56AM +0900, Roger Shimizu wrote: > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Roger is the sole contributor to these files, according to git log. Reviewd-by: Andrew Lunn <andrew@lunn.ch> Andrew > --- > arch/arm/boot/dts/kirkwood-lswvl.dts | 41 ++++++++++++++++++++++++++++++++---- > arch/arm/boot/dts/kirkwood-lswxl.dts | 41 ++++++++++++++++++++++++++++++++---- > 2 files changed, 74 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts > index 20b6b0c8b3ec..59ac94cc93e9 100644 > --- a/arch/arm/boot/dts/kirkwood-lswvl.dts > +++ b/arch/arm/boot/dts/kirkwood-lswvl.dts > @@ -4,10 +4,43 @@ > * Copyright (C) 2015, 2016 > * Roger Shimizu <rogershimizu@gmail.com> > * > - * 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. > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > */ > > /dts-v1/; > diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts > index f4700a60065b..5bc0b597c9c2 100644 > --- a/arch/arm/boot/dts/kirkwood-lswxl.dts > +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts > @@ -4,10 +4,43 @@ > * Copyright (C) 2015, 2016 > * Roger Shimizu <rogershimizu@gmail.com> > * > - * 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. > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > */ > > /dts-v1/; > -- > 2.1.4 > ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (4 preceding siblings ...) 2016-01-20 15:33 ` [PATCH v2 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 Roger Shimizu @ 2016-01-20 15:33 ` Roger Shimizu 2016-01-20 17:21 ` Sebastian Hesselbarth 2016-01-21 0:36 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl Roger Shimizu 6 siblings, 2 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-20 15:33 UTC (permalink / raw) To: linux-arm-kernel LS-WXL/WSXL are both kirkwood-6281 based 2-Bay NAS devices, which share many MPP pins. However they are slightly different: - There're two red LED indicator on LS-WXL to show when HDD fails, but there's no such on LS-WSXL. - There's 4-level speed adjustable FAN on LS-WXL, but not LS-WSXL. So after the split, common part goes into .dtsi file: - kirkwood-linkstation.dtsi - kirkwood-linkstation-duo-6281.dtsi while all rest part goes into device specific .dts file: - kirkwood-linkstation-lswsxl.dts - kirkwood-linkstation-lswxl.dts Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> --- .../devicetree/bindings/arm/marvell,kirkwood.txt | 3 +- arch/arm/boot/dts/Makefile | 3 +- .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 185 ++++++++++++ arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 +++++++ arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 +++++++++++++ arch/arm/boot/dts/kirkwood-lswxl.dts | 334 --------------------- 7 files changed, 564 insertions(+), 336 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt index 5171ad8f48ff..c7f8e3e97c78 100644 --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt @@ -19,9 +19,10 @@ SoC. Currently known SoC compatibles are: And in addition, the compatible shall be extended with the specific board. Currently known boards are: +"buffalo,linkstation-lswsxl" +"buffalo,linkstation-lswxl" "buffalo,lschlv2" "buffalo,lswvl" -"buffalo,lswxl" "buffalo,lsxhl" "buffalo,lsxl" "dlink,dns-320" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 30bbc3746130..788c75a69364 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -183,9 +183,10 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-is2.dtb \ kirkwood-km_kirkwood.dtb \ kirkwood-laplug.dtb \ + kirkwood-linkstation-lswsxl.dtb \ + kirkwood-linkstation-lswxl.dtb \ kirkwood-lschlv2.dtb \ kirkwood-lswvl.dtb \ - kirkwood-lswxl.dtb \ kirkwood-lsxhl.dtb \ kirkwood-mplcec4.dtb \ kirkwood-mv88f6281gtw-ge.dtb \ diff --git a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi new file mode 100644 index 000000000000..47b8f185839d --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi @@ -0,0 +1,185 @@ +/* + * Device Tree common file for kirkwood-6281 based 2-Bay Buffalo Linkstation + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "kirkwood.dtsi" +#include "kirkwood-6281.dtsi" +#include "kirkwood-linkstation.dtsi" + +/ { + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd0: pmx-power-hdd0 { + marvell,pins = "mpp28"; + marvell,function = "gpio"; + }; + pmx_power_hdd1: pmx-power-hdd1 { + marvell,pins = "mpp29"; + marvell,function = "gpio"; + }; + pmx_usb_vbus: pmx-usb-vbus { + marvell,pins = "mpp37"; + marvell,function = "gpio"; + }; + pmx_led_alarm: pmx-led-alarm { + marvell,pins = "mpp49"; + marvell,function = "gpio"; + }; + pmx_led_function_red: pmx-led-function-red { + marvell,pins = "mpp34"; + marvell,function = "gpio"; + }; + pmx_led_function_blue: pmx-led-function-blue { + marvell,pins = "mpp36"; + marvell,function = "gpio"; + }; + pmx_led_info: pmx-led-info { + marvell,pins = "mpp38"; + marvell,function = "gpio"; + }; + pmx_led_power: pmx-led-power { + marvell,pins = "mpp39"; + marvell,function = "gpio"; + }; + pmx_button_function: pmx-button-function { + marvell,pins = "mpp41"; + marvell,function = "gpio"; + }; + pmx_power_switch: pmx-power-switch { + marvell,pins = "mpp42"; + marvell,function = "gpio"; + }; + pmx_power_auto_switch: pmx-power-auto-switch { + marvell,pins = "mpp43"; + marvell,function = "gpio"; + }; + }; + + sata at 80000 { + nr-ports = <2>; + }; + }; + + gpio_keys { + function-button { + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + }; + + power-on-switch { + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; + + power-auto-switch { + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + }; + }; + + gpio_leds { + red-alarm-led { + label = "linkstation:red:alarm"; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + }; + + red-function-led { + label = "linkstation:red:function"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + }; + + amber-info-led { + label = "linkstation:amber:info"; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + }; + + blue-function-led { + label = "linkstation:blue:function"; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + }; + + blue-power-led { + label = "linkstation:blue:power"; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + }; + }; + + regulators { + pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; + + usb_power: regulator at 1 { + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; + }; + + hdd_power0: regulator at 2 { + gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; + }; + + hdd_power1: regulator at 3 { + compatible = "regulator-fixed"; + reg = <3>; + regulator-name = "HDD1 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy1: ethernet-phy at 8 { + device_type = "ethernet-phy"; + reg = <8>; + }; +}; + +ð1 { + status = "okay"; + + ethernet1-port at 0 { + phy-handle = <ðphy1>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts new file mode 100644 index 000000000000..4b6450186af5 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts @@ -0,0 +1,57 @@ +/* + * Device Tree file for Buffalo Linkstation LS-WSXL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-duo-6281.dtsi" + +/ { + model = "Buffalo Linkstation LS-WSXL"; + compatible = "buffalo,lswsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + + memory { /* 128 MB */ + device_type = "memory"; + reg = <0x00000000 0x8000000>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts new file mode 100644 index 000000000000..ecd5c12a805d --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts @@ -0,0 +1,116 @@ +/* + * Device Tree file for Buffalo Linkstation LS-WXL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-duo-6281.dtsi" + +/ { + model = "Buffalo Linkstation LS-WXL"; + compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + + memory { /* 128 MB */ + device_type = "memory"; + reg = <0x00000000 0x8000000>; + }; + + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_led_hdderr0: pmx-led-hdderr0 { + marvell,pins = "mpp8"; + marvell,function = "gpio"; + }; + pmx_led_hdderr1: pmx-led-hdderr1 { + marvell,pins = "mpp46"; + marvell,function = "gpio"; + }; + pmx_fan_lock: pmx-fan-lock { + marvell,pins = "mpp40"; + marvell,function = "gpio"; + }; + pmx_fan_high: pmx-fan-high { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; + pmx_fan_low: pmx-fan-low { + marvell,pins = "mpp48"; + marvell,function = "gpio"; + }; + }; + }; + + gpio_leds { + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm + &pmx_led_info &pmx_led_power + &pmx_led_function_blue + &pmx_led_hdderr0 + &pmx_led_hdderr1>; + + red-hdderr0-led { + label = "linkstation:red:hdderr0"; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + }; + + red-hdderr1-led { + label = "linkstation:red:hdderr1"; + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; + }; + }; + + gpio_fan { + compatible = "gpio-fan"; + pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; + pinctrl-names = "default"; + + gpios = <&gpio1 16 GPIO_ACTIVE_LOW + &gpio1 15 GPIO_ACTIVE_LOW>; + + gpio-fan,speed-map = <0 3 + 1500 2 + 3250 1 + 5000 0>; + + alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/kirkwood-linkstation.dtsi new file mode 100644 index 000000000000..69061b6e987b --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation.dtsi @@ -0,0 +1,202 @@ +/* + * Device Tree common file for kirkwood based Buffalo Linkstation + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/ { + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + stdout-path = &uart0; + }; + + mbus { + pcie-controller { + status = "okay"; + pcie at 1,0 { + status = "okay"; + }; + }; + }; + + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd0: pmx-power-hdd0 { + marvell,function = "gpio"; + }; + pmx_usb_vbus: pmx-usb-vbus { + marvell,function = "gpio"; + }; + pmx_led_alarm: pmx-led-alarm { + marvell,function = "gpio"; + }; + pmx_led_function_red: pmx-led-function-red { + marvell,function = "gpio"; + }; + pmx_led_function_blue: pmx-led-function-blue { + marvell,function = "gpio"; + }; + pmx_led_info: pmx-led-info { + marvell,function = "gpio"; + }; + pmx_led_power: pmx-led-power { + marvell,function = "gpio"; + }; + pmx_button_function: pmx-button-function { + marvell,function = "gpio"; + }; + pmx_power_switch: pmx-power-switch { + marvell,function = "gpio"; + }; + pmx_power_auto_switch: pmx-power-auto-switch { + marvell,function = "gpio"; + }; + }; + + serial at 12000 { + status = "okay"; + }; + + sata at 80000 { + status = "okay"; + nr-ports = <1>; + }; + + spi at 10600 { + status = "okay"; + + m25p40 at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p40", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + mode = <0>; + + partition at 0 { + reg = <0x0 0x60000>; + label = "uboot"; + read-only; + }; + + partition at 60000 { + reg = <0x60000 0x10000>; + label = "dtb"; + read-only; + }; + + partition at 70000 { + reg = <0x70000 0x10000>; + label = "uboot_env"; + }; + }; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&pmx_button_function &pmx_power_switch + &pmx_power_auto_switch>; + pinctrl-names = "default"; + + function-button { + label = "Function Button"; + linux,code = <KEY_OPTION>; + }; + + power-on-switch { + label = "Power-on Switch"; + linux,code = <KEY_RESERVED>; + linux,input-type = <5>; + }; + + power-auto-switch { + label = "Power-auto Switch"; + linux,code = <KEY_ESC>; + linux,input-type = <5>; + }; + }; + + gpio_leds { + compatible = "gpio-leds"; + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm + &pmx_led_info &pmx_led_power + &pmx_led_function_blue>; + pinctrl-names = "default"; + }; + + restart_poweroff { + compatible = "restart-poweroff"; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&pmx_power_hdd0 &pmx_usb_vbus>; + pinctrl-names = "default"; + + usb_power: regulator at 1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "USB Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + }; + + hdd_power0: regulator at 2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "HDD0 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + }; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts deleted file mode 100644 index 5bc0b597c9c2..000000000000 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ /dev/null @@ -1,334 +0,0 @@ -/* - * Device Tree file for Buffalo Linkstation LS-WXL/WSXL - * - * Copyright (C) 2015, 2016 - * Roger Shimizu <rogershimizu@gmail.com> - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/dts-v1/; - -#include "kirkwood.dtsi" -#include "kirkwood-6281.dtsi" - -/ { - model = "Buffalo Linkstation LS-WXL/WSXL"; - compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; - - memory { /* 128 MB */ - device_type = "memory"; - reg = <0x00000000 0x8000000>; - }; - - chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk"; - stdout-path = &uart0; - }; - - mbus { - pcie-controller { - status = "okay"; - pcie at 1,0 { - status = "okay"; - }; - }; - }; - - ocp at f1000000 { - pinctrl: pin-controller at 10000 { - pmx_power_hdd0: pmx-power-hdd0 { - marvell,pins = "mpp28"; - marvell,function = "gpio"; - }; - pmx_power_hdd1: pmx-power-hdd1 { - marvell,pins = "mpp29"; - marvell,function = "gpio"; - }; - pmx_usb_vbus: pmx-usb-vbus { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_fan_high: pmx-fan-high { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - pmx_fan_low: pmx-fan-low { - marvell,pins = "mpp48"; - marvell,function = "gpio"; - }; - pmx_led_hdderr0: pmx-led-hdderr0 { - marvell,pins = "mpp8"; - marvell,function = "gpio"; - }; - pmx_led_hdderr1: pmx-led-hdderr1 { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_led_alarm: pmx-led-alarm { - marvell,pins = "mpp49"; - marvell,function = "gpio"; - }; - pmx_led_function_red: pmx-led-function-red { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; - pmx_led_function_blue: pmx-led-function-blue { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_led_info: pmx-led-info { - marvell,pins = "mpp38"; - marvell,function = "gpio"; - }; - pmx_led_power: pmx-led-power { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_fan_lock: pmx-fan-lock { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_button_function: pmx-button-function { - marvell,pins = "mpp41"; - marvell,function = "gpio"; - }; - pmx_power_switch: pmx-power-switch { - marvell,pins = "mpp42"; - marvell,function = "gpio"; - }; - pmx_power_auto_switch: pmx-power-auto-switch { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - }; - - serial at 12000 { - status = "okay"; - }; - - sata at 80000 { - status = "okay"; - nr-ports = <2>; - }; - - spi at 10600 { - status = "okay"; - - m25p40 at 0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "st,m25p40", "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - mode = <0>; - - partition at 0 { - reg = <0x0 0x60000>; - label = "uboot"; - read-only; - }; - - partition at 60000 { - reg = <0x60000 0x10000>; - label = "dtb"; - read-only; - }; - - partition at 70000 { - reg = <0x70000 0x10000>; - label = "uboot_env"; - }; - }; - }; - }; - - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_button_function &pmx_power_switch - &pmx_power_auto_switch>; - pinctrl-names = "default"; - - button at 1 { - label = "Function Button"; - linux,code = <KEY_OPTION>; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; - }; - - button at 2 { - label = "Power-on Switch"; - linux,code = <KEY_RESERVED>; - linux,input-type = <5>; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; - }; - - button at 3 { - label = "Power-auto Switch"; - linux,code = <KEY_ESC>; - linux,input-type = <5>; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_leds { - compatible = "gpio-leds"; - pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm - &pmx_led_info &pmx_led_power - &pmx_led_function_blue - &pmx_led_hdderr0 - &pmx_led_hdderr1>; - pinctrl-names = "default"; - - led at 1 { - label = "lswxl:blue:func"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - }; - - led at 2 { - label = "lswxl:red:alarm"; - gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; - }; - - led at 3 { - label = "lswxl:amber:info"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; - }; - - led at 4 { - label = "lswxl:blue:power"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; - }; - - led at 5 { - label = "lswxl:red:func"; - gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; - }; - - led at 6 { - label = "lswxl:red:hdderr0"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; - }; - - led at 7 { - label = "lswxl:red:hdderr1"; - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; - }; - }; - - gpio_fan { - compatible = "gpio-fan"; - pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; - pinctrl-names = "default"; - - gpios = <&gpio1 16 GPIO_ACTIVE_LOW - &gpio1 15 GPIO_ACTIVE_LOW>; - - gpio-fan,speed-map = <0 3 - 1500 2 - 3250 1 - 5000 0>; - - alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; - }; - - restart_poweroff { - compatible = "restart-poweroff"; - }; - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; - pinctrl-names = "default"; - - usb_power: regulator at 1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; - }; - hdd_power0: regulator at 2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "HDD0 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; - }; - hdd_power1: regulator at 3 { - compatible = "regulator-fixed"; - reg = <3>; - regulator-name = "HDD1 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&mdio { - status = "okay"; - - ethphy1: ethernet-phy at 8 { - device_type = "ethernet-phy"; - reg = <8>; - }; -}; - -ð1 { - status = "okay"; - - ethernet1-port at 0 { - phy-handle = <ðphy1>; - }; -}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl 2016-01-20 15:33 ` [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu @ 2016-01-20 17:21 ` Sebastian Hesselbarth 2016-01-21 15:06 ` Roger Shimizu 2016-01-21 0:36 ` Andrew Lunn 1 sibling, 1 reply; 40+ messages in thread From: Sebastian Hesselbarth @ 2016-01-20 17:21 UTC (permalink / raw) To: linux-arm-kernel On 01/20/2016 04:33 PM, Roger Shimizu wrote: > LS-WXL/WSXL are both kirkwood-6281 based 2-Bay NAS devices, which share > many MPP pins. However they are slightly different: > - There're two red LED indicator on LS-WXL to show when HDD fails, > but there's no such on LS-WSXL. > - There's 4-level speed adjustable FAN on LS-WXL, but not LS-WSXL. > > So after the split, common part goes into .dtsi file: > - kirkwood-linkstation.dtsi > - kirkwood-linkstation-duo-6281.dtsi > while all rest part goes into device specific .dts file: > - kirkwood-linkstation-lswsxl.dts > - kirkwood-linkstation-lswxl.dts > > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> > --- [...] > diff --git a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > new file mode 100644 > index 000000000000..47b8f185839d > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > @@ -0,0 +1,185 @@ [...] > +/ { > + ocp at f1000000 { > + pinctrl: pin-controller at 10000 { Roger, nice series! Mind to send another patch moving pinctrl stuff and sata below to node references for both boards? Kirkwood has &pinctrl and &sata labels, it helps to keep the bus structure out of the board files. &mdio is an example for that. I might be easier not to squash that into this series but send another one later. Sebastian > + pmx_power_hdd0: pmx-power-hdd0 { > + marvell,pins = "mpp28"; > + marvell,function = "gpio"; > + }; [...] > + }; > + > + sata at 80000 { > + nr-ports = <2>; > + }; > + }; [...] > +}; > + > +&mdio { > + status = "okay"; > + > + ethphy1: ethernet-phy at 8 { > + device_type = "ethernet-phy"; > + reg = <8>; > + }; > +}; > + > +ð1 { > + status = "okay"; > + > + ethernet1-port at 0 { > + phy-handle = <ðphy1>; > + }; > +}; ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl 2016-01-20 17:21 ` Sebastian Hesselbarth @ 2016-01-21 15:06 ` Roger Shimizu 0 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 15:06 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 2:21 AM, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> wrote: > On 01/20/2016 04:33 PM, Roger Shimizu wrote: >> >> LS-WXL/WSXL are both kirkwood-6281 based 2-Bay NAS devices, which share >> many MPP pins. However they are slightly different: >> - There're two red LED indicator on LS-WXL to show when HDD fails, >> but there's no such on LS-WSXL. >> - There's 4-level speed adjustable FAN on LS-WXL, but not LS-WSXL. >> >> So after the split, common part goes into .dtsi file: >> - kirkwood-linkstation.dtsi >> - kirkwood-linkstation-duo-6281.dtsi >> while all rest part goes into device specific .dts file: >> - kirkwood-linkstation-lswsxl.dts >> - kirkwood-linkstation-lswxl.dts >> >> Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> >> --- > > [...] >> >> diff --git a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi >> b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi >> new file mode 100644 >> index 000000000000..47b8f185839d >> --- /dev/null >> +++ b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi >> @@ -0,0 +1,185 @@ > > [...] >> >> +/ { >> + ocp at f1000000 { >> + pinctrl: pin-controller at 10000 { > > > Roger, > > nice series! Mind to send another patch moving pinctrl stuff > and sata below to node references for both boards? > > Kirkwood has &pinctrl and &sata labels, it helps to keep the bus > structure out of the board files. &mdio is an example for that. > > I might be easier not to squash that into this series but > send another one later. Dear Sebastian, Understand your point. I'll create a patch by your suggestion, when this series get committed. Thanks for your advice! Cheers, Roger ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl 2016-01-20 15:33 ` [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu 2016-01-20 17:21 ` Sebastian Hesselbarth @ 2016-01-21 0:36 ` Andrew Lunn 1 sibling, 0 replies; 40+ messages in thread From: Andrew Lunn @ 2016-01-21 0:36 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 12:33:57AM +0900, Roger Shimizu wrote: > LS-WXL/WSXL are both kirkwood-6281 based 2-Bay NAS devices, which share > many MPP pins. However they are slightly different: > - There're two red LED indicator on LS-WXL to show when HDD fails, > but there's no such on LS-WSXL. > - There's 4-level speed adjustable FAN on LS-WXL, but not LS-WSXL. > > So after the split, common part goes into .dtsi file: > - kirkwood-linkstation.dtsi > - kirkwood-linkstation-duo-6281.dtsi > while all rest part goes into device specific .dts file: > - kirkwood-linkstation-lswsxl.dts > - kirkwood-linkstation-lswxl.dts > > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewd-by: Andrew Lunn <andrew@lunn.ch> Thanks Andrew > --- > .../devicetree/bindings/arm/marvell,kirkwood.txt | 3 +- > arch/arm/boot/dts/Makefile | 3 +- > .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 185 ++++++++++++ > arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++ > arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 +++++++ > arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 +++++++++++++ > arch/arm/boot/dts/kirkwood-lswxl.dts | 334 --------------------- > 7 files changed, 564 insertions(+), 336 deletions(-) > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi > delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts > > diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt > index 5171ad8f48ff..c7f8e3e97c78 100644 > --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt > +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt > @@ -19,9 +19,10 @@ SoC. Currently known SoC compatibles are: > And in addition, the compatible shall be extended with the specific > board. Currently known boards are: > > +"buffalo,linkstation-lswsxl" > +"buffalo,linkstation-lswxl" > "buffalo,lschlv2" > "buffalo,lswvl" > -"buffalo,lswxl" > "buffalo,lsxhl" > "buffalo,lsxl" > "dlink,dns-320" > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 30bbc3746130..788c75a69364 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -183,9 +183,10 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ > kirkwood-is2.dtb \ > kirkwood-km_kirkwood.dtb \ > kirkwood-laplug.dtb \ > + kirkwood-linkstation-lswsxl.dtb \ > + kirkwood-linkstation-lswxl.dtb \ > kirkwood-lschlv2.dtb \ > kirkwood-lswvl.dtb \ > - kirkwood-lswxl.dtb \ > kirkwood-lsxhl.dtb \ > kirkwood-mplcec4.dtb \ > kirkwood-mv88f6281gtw-ge.dtb \ > diff --git a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > new file mode 100644 > index 000000000000..47b8f185839d > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > @@ -0,0 +1,185 @@ > +/* > + * Device Tree common file for kirkwood-6281 based 2-Bay Buffalo Linkstation > + * > + * Copyright (C) 2015, 2016 > + * Roger Shimizu <rogershimizu@gmail.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +#include "kirkwood.dtsi" > +#include "kirkwood-6281.dtsi" > +#include "kirkwood-linkstation.dtsi" > + > +/ { > + ocp at f1000000 { > + pinctrl: pin-controller at 10000 { > + pmx_power_hdd0: pmx-power-hdd0 { > + marvell,pins = "mpp28"; > + marvell,function = "gpio"; > + }; > + pmx_power_hdd1: pmx-power-hdd1 { > + marvell,pins = "mpp29"; > + marvell,function = "gpio"; > + }; > + pmx_usb_vbus: pmx-usb-vbus { > + marvell,pins = "mpp37"; > + marvell,function = "gpio"; > + }; > + pmx_led_alarm: pmx-led-alarm { > + marvell,pins = "mpp49"; > + marvell,function = "gpio"; > + }; > + pmx_led_function_red: pmx-led-function-red { > + marvell,pins = "mpp34"; > + marvell,function = "gpio"; > + }; > + pmx_led_function_blue: pmx-led-function-blue { > + marvell,pins = "mpp36"; > + marvell,function = "gpio"; > + }; > + pmx_led_info: pmx-led-info { > + marvell,pins = "mpp38"; > + marvell,function = "gpio"; > + }; > + pmx_led_power: pmx-led-power { > + marvell,pins = "mpp39"; > + marvell,function = "gpio"; > + }; > + pmx_button_function: pmx-button-function { > + marvell,pins = "mpp41"; > + marvell,function = "gpio"; > + }; > + pmx_power_switch: pmx-power-switch { > + marvell,pins = "mpp42"; > + marvell,function = "gpio"; > + }; > + pmx_power_auto_switch: pmx-power-auto-switch { > + marvell,pins = "mpp43"; > + marvell,function = "gpio"; > + }; > + }; > + > + sata at 80000 { > + nr-ports = <2>; > + }; > + }; > + > + gpio_keys { > + function-button { > + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; > + }; > + > + power-on-switch { > + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; > + }; > + > + power-auto-switch { > + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; > + }; > + }; > + > + gpio_leds { > + red-alarm-led { > + label = "linkstation:red:alarm"; > + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; > + }; > + > + red-function-led { > + label = "linkstation:red:function"; > + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; > + }; > + > + amber-info-led { > + label = "linkstation:amber:info"; > + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; > + }; > + > + blue-function-led { > + label = "linkstation:blue:function"; > + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; > + }; > + > + blue-power-led { > + label = "linkstation:blue:power"; > + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; > + }; > + }; > + > + regulators { > + pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; > + > + usb_power: regulator at 1 { > + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; > + }; > + > + hdd_power0: regulator at 2 { > + gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; > + }; > + > + hdd_power1: regulator at 3 { > + compatible = "regulator-fixed"; > + reg = <3>; > + regulator-name = "HDD1 Power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; > + }; > + }; > +}; > + > +&mdio { > + status = "okay"; > + > + ethphy1: ethernet-phy at 8 { > + device_type = "ethernet-phy"; > + reg = <8>; > + }; > +}; > + > +ð1 { > + status = "okay"; > + > + ethernet1-port at 0 { > + phy-handle = <ðphy1>; > + }; > +}; > diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts > new file mode 100644 > index 000000000000..4b6450186af5 > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts > @@ -0,0 +1,57 @@ > +/* > + * Device Tree file for Buffalo Linkstation LS-WSXL > + * > + * Copyright (C) 2015, 2016 > + * Roger Shimizu <rogershimizu@gmail.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > +#include "kirkwood-linkstation-duo-6281.dtsi" > + > +/ { > + model = "Buffalo Linkstation LS-WSXL"; > + compatible = "buffalo,lswsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; > + > + memory { /* 128 MB */ > + device_type = "memory"; > + reg = <0x00000000 0x8000000>; > + }; > +}; > diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > new file mode 100644 > index 000000000000..ecd5c12a805d > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > @@ -0,0 +1,116 @@ > +/* > + * Device Tree file for Buffalo Linkstation LS-WXL > + * > + * Copyright (C) 2015, 2016 > + * Roger Shimizu <rogershimizu@gmail.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > +#include "kirkwood-linkstation-duo-6281.dtsi" > + > +/ { > + model = "Buffalo Linkstation LS-WXL"; > + compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; > + > + memory { /* 128 MB */ > + device_type = "memory"; > + reg = <0x00000000 0x8000000>; > + }; > + > + ocp at f1000000 { > + pinctrl: pin-controller at 10000 { > + pmx_led_hdderr0: pmx-led-hdderr0 { > + marvell,pins = "mpp8"; > + marvell,function = "gpio"; > + }; > + pmx_led_hdderr1: pmx-led-hdderr1 { > + marvell,pins = "mpp46"; > + marvell,function = "gpio"; > + }; > + pmx_fan_lock: pmx-fan-lock { > + marvell,pins = "mpp40"; > + marvell,function = "gpio"; > + }; > + pmx_fan_high: pmx-fan-high { > + marvell,pins = "mpp47"; > + marvell,function = "gpio"; > + }; > + pmx_fan_low: pmx-fan-low { > + marvell,pins = "mpp48"; > + marvell,function = "gpio"; > + }; > + }; > + }; > + > + gpio_leds { > + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm > + &pmx_led_info &pmx_led_power > + &pmx_led_function_blue > + &pmx_led_hdderr0 > + &pmx_led_hdderr1>; > + > + red-hdderr0-led { > + label = "linkstation:red:hdderr0"; > + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; > + }; > + > + red-hdderr1-led { > + label = "linkstation:red:hdderr1"; > + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; > + }; > + }; > + > + gpio_fan { > + compatible = "gpio-fan"; > + pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; > + pinctrl-names = "default"; > + > + gpios = <&gpio1 16 GPIO_ACTIVE_LOW > + &gpio1 15 GPIO_ACTIVE_LOW>; > + > + gpio-fan,speed-map = <0 3 > + 1500 2 > + 3250 1 > + 5000 0>; > + > + alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; > + }; > +}; > diff --git a/arch/arm/boot/dts/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/kirkwood-linkstation.dtsi > new file mode 100644 > index 000000000000..69061b6e987b > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-linkstation.dtsi > @@ -0,0 +1,202 @@ > +/* > + * Device Tree common file for kirkwood based Buffalo Linkstation > + * > + * Copyright (C) 2015, 2016 > + * Roger Shimizu <rogershimizu@gmail.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file 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. > + * > + * This file is distributed in the hope that it will be useful > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/ { > + chosen { > + bootargs = "console=ttyS0,115200n8 earlyprintk"; > + stdout-path = &uart0; > + }; > + > + mbus { > + pcie-controller { > + status = "okay"; > + pcie at 1,0 { > + status = "okay"; > + }; > + }; > + }; > + > + ocp at f1000000 { > + pinctrl: pin-controller at 10000 { > + pmx_power_hdd0: pmx-power-hdd0 { > + marvell,function = "gpio"; > + }; > + pmx_usb_vbus: pmx-usb-vbus { > + marvell,function = "gpio"; > + }; > + pmx_led_alarm: pmx-led-alarm { > + marvell,function = "gpio"; > + }; > + pmx_led_function_red: pmx-led-function-red { > + marvell,function = "gpio"; > + }; > + pmx_led_function_blue: pmx-led-function-blue { > + marvell,function = "gpio"; > + }; > + pmx_led_info: pmx-led-info { > + marvell,function = "gpio"; > + }; > + pmx_led_power: pmx-led-power { > + marvell,function = "gpio"; > + }; > + pmx_button_function: pmx-button-function { > + marvell,function = "gpio"; > + }; > + pmx_power_switch: pmx-power-switch { > + marvell,function = "gpio"; > + }; > + pmx_power_auto_switch: pmx-power-auto-switch { > + marvell,function = "gpio"; > + }; > + }; > + > + serial at 12000 { > + status = "okay"; > + }; > + > + sata at 80000 { > + status = "okay"; > + nr-ports = <1>; > + }; > + > + spi at 10600 { > + status = "okay"; > + > + m25p40 at 0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "st,m25p40", "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <25000000>; > + mode = <0>; > + > + partition at 0 { > + reg = <0x0 0x60000>; > + label = "uboot"; > + read-only; > + }; > + > + partition at 60000 { > + reg = <0x60000 0x10000>; > + label = "dtb"; > + read-only; > + }; > + > + partition at 70000 { > + reg = <0x70000 0x10000>; > + label = "uboot_env"; > + }; > + }; > + }; > + }; > + > + gpio_keys { > + compatible = "gpio-keys"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_button_function &pmx_power_switch > + &pmx_power_auto_switch>; > + pinctrl-names = "default"; > + > + function-button { > + label = "Function Button"; > + linux,code = <KEY_OPTION>; > + }; > + > + power-on-switch { > + label = "Power-on Switch"; > + linux,code = <KEY_RESERVED>; > + linux,input-type = <5>; > + }; > + > + power-auto-switch { > + label = "Power-auto Switch"; > + linux,code = <KEY_ESC>; > + linux,input-type = <5>; > + }; > + }; > + > + gpio_leds { > + compatible = "gpio-leds"; > + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm > + &pmx_led_info &pmx_led_power > + &pmx_led_function_blue>; > + pinctrl-names = "default"; > + }; > + > + restart_poweroff { > + compatible = "restart-poweroff"; > + }; > + > + regulators { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_power_hdd0 &pmx_usb_vbus>; > + pinctrl-names = "default"; > + > + usb_power: regulator at 1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "USB Power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + }; > + > + hdd_power0: regulator at 2 { > + compatible = "regulator-fixed"; > + reg = <2>; > + regulator-name = "HDD0 Power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + }; > + }; > +}; > diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts > deleted file mode 100644 > index 5bc0b597c9c2..000000000000 > --- a/arch/arm/boot/dts/kirkwood-lswxl.dts > +++ /dev/null > @@ -1,334 +0,0 @@ > -/* > - * Device Tree file for Buffalo Linkstation LS-WXL/WSXL > - * > - * Copyright (C) 2015, 2016 > - * Roger Shimizu <rogershimizu@gmail.com> > - * > - * This file is dual-licensed: you can use it either under the terms > - * of the GPL or the X11 license, at your option. Note that this dual > - * licensing only applies to this file, and not this project as a > - * whole. > - * > - * a) This file 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. > - * > - * This file is distributed in the hope that it will be useful > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * Or, alternatively > - * > - * b) Permission is hereby granted, free of charge, to any person > - * obtaining a copy of this software and associated documentation > - * files (the "Software"), to deal in the Software without > - * restriction, including without limitation the rights to use > - * copy, modify, merge, publish, distribute, sublicense, and/or > - * sell copies of the Software, and to permit persons to whom the > - * Software is furnished to do so, subject to the following > - * conditions: > - * > - * The above copyright notice and this permission notice shall be > - * included in all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND > - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY > - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > - * OTHER DEALINGS IN THE SOFTWARE. > - */ > - > -/dts-v1/; > - > -#include "kirkwood.dtsi" > -#include "kirkwood-6281.dtsi" > - > -/ { > - model = "Buffalo Linkstation LS-WXL/WSXL"; > - compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; > - > - memory { /* 128 MB */ > - device_type = "memory"; > - reg = <0x00000000 0x8000000>; > - }; > - > - chosen { > - bootargs = "console=ttyS0,115200n8 earlyprintk"; > - stdout-path = &uart0; > - }; > - > - mbus { > - pcie-controller { > - status = "okay"; > - pcie at 1,0 { > - status = "okay"; > - }; > - }; > - }; > - > - ocp at f1000000 { > - pinctrl: pin-controller at 10000 { > - pmx_power_hdd0: pmx-power-hdd0 { > - marvell,pins = "mpp28"; > - marvell,function = "gpio"; > - }; > - pmx_power_hdd1: pmx-power-hdd1 { > - marvell,pins = "mpp29"; > - marvell,function = "gpio"; > - }; > - pmx_usb_vbus: pmx-usb-vbus { > - marvell,pins = "mpp37"; > - marvell,function = "gpio"; > - }; > - pmx_fan_high: pmx-fan-high { > - marvell,pins = "mpp47"; > - marvell,function = "gpio"; > - }; > - pmx_fan_low: pmx-fan-low { > - marvell,pins = "mpp48"; > - marvell,function = "gpio"; > - }; > - pmx_led_hdderr0: pmx-led-hdderr0 { > - marvell,pins = "mpp8"; > - marvell,function = "gpio"; > - }; > - pmx_led_hdderr1: pmx-led-hdderr1 { > - marvell,pins = "mpp46"; > - marvell,function = "gpio"; > - }; > - pmx_led_alarm: pmx-led-alarm { > - marvell,pins = "mpp49"; > - marvell,function = "gpio"; > - }; > - pmx_led_function_red: pmx-led-function-red { > - marvell,pins = "mpp34"; > - marvell,function = "gpio"; > - }; > - pmx_led_function_blue: pmx-led-function-blue { > - marvell,pins = "mpp36"; > - marvell,function = "gpio"; > - }; > - pmx_led_info: pmx-led-info { > - marvell,pins = "mpp38"; > - marvell,function = "gpio"; > - }; > - pmx_led_power: pmx-led-power { > - marvell,pins = "mpp39"; > - marvell,function = "gpio"; > - }; > - pmx_fan_lock: pmx-fan-lock { > - marvell,pins = "mpp40"; > - marvell,function = "gpio"; > - }; > - pmx_button_function: pmx-button-function { > - marvell,pins = "mpp41"; > - marvell,function = "gpio"; > - }; > - pmx_power_switch: pmx-power-switch { > - marvell,pins = "mpp42"; > - marvell,function = "gpio"; > - }; > - pmx_power_auto_switch: pmx-power-auto-switch { > - marvell,pins = "mpp43"; > - marvell,function = "gpio"; > - }; > - }; > - > - serial at 12000 { > - status = "okay"; > - }; > - > - sata at 80000 { > - status = "okay"; > - nr-ports = <2>; > - }; > - > - spi at 10600 { > - status = "okay"; > - > - m25p40 at 0 { > - #address-cells = <1>; > - #size-cells = <1>; > - compatible = "st,m25p40", "jedec,spi-nor"; > - reg = <0>; > - spi-max-frequency = <25000000>; > - mode = <0>; > - > - partition at 0 { > - reg = <0x0 0x60000>; > - label = "uboot"; > - read-only; > - }; > - > - partition at 60000 { > - reg = <0x60000 0x10000>; > - label = "dtb"; > - read-only; > - }; > - > - partition at 70000 { > - reg = <0x70000 0x10000>; > - label = "uboot_env"; > - }; > - }; > - }; > - }; > - > - gpio_keys { > - compatible = "gpio-keys"; > - #address-cells = <1>; > - #size-cells = <0>; > - pinctrl-0 = <&pmx_button_function &pmx_power_switch > - &pmx_power_auto_switch>; > - pinctrl-names = "default"; > - > - button at 1 { > - label = "Function Button"; > - linux,code = <KEY_OPTION>; > - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; > - }; > - > - button at 2 { > - label = "Power-on Switch"; > - linux,code = <KEY_RESERVED>; > - linux,input-type = <5>; > - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; > - }; > - > - button at 3 { > - label = "Power-auto Switch"; > - linux,code = <KEY_ESC>; > - linux,input-type = <5>; > - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; > - }; > - }; > - > - gpio_leds { > - compatible = "gpio-leds"; > - pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm > - &pmx_led_info &pmx_led_power > - &pmx_led_function_blue > - &pmx_led_hdderr0 > - &pmx_led_hdderr1>; > - pinctrl-names = "default"; > - > - led at 1 { > - label = "lswxl:blue:func"; > - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; > - }; > - > - led at 2 { > - label = "lswxl:red:alarm"; > - gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; > - }; > - > - led at 3 { > - label = "lswxl:amber:info"; > - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; > - }; > - > - led at 4 { > - label = "lswxl:blue:power"; > - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; > - }; > - > - led at 5 { > - label = "lswxl:red:func"; > - gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; > - }; > - > - led at 6 { > - label = "lswxl:red:hdderr0"; > - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; > - }; > - > - led at 7 { > - label = "lswxl:red:hdderr1"; > - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; > - }; > - }; > - > - gpio_fan { > - compatible = "gpio-fan"; > - pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; > - pinctrl-names = "default"; > - > - gpios = <&gpio1 16 GPIO_ACTIVE_LOW > - &gpio1 15 GPIO_ACTIVE_LOW>; > - > - gpio-fan,speed-map = <0 3 > - 1500 2 > - 3250 1 > - 5000 0>; > - > - alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; > - }; > - > - restart_poweroff { > - compatible = "restart-poweroff"; > - }; > - > - regulators { > - compatible = "simple-bus"; > - #address-cells = <1>; > - #size-cells = <0>; > - pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; > - pinctrl-names = "default"; > - > - usb_power: regulator at 1 { > - compatible = "regulator-fixed"; > - reg = <1>; > - regulator-name = "USB Power"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - enable-active-high; > - regulator-always-on; > - regulator-boot-on; > - gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; > - }; > - hdd_power0: regulator at 2 { > - compatible = "regulator-fixed"; > - reg = <2>; > - regulator-name = "HDD0 Power"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - enable-active-high; > - regulator-always-on; > - regulator-boot-on; > - gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; > - }; > - hdd_power1: regulator at 3 { > - compatible = "regulator-fixed"; > - reg = <3>; > - regulator-name = "HDD1 Power"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - enable-active-high; > - regulator-always-on; > - regulator-boot-on; > - gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; > - }; > - }; > -}; > - > -&mdio { > - status = "okay"; > - > - ethphy1: ethernet-phy at 8 { > - device_type = "ethernet-phy"; > - reg = <8>; > - }; > -}; > - > -ð1 { > - status = "okay"; > - > - ethernet1-port at 0 { > - phy-handle = <ðphy1>; > - }; > -}; > -- > 2.1.4 > ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (5 preceding siblings ...) 2016-01-20 15:33 ` [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu @ 2016-01-20 15:33 ` Roger Shimizu 2016-01-21 0:37 ` Andrew Lunn 6 siblings, 1 reply; 40+ messages in thread From: Roger Shimizu @ 2016-01-20 15:33 UTC (permalink / raw) To: linux-arm-kernel LS-WVL/VL are both kirkwood-6282 based NAS devices, which share many MPP pins. However they are slightly different: - LS-WVL is 2-Bay NAS, and LS-VL is only 1-Bay. - There're two red LED indicator on LS-WVL to show when HDD fails, which is similar to LS-WXL, but there's no such on LS-VL. So after the split, common part goes into .dtsi file: - kirkwood-linkstation-6282.dtsi while all rest part goes into device specific .dts file: - kirkwood-linkstation-lsvl.dts - kirkwood-linkstation-lswvl.dts Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> --- .../devicetree/bindings/arm/marvell,kirkwood.txt | 3 +- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 191 ++++++++++++ arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 +++++++ arch/arm/boot/dts/kirkwood-lswvl.dts | 334 --------------------- 6 files changed, 364 insertions(+), 336 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt index c7f8e3e97c78..0d5d0f607d6c 100644 --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt @@ -19,10 +19,11 @@ SoC. Currently known SoC compatibles are: And in addition, the compatible shall be extended with the specific board. Currently known boards are: +"buffalo,linkstation-lsvl" "buffalo,linkstation-lswsxl" "buffalo,linkstation-lswxl" +"buffalo,linkstation-lswvl" "buffalo,lschlv2" -"buffalo,lswvl" "buffalo,lsxhl" "buffalo,lsxl" "dlink,dns-320" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 788c75a69364..3e2cf27d2368 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -183,10 +183,11 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-is2.dtb \ kirkwood-km_kirkwood.dtb \ kirkwood-laplug.dtb \ + kirkwood-linkstation-lsvl.dtb \ kirkwood-linkstation-lswsxl.dtb \ + kirkwood-linkstation-lswvl.dtb \ kirkwood-linkstation-lswxl.dtb \ kirkwood-lschlv2.dtb \ - kirkwood-lswvl.dtb \ kirkwood-lsxhl.dtb \ kirkwood-mplcec4.dtb \ kirkwood-mv88f6281gtw-ge.dtb \ diff --git a/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi new file mode 100644 index 000000000000..627090b21ad3 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi @@ -0,0 +1,191 @@ +/* + * Device Tree common file for kirkwood-6282 based Buffalo Linkstation + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "kirkwood.dtsi" +#include "kirkwood-6282.dtsi" +#include "kirkwood-linkstation.dtsi" + +/ { + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd0: pmx-power-hdd0 { + marvell,pins = "mpp8"; + marvell,function = "gpio"; + }; + pmx_usb_vbus: pmx-usb-vbus { + marvell,pins = "mpp12"; + marvell,function = "gpio"; + }; + pmx_fan_high: pmx-fan-high { + marvell,pins = "mpp16"; + marvell,function = "gpio"; + }; + pmx_fan_low: pmx-fan-low { + marvell,pins = "mpp17"; + marvell,function = "gpio"; + }; + pmx_led_alarm: pmx-led-alarm { + marvell,pins = "mpp36"; + marvell,function = "gpio"; + }; + pmx_led_function_red: pmx-led-function-red { + marvell,pins = "mpp37"; + marvell,function = "gpio"; + }; + pmx_led_info: pmx-led-info { + marvell,pins = "mpp38"; + marvell,function = "gpio"; + }; + pmx_led_function_blue: pmx-led-function-blue { + marvell,pins = "mpp39"; + marvell,function = "gpio"; + }; + pmx_led_power: pmx-led-power { + marvell,pins = "mpp40"; + marvell,function = "gpio"; + }; + pmx_fan_lock: pmx-fan-lock { + marvell,pins = "mpp43"; + marvell,function = "gpio"; + }; + pmx_button_function: pmx-button-function { + marvell,pins = "mpp45"; + marvell,function = "gpio"; + }; + pmx_power_switch: pmx-power-switch { + marvell,pins = "mpp46"; + marvell,function = "gpio"; + }; + pmx_power_auto_switch: pmx-power-auto-switch { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; + }; + }; + + gpio_keys { + function-button { + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + }; + + power-on-switch { + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + }; + + power-auto-switch { + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + }; + }; + + gpio_leds { + red-alarm-led { + label = "linkstation:red:alarm"; + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; + }; + + red-function-led { + label = "linkstation:red:function"; + gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; + }; + + amber-info-led { + label = "linkstation:amber:info"; + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; + }; + + blue-function-led { + label = "linkstation:blue:function"; + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + }; + + blue-power-led { + label = "linkstation:blue:power"; + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; + }; + }; + + gpio_fan { + compatible = "gpio-fan"; + pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; + pinctrl-names = "default"; + + gpios = <&gpio0 17 GPIO_ACTIVE_LOW + &gpio0 16 GPIO_ACTIVE_LOW>; + + gpio-fan,speed-map = <0 3 + 1500 2 + 3250 1 + 5000 0>; + + alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; + }; + + regulators { + usb_power: regulator at 1 { + gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; + }; + + hdd_power0: regulator at 2 { + gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy0: ethernet-phy at 0 { + device_type = "ethernet-phy"; + reg = <0>; + }; +}; + +ð0 { + status = "okay"; + + ethernet0-port at 0 { + phy-handle = <ðphy0>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts new file mode 100644 index 000000000000..edcba5c44b05 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts @@ -0,0 +1,57 @@ +/* + * Device Tree file for Buffalo Linkstation LS-VL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-6282.dtsi" + +/ { + model = "Buffalo Linkstation LS-VL"; + compatible = "buffalo,lsvl", "marvell,kirkwood-88f6282", "marvell,kirkwood"; + + memory { /* 256 MB */ + device_type = "memory"; + reg = <0x00000000 0x10000000>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts new file mode 100644 index 000000000000..954ec1d5b6dc --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts @@ -0,0 +1,112 @@ +/* + * Device Tree file for Buffalo Linkstation LS-WVL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-6282.dtsi" + +/ { + model = "Buffalo Linkstation LS-WVL"; + compatible = "buffalo,lswvl","marvell,kirkwood-88f6282", "marvell,kirkwood"; + + memory { /* 256 MB */ + device_type = "memory"; + reg = <0x00000000 0x10000000>; + }; + + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd1: pmx-power-hdd1 { + marvell,pins = "mpp9"; + marvell,function = "gpio"; + }; + pmx_led_hdderr0: pmx-led-hdderr0 { + marvell,pins = "mpp34"; + marvell,function = "gpio"; + }; + pmx_led_hdderr1: pmx-led-hdderr1 { + marvell,pins = "mpp35"; + marvell,function = "gpio"; + }; + }; + + sata at 80000 { + nr-ports = <2>; + }; + }; + + gpio_leds { + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm + &pmx_led_info &pmx_led_power + &pmx_led_function_blue + &pmx_led_hdderr0 + &pmx_led_hdderr1>; + + red-hdderr0-led { + label = "linkstation:red:hdderr0"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + }; + + red-hdderr1-led { + label = "linkstation:red:hdderr1"; + gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; + }; + }; + + regulators { + pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; + + hdd_power1: regulator at 3 { + compatible = "regulator-fixed"; + reg = <3>; + regulator-name = "HDD1 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; + }; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts deleted file mode 100644 index 59ac94cc93e9..000000000000 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ /dev/null @@ -1,334 +0,0 @@ -/* - * Device Tree file for Buffalo Linkstation LS-WVL/VL - * - * Copyright (C) 2015, 2016 - * Roger Shimizu <rogershimizu@gmail.com> - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/dts-v1/; - -#include "kirkwood.dtsi" -#include "kirkwood-6282.dtsi" - -/ { - model = "Buffalo Linkstation LS-WVL/VL"; - compatible = "buffalo,lswvl", "buffalo,lsvl", "marvell,kirkwood-88f6282", "marvell,kirkwood"; - - memory { /* 256 MB */ - device_type = "memory"; - reg = <0x00000000 0x10000000>; - }; - - chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk"; - stdout-path = &uart0; - }; - - mbus { - pcie-controller { - status = "okay"; - pcie at 1,0 { - status = "okay"; - }; - }; - }; - - ocp at f1000000 { - pinctrl: pin-controller at 10000 { - pmx_power_hdd0: pmx-power-hdd0 { - marvell,pins = "mpp8"; - marvell,function = "gpio"; - }; - pmx_power_hdd1: pmx-power-hdd1 { - marvell,pins = "mpp9"; - marvell,function = "gpio"; - }; - pmx_usb_vbus: pmx-usb-vbus { - marvell,pins = "mpp12"; - marvell,function = "gpio"; - }; - pmx_fan_high: pmx-fan-high { - marvell,pins = "mpp16"; - marvell,function = "gpio"; - }; - pmx_fan_low: pmx-fan-low { - marvell,pins = "mpp17"; - marvell,function = "gpio"; - }; - pmx_led_hdderr0: pmx-led-hdderr0 { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; - pmx_led_hdderr1: pmx-led-hdderr1 { - marvell,pins = "mpp35"; - marvell,function = "gpio"; - }; - pmx_led_alarm: pmx-led-alarm { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_led_function_red: pmx-led-function-red { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_led_info: pmx-led-info { - marvell,pins = "mpp38"; - marvell,function = "gpio"; - }; - pmx_led_function_blue: pmx-led-function-blue { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_led_power: pmx-led-power { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_fan_lock: pmx-fan-lock { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - pmx_button_function: pmx-button-function { - marvell,pins = "mpp45"; - marvell,function = "gpio"; - }; - pmx_power_switch: pmx-power-switch { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_power_auto_switch: pmx-power-auto-switch { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - }; - - serial at 12000 { - status = "okay"; - }; - - sata at 80000 { - status = "okay"; - nr-ports = <2>; - }; - - spi at 10600 { - status = "okay"; - - m25p40 at 0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "st,m25p40", "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - mode = <0>; - - partition at 0 { - reg = <0x0 0x60000>; - label = "uboot"; - read-only; - }; - - partition at 60000 { - reg = <0x60000 0x10000>; - label = "dtb"; - read-only; - }; - - partition at 70000 { - reg = <0x70000 0x10000>; - label = "uboot_env"; - }; - }; - }; - }; - - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_button_function &pmx_power_switch - &pmx_power_auto_switch>; - pinctrl-names = "default"; - - button at 1 { - label = "Function Button"; - linux,code = <KEY_OPTION>; - gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; - }; - - button at 2 { - label = "Power-on Switch"; - linux,code = <KEY_RESERVED>; - linux,input-type = <5>; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; - }; - - button at 3 { - label = "Power-auto Switch"; - linux,code = <KEY_ESC>; - linux,input-type = <5>; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_leds { - compatible = "gpio-leds"; - pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm - &pmx_led_info &pmx_led_power - &pmx_led_function_blue - &pmx_led_hdderr0 - &pmx_led_hdderr1>; - pinctrl-names = "default"; - - led at 1 { - label = "lswvl:red:alarm"; - gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; - }; - - led at 2 { - label = "lswvl:red:func"; - gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; - }; - - led at 3 { - label = "lswvl:amber:info"; - gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; - }; - - led at 4 { - label = "lswvl:blue:func"; - gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; - }; - - led at 5 { - label = "lswvl:blue:power"; - gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; - }; - - led at 6 { - label = "lswvl:red:hdderr0"; - gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; - }; - - led at 7 { - label = "lswvl:red:hdderr1"; - gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; - }; - }; - - gpio_fan { - compatible = "gpio-fan"; - pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; - pinctrl-names = "default"; - - gpios = <&gpio0 17 GPIO_ACTIVE_LOW - &gpio0 16 GPIO_ACTIVE_LOW>; - - gpio-fan,speed-map = <0 3 - 1500 2 - 3250 1 - 5000 0>; - - alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; - }; - - restart_poweroff { - compatible = "restart-poweroff"; - }; - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; - pinctrl-names = "default"; - - usb_power: regulator at 1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; - }; - hdd_power0: regulator at 2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "HDD0 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; - }; - hdd_power1: regulator at 3 { - compatible = "regulator-fixed"; - reg = <3>; - regulator-name = "HDD1 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&mdio { - status = "okay"; - - ethphy0: ethernet-phy at 0 { - device_type = "ethernet-phy"; - reg = <0>; - }; -}; - -ð0 { - status = "okay"; - - ethernet0-port at 0 { - phy-handle = <ðphy0>; - }; -}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v2 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl 2016-01-20 15:33 ` [PATCH v2 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl Roger Shimizu @ 2016-01-21 0:37 ` Andrew Lunn 0 siblings, 0 replies; 40+ messages in thread From: Andrew Lunn @ 2016-01-21 0:37 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 21, 2016 at 12:33:58AM +0900, Roger Shimizu wrote: > LS-WVL/VL are both kirkwood-6282 based NAS devices, which share > many MPP pins. However they are slightly different: > - LS-WVL is 2-Bay NAS, and LS-VL is only 1-Bay. > - There're two red LED indicator on LS-WVL to show when HDD fails, > which is similar to LS-WXL, but there's no such on LS-VL. > > So after the split, common part goes into .dtsi file: > - kirkwood-linkstation-6282.dtsi > while all rest part goes into device specific .dts file: > - kirkwood-linkstation-lsvl.dts > - kirkwood-linkstation-lswvl.dts > > Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl 2016-01-19 13:49 [PATCH 0/2] ARM: dts: kirkwood: split lswxl and lswvl with fixes Roger Shimizu ` (2 preceding siblings ...) 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu @ 2016-01-21 14:38 ` Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu ` (8 more replies) 3 siblings, 9 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 14:38 UTC (permalink / raw) To: linux-arm-kernel Dear kirkwood maintainers, Linkstation dts for ls-wxl and ls-wvl need some fixes: - [patch 1/7] and [patch 2/7] are fixes for gpio pin - [patch 3/7] and [patch 4/7] are fixes for gpio led Above 4 patches can be safely backported to 4.3/4.4 stable kernel. And in order to support more buffalo linkstation devices in convenient way, I split current 2 dts files into a few comoon dtsi files and device specific dts files. - [patch 5/7] relicense dts under GPLv2/X11 - [patch 6/7] split dts for lswxl - [patch 7/7] split dts for lswvl Changes in v2: - separate the fix and relicense patch - add "linkstation:" to all led labels Changes in v3: - address Andrew Lunn's suggestion to change commit message for [patch 3/7] and [patch 4/7] - add Andrew Lunn's "Reviewed-by" - address active high/low for the power LED Cheers. Roger Shimizu (7): ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl .../devicetree/bindings/arm/marvell,kirkwood.txt | 6 +- arch/arm/boot/dts/Makefile | 6 +- arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 192 +++++++++++++ .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 186 +++++++++++++ arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 ++++++++ arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 ++++++++ arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 ++++++++++++++ arch/arm/boot/dts/kirkwood-lswvl.dts | 301 --------------------- arch/arm/boot/dts/kirkwood-lswxl.dts | 301 --------------------- 11 files changed, 930 insertions(+), 606 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts -- 2.1.4 ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v3 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu @ 2016-01-21 14:38 ` Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl Roger Shimizu ` (7 subsequent siblings) 8 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 14:38 UTC (permalink / raw) To: linux-arm-kernel For kirkwood, gpio pins starts from 32 are in the 2nd bank, so it should be converted to "gpio1 <pin minus 32>" in dts file. e.g. gpio 40 should be "gpio1 8" Besides, a few other pin fixes for ls-wxl/wsxl, to match with mpp pin definition: - gpio-leds: "lswxl:blue:power" pin - gpio-leds: "lswxl:red:func" pin - gpio-leds: "lswxl:red:hdderr0" pin - gpio-leds: "lswxl:red:hdderr1" pin - gpio-fan: low/high/alarm pin The pin/bank issue was found when discussing Debian Bug #810894 [https://bugs.debian.org/810894#47] Fixes: e54e4b1b622e ("ARM: dts: add buffalo linkstation ls-wxl/wsxl") Reported-by: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/kirkwood-lswxl.dts | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts index f5db16a08597..0e93f6d19259 100644 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts @@ -1,7 +1,8 @@ /* * Device Tree file for Buffalo Linkstation LS-WXL/WSXL * - * Copyright (C) 2015, rogershimizu at gmail.com + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -156,21 +157,21 @@ button at 1 { label = "Function Button"; linux,code = <KEY_OPTION>; - gpios = <&gpio1 41 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; button at 2 { label = "Power-on Switch"; linux,code = <KEY_RESERVED>; linux,input-type = <5>; - gpios = <&gpio1 42 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; }; button at 3 { label = "Power-auto Switch"; linux,code = <KEY_ESC>; linux,input-type = <5>; - gpios = <&gpio1 43 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; }; @@ -185,12 +186,12 @@ led at 1 { label = "lswxl:blue:func"; - gpios = <&gpio1 36 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; led at 2 { label = "lswxl:red:alarm"; - gpios = <&gpio1 49 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; }; led at 3 { @@ -200,23 +201,23 @@ led at 4 { label = "lswxl:blue:power"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; }; led at 5 { label = "lswxl:red:func"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; default-state = "keep"; }; led at 6 { label = "lswxl:red:hdderr0"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led at 7 { label = "lswxl:red:hdderr1"; - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; @@ -225,15 +226,15 @@ pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; pinctrl-names = "default"; - gpios = <&gpio0 47 GPIO_ACTIVE_LOW - &gpio0 48 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 16 GPIO_ACTIVE_LOW + &gpio1 15 GPIO_ACTIVE_LOW>; gpio-fan,speed-map = <0 3 1500 2 3250 1 5000 0>; - alarm-gpios = <&gpio1 49 GPIO_ACTIVE_HIGH>; + alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; }; restart_poweroff { @@ -256,7 +257,7 @@ enable-active-high; regulator-always-on; regulator-boot-on; - gpio = <&gpio0 37 GPIO_ACTIVE_HIGH>; + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; }; hdd_power0: regulator at 2 { compatible = "regulator-fixed"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v3 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu @ 2016-01-21 14:38 ` Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu ` (6 subsequent siblings) 8 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 14:38 UTC (permalink / raw) To: linux-arm-kernel For kirkwood, gpio pins starts from 32 are in the 2nd bank, so it should be converted to "gpio1 <pin minus 32>" in dts file. e.g. gpio 40 should be "gpio1 8" The pin/bank issue was found when discussing Debian Bug #810894 [https://bugs.debian.org/810894#47] Fixes: c43379e150aa ("ARM: dts: add buffalo linkstation ls-wvl/vl") Reported-by: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/kirkwood-lswvl.dts | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts index 09eed3cea0af..28fd9abd7a57 100644 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ b/arch/arm/boot/dts/kirkwood-lswvl.dts @@ -1,7 +1,8 @@ /* * Device Tree file for Buffalo Linkstation LS-WVL/VL * - * Copyright (C) 2015, rogershimizu at gmail.com + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -156,21 +157,21 @@ button at 1 { label = "Function Button"; linux,code = <KEY_OPTION>; - gpios = <&gpio0 45 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; }; button at 2 { label = "Power-on Switch"; linux,code = <KEY_RESERVED>; linux,input-type = <5>; - gpios = <&gpio0 46 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; button at 3 { label = "Power-auto Switch"; linux,code = <KEY_ESC>; linux,input-type = <5>; - gpios = <&gpio0 47 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; @@ -185,38 +186,38 @@ led at 1 { label = "lswvl:red:alarm"; - gpios = <&gpio0 36 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; led at 2 { label = "lswvl:red:func"; - gpios = <&gpio0 37 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; led at 3 { label = "lswvl:amber:info"; - gpios = <&gpio0 38 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; led at 4 { label = "lswvl:blue:func"; - gpios = <&gpio0 39 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; }; led at 5 { label = "lswvl:blue:power"; - gpios = <&gpio0 40 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; default-state = "keep"; }; led at 6 { label = "lswvl:red:hdderr0"; - gpios = <&gpio0 34 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; }; led at 7 { label = "lswvl:red:hdderr1"; - gpios = <&gpio0 35 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; }; }; @@ -233,7 +234,7 @@ 3250 1 5000 0>; - alarm-gpios = <&gpio0 43 GPIO_ACTIVE_HIGH>; + alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; }; restart_poweroff { -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v3 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl Roger Shimizu @ 2016-01-21 14:38 ` Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl Roger Shimizu ` (5 subsequent siblings) 8 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 14:38 UTC (permalink / raw) To: linux-arm-kernel The GPIOs controlling the LEDs, listed below, are active high, not low: - gpio-leds: "lswxl:blue:power" pin - gpio-leds: "lswxl:red:func" pin - gpio-leds: "lswxl:red:hdderr{0,1}" pin Fixes: e54e4b1b622e ("ARM: dts: add buffalo linkstation ls-wxl/wsxl") Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/kirkwood-lswxl.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts index 0e93f6d19259..b13ec20a7088 100644 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts @@ -201,23 +201,23 @@ led at 4 { label = "lswxl:blue:power"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + default-state = "keep"; }; led at 5 { label = "lswxl:red:func"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; - default-state = "keep"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; }; led at 6 { label = "lswxl:red:hdderr0"; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; led at 7 { label = "lswxl:red:hdderr1"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; }; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v3 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (2 preceding siblings ...) 2016-01-21 14:38 ` [PATCH v3 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu @ 2016-01-21 14:38 ` Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 Roger Shimizu ` (4 subsequent siblings) 8 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 14:38 UTC (permalink / raw) To: linux-arm-kernel The GPIOs controlling the LEDs, listed below, are active high, not low: - gpio-leds: "lswvl:red:alarm" pin - gpio-leds: "lswvl:red:func" pin - gpio-leds: "lswvl:amber:info" pin - gpio-leds: "lswvl:blue:func" pin - gpio-leds: "lswvl:red:hdderr{0,1}" pin Fixes: c43379e150aa ("ARM: dts: add buffalo linkstation ls-wvl/vl") Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/kirkwood-lswvl.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts index 28fd9abd7a57..36eec7392ab4 100644 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ b/arch/arm/boot/dts/kirkwood-lswvl.dts @@ -186,22 +186,22 @@ led at 1 { label = "lswvl:red:alarm"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; }; led at 2 { label = "lswvl:red:func"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; }; led at 3 { label = "lswvl:amber:info"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; }; led at 4 { label = "lswvl:blue:func"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; }; led at 5 { @@ -212,12 +212,12 @@ led at 6 { label = "lswvl:red:hdderr0"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; }; led at 7 { label = "lswvl:red:hdderr1"; - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; }; }; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v3 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (3 preceding siblings ...) 2016-01-21 14:38 ` [PATCH v3 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl Roger Shimizu @ 2016-01-21 14:38 ` Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu ` (3 subsequent siblings) 8 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 14:38 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/kirkwood-lswvl.dts | 41 ++++++++++++++++++++++++++++++++---- arch/arm/boot/dts/kirkwood-lswxl.dts | 41 ++++++++++++++++++++++++++++++++---- 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts index 36eec7392ab4..04bdc4f19a9f 100644 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ b/arch/arm/boot/dts/kirkwood-lswvl.dts @@ -4,10 +4,43 @@ * Copyright (C) 2015, 2016 * Roger Shimizu <rogershimizu@gmail.com> * - * 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. + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts index b13ec20a7088..930899d13c5d 100644 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts @@ -4,10 +4,43 @@ * Copyright (C) 2015, 2016 * Roger Shimizu <rogershimizu@gmail.com> * - * 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. + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v3 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (4 preceding siblings ...) 2016-01-21 14:38 ` [PATCH v3 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 Roger Shimizu @ 2016-01-21 14:38 ` Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl Roger Shimizu ` (2 subsequent siblings) 8 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 14:38 UTC (permalink / raw) To: linux-arm-kernel LS-WXL/WSXL are both kirkwood-6281 based 2-Bay NAS devices, which share many MPP pins. However they are slightly different: - There're two red LED indicator on LS-WXL to show when HDD fails, but there's no such on LS-WSXL. - There's 4-level speed adjustable FAN on LS-WXL, but not LS-WSXL. So after the split, common part goes into .dtsi file: - kirkwood-linkstation.dtsi - kirkwood-linkstation-duo-6281.dtsi while all rest part goes into device specific .dts file: - kirkwood-linkstation-lswsxl.dts - kirkwood-linkstation-lswxl.dts Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- .../devicetree/bindings/arm/marvell,kirkwood.txt | 3 +- arch/arm/boot/dts/Makefile | 3 +- .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 186 ++++++++++++ arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 +++++++ arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 +++++++++++++ arch/arm/boot/dts/kirkwood-lswxl.dts | 335 --------------------- 7 files changed, 565 insertions(+), 337 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt index 5171ad8f48ff..c7f8e3e97c78 100644 --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt @@ -19,9 +19,10 @@ SoC. Currently known SoC compatibles are: And in addition, the compatible shall be extended with the specific board. Currently known boards are: +"buffalo,linkstation-lswsxl" +"buffalo,linkstation-lswxl" "buffalo,lschlv2" "buffalo,lswvl" -"buffalo,lswxl" "buffalo,lsxhl" "buffalo,lsxl" "dlink,dns-320" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 30bbc3746130..788c75a69364 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -183,9 +183,10 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-is2.dtb \ kirkwood-km_kirkwood.dtb \ kirkwood-laplug.dtb \ + kirkwood-linkstation-lswsxl.dtb \ + kirkwood-linkstation-lswxl.dtb \ kirkwood-lschlv2.dtb \ kirkwood-lswvl.dtb \ - kirkwood-lswxl.dtb \ kirkwood-lsxhl.dtb \ kirkwood-mplcec4.dtb \ kirkwood-mv88f6281gtw-ge.dtb \ diff --git a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi new file mode 100644 index 000000000000..cf2e69f0d54f --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi @@ -0,0 +1,186 @@ +/* + * Device Tree common file for kirkwood-6281 based 2-Bay Buffalo Linkstation + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "kirkwood.dtsi" +#include "kirkwood-6281.dtsi" +#include "kirkwood-linkstation.dtsi" + +/ { + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd0: pmx-power-hdd0 { + marvell,pins = "mpp28"; + marvell,function = "gpio"; + }; + pmx_power_hdd1: pmx-power-hdd1 { + marvell,pins = "mpp29"; + marvell,function = "gpio"; + }; + pmx_usb_vbus: pmx-usb-vbus { + marvell,pins = "mpp37"; + marvell,function = "gpio"; + }; + pmx_led_alarm: pmx-led-alarm { + marvell,pins = "mpp49"; + marvell,function = "gpio"; + }; + pmx_led_function_red: pmx-led-function-red { + marvell,pins = "mpp34"; + marvell,function = "gpio"; + }; + pmx_led_function_blue: pmx-led-function-blue { + marvell,pins = "mpp36"; + marvell,function = "gpio"; + }; + pmx_led_info: pmx-led-info { + marvell,pins = "mpp38"; + marvell,function = "gpio"; + }; + pmx_led_power: pmx-led-power { + marvell,pins = "mpp39"; + marvell,function = "gpio"; + }; + pmx_button_function: pmx-button-function { + marvell,pins = "mpp41"; + marvell,function = "gpio"; + }; + pmx_power_switch: pmx-power-switch { + marvell,pins = "mpp42"; + marvell,function = "gpio"; + }; + pmx_power_auto_switch: pmx-power-auto-switch { + marvell,pins = "mpp43"; + marvell,function = "gpio"; + }; + }; + + sata at 80000 { + nr-ports = <2>; + }; + }; + + gpio_keys { + function-button { + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + }; + + power-on-switch { + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; + + power-auto-switch { + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + }; + }; + + gpio_leds { + red-alarm-led { + label = "linkstation:red:alarm"; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + }; + + red-function-led { + label = "linkstation:red:function"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + }; + + amber-info-led { + label = "linkstation:amber:info"; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + }; + + blue-function-led { + label = "linkstation:blue:function"; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + }; + + blue-power-led { + label = "linkstation:blue:power"; + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + }; + + regulators { + pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; + + usb_power: regulator at 1 { + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; + }; + + hdd_power0: regulator at 2 { + gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; + }; + + hdd_power1: regulator at 3 { + compatible = "regulator-fixed"; + reg = <3>; + regulator-name = "HDD1 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy1: ethernet-phy at 8 { + device_type = "ethernet-phy"; + reg = <8>; + }; +}; + +ð1 { + status = "okay"; + + ethernet1-port at 0 { + phy-handle = <ðphy1>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts new file mode 100644 index 000000000000..4b6450186af5 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts @@ -0,0 +1,57 @@ +/* + * Device Tree file for Buffalo Linkstation LS-WSXL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-duo-6281.dtsi" + +/ { + model = "Buffalo Linkstation LS-WSXL"; + compatible = "buffalo,lswsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + + memory { /* 128 MB */ + device_type = "memory"; + reg = <0x00000000 0x8000000>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts new file mode 100644 index 000000000000..ecd5c12a805d --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts @@ -0,0 +1,116 @@ +/* + * Device Tree file for Buffalo Linkstation LS-WXL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-duo-6281.dtsi" + +/ { + model = "Buffalo Linkstation LS-WXL"; + compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + + memory { /* 128 MB */ + device_type = "memory"; + reg = <0x00000000 0x8000000>; + }; + + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_led_hdderr0: pmx-led-hdderr0 { + marvell,pins = "mpp8"; + marvell,function = "gpio"; + }; + pmx_led_hdderr1: pmx-led-hdderr1 { + marvell,pins = "mpp46"; + marvell,function = "gpio"; + }; + pmx_fan_lock: pmx-fan-lock { + marvell,pins = "mpp40"; + marvell,function = "gpio"; + }; + pmx_fan_high: pmx-fan-high { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; + pmx_fan_low: pmx-fan-low { + marvell,pins = "mpp48"; + marvell,function = "gpio"; + }; + }; + }; + + gpio_leds { + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm + &pmx_led_info &pmx_led_power + &pmx_led_function_blue + &pmx_led_hdderr0 + &pmx_led_hdderr1>; + + red-hdderr0-led { + label = "linkstation:red:hdderr0"; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + }; + + red-hdderr1-led { + label = "linkstation:red:hdderr1"; + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; + }; + }; + + gpio_fan { + compatible = "gpio-fan"; + pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; + pinctrl-names = "default"; + + gpios = <&gpio1 16 GPIO_ACTIVE_LOW + &gpio1 15 GPIO_ACTIVE_LOW>; + + gpio-fan,speed-map = <0 3 + 1500 2 + 3250 1 + 5000 0>; + + alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/kirkwood-linkstation.dtsi new file mode 100644 index 000000000000..69061b6e987b --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation.dtsi @@ -0,0 +1,202 @@ +/* + * Device Tree common file for kirkwood based Buffalo Linkstation + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/ { + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + stdout-path = &uart0; + }; + + mbus { + pcie-controller { + status = "okay"; + pcie at 1,0 { + status = "okay"; + }; + }; + }; + + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd0: pmx-power-hdd0 { + marvell,function = "gpio"; + }; + pmx_usb_vbus: pmx-usb-vbus { + marvell,function = "gpio"; + }; + pmx_led_alarm: pmx-led-alarm { + marvell,function = "gpio"; + }; + pmx_led_function_red: pmx-led-function-red { + marvell,function = "gpio"; + }; + pmx_led_function_blue: pmx-led-function-blue { + marvell,function = "gpio"; + }; + pmx_led_info: pmx-led-info { + marvell,function = "gpio"; + }; + pmx_led_power: pmx-led-power { + marvell,function = "gpio"; + }; + pmx_button_function: pmx-button-function { + marvell,function = "gpio"; + }; + pmx_power_switch: pmx-power-switch { + marvell,function = "gpio"; + }; + pmx_power_auto_switch: pmx-power-auto-switch { + marvell,function = "gpio"; + }; + }; + + serial at 12000 { + status = "okay"; + }; + + sata at 80000 { + status = "okay"; + nr-ports = <1>; + }; + + spi at 10600 { + status = "okay"; + + m25p40 at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p40", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + mode = <0>; + + partition at 0 { + reg = <0x0 0x60000>; + label = "uboot"; + read-only; + }; + + partition at 60000 { + reg = <0x60000 0x10000>; + label = "dtb"; + read-only; + }; + + partition at 70000 { + reg = <0x70000 0x10000>; + label = "uboot_env"; + }; + }; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&pmx_button_function &pmx_power_switch + &pmx_power_auto_switch>; + pinctrl-names = "default"; + + function-button { + label = "Function Button"; + linux,code = <KEY_OPTION>; + }; + + power-on-switch { + label = "Power-on Switch"; + linux,code = <KEY_RESERVED>; + linux,input-type = <5>; + }; + + power-auto-switch { + label = "Power-auto Switch"; + linux,code = <KEY_ESC>; + linux,input-type = <5>; + }; + }; + + gpio_leds { + compatible = "gpio-leds"; + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm + &pmx_led_info &pmx_led_power + &pmx_led_function_blue>; + pinctrl-names = "default"; + }; + + restart_poweroff { + compatible = "restart-poweroff"; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&pmx_power_hdd0 &pmx_usb_vbus>; + pinctrl-names = "default"; + + usb_power: regulator at 1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "USB Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + }; + + hdd_power0: regulator at 2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "HDD0 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + }; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts deleted file mode 100644 index 930899d13c5d..000000000000 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ /dev/null @@ -1,335 +0,0 @@ -/* - * Device Tree file for Buffalo Linkstation LS-WXL/WSXL - * - * Copyright (C) 2015, 2016 - * Roger Shimizu <rogershimizu@gmail.com> - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/dts-v1/; - -#include "kirkwood.dtsi" -#include "kirkwood-6281.dtsi" - -/ { - model = "Buffalo Linkstation LS-WXL/WSXL"; - compatible = "buffalo,lswxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; - - memory { /* 128 MB */ - device_type = "memory"; - reg = <0x00000000 0x8000000>; - }; - - chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk"; - stdout-path = &uart0; - }; - - mbus { - pcie-controller { - status = "okay"; - pcie at 1,0 { - status = "okay"; - }; - }; - }; - - ocp at f1000000 { - pinctrl: pin-controller at 10000 { - pmx_power_hdd0: pmx-power-hdd0 { - marvell,pins = "mpp28"; - marvell,function = "gpio"; - }; - pmx_power_hdd1: pmx-power-hdd1 { - marvell,pins = "mpp29"; - marvell,function = "gpio"; - }; - pmx_usb_vbus: pmx-usb-vbus { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_fan_high: pmx-fan-high { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - pmx_fan_low: pmx-fan-low { - marvell,pins = "mpp48"; - marvell,function = "gpio"; - }; - pmx_led_hdderr0: pmx-led-hdderr0 { - marvell,pins = "mpp8"; - marvell,function = "gpio"; - }; - pmx_led_hdderr1: pmx-led-hdderr1 { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_led_alarm: pmx-led-alarm { - marvell,pins = "mpp49"; - marvell,function = "gpio"; - }; - pmx_led_function_red: pmx-led-function-red { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; - pmx_led_function_blue: pmx-led-function-blue { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_led_info: pmx-led-info { - marvell,pins = "mpp38"; - marvell,function = "gpio"; - }; - pmx_led_power: pmx-led-power { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_fan_lock: pmx-fan-lock { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_button_function: pmx-button-function { - marvell,pins = "mpp41"; - marvell,function = "gpio"; - }; - pmx_power_switch: pmx-power-switch { - marvell,pins = "mpp42"; - marvell,function = "gpio"; - }; - pmx_power_auto_switch: pmx-power-auto-switch { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - }; - - serial at 12000 { - status = "okay"; - }; - - sata at 80000 { - status = "okay"; - nr-ports = <2>; - }; - - spi at 10600 { - status = "okay"; - - m25p40 at 0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "st,m25p40", "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - mode = <0>; - - partition at 0 { - reg = <0x0 0x60000>; - label = "uboot"; - read-only; - }; - - partition at 60000 { - reg = <0x60000 0x10000>; - label = "dtb"; - read-only; - }; - - partition at 70000 { - reg = <0x70000 0x10000>; - label = "uboot_env"; - }; - }; - }; - }; - - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_button_function &pmx_power_switch - &pmx_power_auto_switch>; - pinctrl-names = "default"; - - button at 1 { - label = "Function Button"; - linux,code = <KEY_OPTION>; - gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; - }; - - button at 2 { - label = "Power-on Switch"; - linux,code = <KEY_RESERVED>; - linux,input-type = <5>; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; - }; - - button at 3 { - label = "Power-auto Switch"; - linux,code = <KEY_ESC>; - linux,input-type = <5>; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_leds { - compatible = "gpio-leds"; - pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm - &pmx_led_info &pmx_led_power - &pmx_led_function_blue - &pmx_led_hdderr0 - &pmx_led_hdderr1>; - pinctrl-names = "default"; - - led at 1 { - label = "lswxl:blue:func"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - }; - - led at 2 { - label = "lswxl:red:alarm"; - gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; - }; - - led at 3 { - label = "lswxl:amber:info"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; - }; - - led at 4 { - label = "lswxl:blue:power"; - gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; - default-state = "keep"; - }; - - led at 5 { - label = "lswxl:red:func"; - gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; - }; - - led at 6 { - label = "lswxl:red:hdderr0"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; - }; - - led at 7 { - label = "lswxl:red:hdderr1"; - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; - }; - }; - - gpio_fan { - compatible = "gpio-fan"; - pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; - pinctrl-names = "default"; - - gpios = <&gpio1 16 GPIO_ACTIVE_LOW - &gpio1 15 GPIO_ACTIVE_LOW>; - - gpio-fan,speed-map = <0 3 - 1500 2 - 3250 1 - 5000 0>; - - alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; - }; - - restart_poweroff { - compatible = "restart-poweroff"; - }; - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; - pinctrl-names = "default"; - - usb_power: regulator at 1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; - }; - hdd_power0: regulator at 2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "HDD0 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>; - }; - hdd_power1: regulator at 3 { - compatible = "regulator-fixed"; - reg = <3>; - regulator-name = "HDD1 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&mdio { - status = "okay"; - - ethphy1: ethernet-phy at 8 { - device_type = "ethernet-phy"; - reg = <8>; - }; -}; - -ð1 { - status = "okay"; - - ethernet1-port at 0 { - phy-handle = <ðphy1>; - }; -}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v3 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (5 preceding siblings ...) 2016-01-21 14:38 ` [PATCH v3 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu @ 2016-01-21 14:38 ` Roger Shimizu 2016-01-21 16:00 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Gregory CLEMENT 2016-01-25 15:17 ` Gregory CLEMENT 8 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 14:38 UTC (permalink / raw) To: linux-arm-kernel LS-WVL/VL are both kirkwood-6282 based NAS devices, which share many MPP pins. However they are slightly different: - LS-WVL is 2-Bay NAS, and LS-VL is only 1-Bay. - There're two red LED indicator on LS-WVL to show when HDD fails, which is similar to LS-WXL, but there's no such on LS-VL. So after the split, common part goes into .dtsi file: - kirkwood-linkstation-6282.dtsi while all rest part goes into device specific .dts file: - kirkwood-linkstation-lsvl.dts - kirkwood-linkstation-lswvl.dts Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- .../devicetree/bindings/arm/marvell,kirkwood.txt | 3 +- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 192 ++++++++++++ arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 ++++ arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 +++++++ arch/arm/boot/dts/kirkwood-lswvl.dts | 335 --------------------- 6 files changed, 365 insertions(+), 337 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt index c7f8e3e97c78..0d5d0f607d6c 100644 --- a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt @@ -19,10 +19,11 @@ SoC. Currently known SoC compatibles are: And in addition, the compatible shall be extended with the specific board. Currently known boards are: +"buffalo,linkstation-lsvl" "buffalo,linkstation-lswsxl" "buffalo,linkstation-lswxl" +"buffalo,linkstation-lswvl" "buffalo,lschlv2" -"buffalo,lswvl" "buffalo,lsxhl" "buffalo,lsxl" "dlink,dns-320" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 788c75a69364..3e2cf27d2368 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -183,10 +183,11 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-is2.dtb \ kirkwood-km_kirkwood.dtb \ kirkwood-laplug.dtb \ + kirkwood-linkstation-lsvl.dtb \ kirkwood-linkstation-lswsxl.dtb \ + kirkwood-linkstation-lswvl.dtb \ kirkwood-linkstation-lswxl.dtb \ kirkwood-lschlv2.dtb \ - kirkwood-lswvl.dtb \ kirkwood-lsxhl.dtb \ kirkwood-mplcec4.dtb \ kirkwood-mv88f6281gtw-ge.dtb \ diff --git a/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi new file mode 100644 index 000000000000..6548e68a20d0 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi @@ -0,0 +1,192 @@ +/* + * Device Tree common file for kirkwood-6282 based Buffalo Linkstation + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "kirkwood.dtsi" +#include "kirkwood-6282.dtsi" +#include "kirkwood-linkstation.dtsi" + +/ { + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd0: pmx-power-hdd0 { + marvell,pins = "mpp8"; + marvell,function = "gpio"; + }; + pmx_usb_vbus: pmx-usb-vbus { + marvell,pins = "mpp12"; + marvell,function = "gpio"; + }; + pmx_fan_high: pmx-fan-high { + marvell,pins = "mpp16"; + marvell,function = "gpio"; + }; + pmx_fan_low: pmx-fan-low { + marvell,pins = "mpp17"; + marvell,function = "gpio"; + }; + pmx_led_alarm: pmx-led-alarm { + marvell,pins = "mpp36"; + marvell,function = "gpio"; + }; + pmx_led_function_red: pmx-led-function-red { + marvell,pins = "mpp37"; + marvell,function = "gpio"; + }; + pmx_led_info: pmx-led-info { + marvell,pins = "mpp38"; + marvell,function = "gpio"; + }; + pmx_led_function_blue: pmx-led-function-blue { + marvell,pins = "mpp39"; + marvell,function = "gpio"; + }; + pmx_led_power: pmx-led-power { + marvell,pins = "mpp40"; + marvell,function = "gpio"; + }; + pmx_fan_lock: pmx-fan-lock { + marvell,pins = "mpp43"; + marvell,function = "gpio"; + }; + pmx_button_function: pmx-button-function { + marvell,pins = "mpp45"; + marvell,function = "gpio"; + }; + pmx_power_switch: pmx-power-switch { + marvell,pins = "mpp46"; + marvell,function = "gpio"; + }; + pmx_power_auto_switch: pmx-power-auto-switch { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; + }; + }; + + gpio_keys { + function-button { + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + }; + + power-on-switch { + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + }; + + power-auto-switch { + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + }; + }; + + gpio_leds { + red-alarm-led { + label = "linkstation:red:alarm"; + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; + }; + + red-function-led { + label = "linkstation:red:function"; + gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; + }; + + amber-info-led { + label = "linkstation:amber:info"; + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; + }; + + blue-function-led { + label = "linkstation:blue:function"; + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + }; + + blue-power-led { + label = "linkstation:blue:power"; + gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + default-state = "keep"; + }; + }; + + gpio_fan { + compatible = "gpio-fan"; + pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; + pinctrl-names = "default"; + + gpios = <&gpio0 17 GPIO_ACTIVE_LOW + &gpio0 16 GPIO_ACTIVE_LOW>; + + gpio-fan,speed-map = <0 3 + 1500 2 + 3250 1 + 5000 0>; + + alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; + }; + + regulators { + usb_power: regulator at 1 { + gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; + }; + + hdd_power0: regulator at 2 { + gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy0: ethernet-phy at 0 { + device_type = "ethernet-phy"; + reg = <0>; + }; +}; + +ð0 { + status = "okay"; + + ethernet0-port at 0 { + phy-handle = <ðphy0>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts new file mode 100644 index 000000000000..edcba5c44b05 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts @@ -0,0 +1,57 @@ +/* + * Device Tree file for Buffalo Linkstation LS-VL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-6282.dtsi" + +/ { + model = "Buffalo Linkstation LS-VL"; + compatible = "buffalo,lsvl", "marvell,kirkwood-88f6282", "marvell,kirkwood"; + + memory { /* 256 MB */ + device_type = "memory"; + reg = <0x00000000 0x10000000>; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts new file mode 100644 index 000000000000..954ec1d5b6dc --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts @@ -0,0 +1,112 @@ +/* + * Device Tree file for Buffalo Linkstation LS-WVL + * + * Copyright (C) 2015, 2016 + * Roger Shimizu <rogershimizu@gmail.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "kirkwood-linkstation-6282.dtsi" + +/ { + model = "Buffalo Linkstation LS-WVL"; + compatible = "buffalo,lswvl","marvell,kirkwood-88f6282", "marvell,kirkwood"; + + memory { /* 256 MB */ + device_type = "memory"; + reg = <0x00000000 0x10000000>; + }; + + ocp at f1000000 { + pinctrl: pin-controller at 10000 { + pmx_power_hdd1: pmx-power-hdd1 { + marvell,pins = "mpp9"; + marvell,function = "gpio"; + }; + pmx_led_hdderr0: pmx-led-hdderr0 { + marvell,pins = "mpp34"; + marvell,function = "gpio"; + }; + pmx_led_hdderr1: pmx-led-hdderr1 { + marvell,pins = "mpp35"; + marvell,function = "gpio"; + }; + }; + + sata at 80000 { + nr-ports = <2>; + }; + }; + + gpio_leds { + pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm + &pmx_led_info &pmx_led_power + &pmx_led_function_blue + &pmx_led_hdderr0 + &pmx_led_hdderr1>; + + red-hdderr0-led { + label = "linkstation:red:hdderr0"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + }; + + red-hdderr1-led { + label = "linkstation:red:hdderr1"; + gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; + }; + }; + + regulators { + pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; + + hdd_power1: regulator at 3 { + compatible = "regulator-fixed"; + reg = <3>; + regulator-name = "HDD1 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; + }; + }; +}; diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts deleted file mode 100644 index 04bdc4f19a9f..000000000000 --- a/arch/arm/boot/dts/kirkwood-lswvl.dts +++ /dev/null @@ -1,335 +0,0 @@ -/* - * Device Tree file for Buffalo Linkstation LS-WVL/VL - * - * Copyright (C) 2015, 2016 - * Roger Shimizu <rogershimizu@gmail.com> - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/dts-v1/; - -#include "kirkwood.dtsi" -#include "kirkwood-6282.dtsi" - -/ { - model = "Buffalo Linkstation LS-WVL/VL"; - compatible = "buffalo,lswvl", "buffalo,lsvl", "marvell,kirkwood-88f6282", "marvell,kirkwood"; - - memory { /* 256 MB */ - device_type = "memory"; - reg = <0x00000000 0x10000000>; - }; - - chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk"; - stdout-path = &uart0; - }; - - mbus { - pcie-controller { - status = "okay"; - pcie at 1,0 { - status = "okay"; - }; - }; - }; - - ocp at f1000000 { - pinctrl: pin-controller at 10000 { - pmx_power_hdd0: pmx-power-hdd0 { - marvell,pins = "mpp8"; - marvell,function = "gpio"; - }; - pmx_power_hdd1: pmx-power-hdd1 { - marvell,pins = "mpp9"; - marvell,function = "gpio"; - }; - pmx_usb_vbus: pmx-usb-vbus { - marvell,pins = "mpp12"; - marvell,function = "gpio"; - }; - pmx_fan_high: pmx-fan-high { - marvell,pins = "mpp16"; - marvell,function = "gpio"; - }; - pmx_fan_low: pmx-fan-low { - marvell,pins = "mpp17"; - marvell,function = "gpio"; - }; - pmx_led_hdderr0: pmx-led-hdderr0 { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; - pmx_led_hdderr1: pmx-led-hdderr1 { - marvell,pins = "mpp35"; - marvell,function = "gpio"; - }; - pmx_led_alarm: pmx-led-alarm { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_led_function_red: pmx-led-function-red { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_led_info: pmx-led-info { - marvell,pins = "mpp38"; - marvell,function = "gpio"; - }; - pmx_led_function_blue: pmx-led-function-blue { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_led_power: pmx-led-power { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_fan_lock: pmx-fan-lock { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - pmx_button_function: pmx-button-function { - marvell,pins = "mpp45"; - marvell,function = "gpio"; - }; - pmx_power_switch: pmx-power-switch { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_power_auto_switch: pmx-power-auto-switch { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - }; - - serial at 12000 { - status = "okay"; - }; - - sata at 80000 { - status = "okay"; - nr-ports = <2>; - }; - - spi at 10600 { - status = "okay"; - - m25p40 at 0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "st,m25p40", "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - mode = <0>; - - partition at 0 { - reg = <0x0 0x60000>; - label = "uboot"; - read-only; - }; - - partition at 60000 { - reg = <0x60000 0x10000>; - label = "dtb"; - read-only; - }; - - partition at 70000 { - reg = <0x70000 0x10000>; - label = "uboot_env"; - }; - }; - }; - }; - - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_button_function &pmx_power_switch - &pmx_power_auto_switch>; - pinctrl-names = "default"; - - button at 1 { - label = "Function Button"; - linux,code = <KEY_OPTION>; - gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; - }; - - button at 2 { - label = "Power-on Switch"; - linux,code = <KEY_RESERVED>; - linux,input-type = <5>; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; - }; - - button at 3 { - label = "Power-auto Switch"; - linux,code = <KEY_ESC>; - linux,input-type = <5>; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_leds { - compatible = "gpio-leds"; - pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm - &pmx_led_info &pmx_led_power - &pmx_led_function_blue - &pmx_led_hdderr0 - &pmx_led_hdderr1>; - pinctrl-names = "default"; - - led at 1 { - label = "lswvl:red:alarm"; - gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; - }; - - led at 2 { - label = "lswvl:red:func"; - gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; - }; - - led at 3 { - label = "lswvl:amber:info"; - gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; - }; - - led at 4 { - label = "lswvl:blue:func"; - gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; - }; - - led at 5 { - label = "lswvl:blue:power"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; - default-state = "keep"; - }; - - led at 6 { - label = "lswvl:red:hdderr0"; - gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; - }; - - led at 7 { - label = "lswvl:red:hdderr1"; - gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; - }; - }; - - gpio_fan { - compatible = "gpio-fan"; - pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; - pinctrl-names = "default"; - - gpios = <&gpio0 17 GPIO_ACTIVE_LOW - &gpio0 16 GPIO_ACTIVE_LOW>; - - gpio-fan,speed-map = <0 3 - 1500 2 - 3250 1 - 5000 0>; - - alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; - }; - - restart_poweroff { - compatible = "restart-poweroff"; - }; - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_power_hdd0 &pmx_power_hdd1 &pmx_usb_vbus>; - pinctrl-names = "default"; - - usb_power: regulator at 1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; - }; - hdd_power0: regulator at 2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "HDD0 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; - }; - hdd_power1: regulator at 3 { - compatible = "regulator-fixed"; - reg = <3>; - regulator-name = "HDD1 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&mdio { - status = "okay"; - - ethphy0: ethernet-phy at 0 { - device_type = "ethernet-phy"; - reg = <0>; - }; -}; - -ð0 { - status = "okay"; - - ethernet0-port at 0 { - phy-handle = <ðphy0>; - }; -}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (6 preceding siblings ...) 2016-01-21 14:38 ` [PATCH v3 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl Roger Shimizu @ 2016-01-21 16:00 ` Gregory CLEMENT 2016-01-21 16:05 ` Roger Shimizu 2016-01-25 15:17 ` Gregory CLEMENT 8 siblings, 1 reply; 40+ messages in thread From: Gregory CLEMENT @ 2016-01-21 16:00 UTC (permalink / raw) To: linux-arm-kernel Hi Roger, On jeu., janv. 21 2016, Roger Shimizu <rogershimizu@gmail.com> wrote: > Dear kirkwood maintainers, > > Linkstation dts for ls-wxl and ls-wvl need some fixes: > - [patch 1/7] and [patch 2/7] are fixes for gpio pin > - [patch 3/7] and [patch 4/7] are fixes for gpio led > Above 4 patches can be safely backported to 4.3/4.4 stable kernel. > > And in order to support more buffalo linkstation devices in convenient way, > I split current 2 dts files into a few comoon dtsi files and device specific > dts files. > - [patch 5/7] relicense dts under GPLv2/X11 > - [patch 6/7] split dts for lswxl > - [patch 7/7] split dts for lswvl > > Changes in v2: > - separate the fix and relicense patch > - add "linkstation:" to all led labels > Changes in v3: > - address Andrew Lunn's suggestion to change commit message > for [patch 3/7] and [patch 4/7] > - add Andrew Lunn's "Reviewed-by" > - address active high/low for the power LED I will apply this series on the mvebu branches when v4.5-rc1 will be released (so it should be the next week). Thanks, Greogry > > Cheers. > > Roger Shimizu (7): > ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl > ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl > ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl > ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl > ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under > GPLv2/X11 > ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl > ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl > > .../devicetree/bindings/arm/marvell,kirkwood.txt | 6 +- > arch/arm/boot/dts/Makefile | 6 +- > arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 192 +++++++++++++ > .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 186 +++++++++++++ > arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 ++++ > arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++ > arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 ++++++++ > arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 ++++++++ > arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 ++++++++++++++ > arch/arm/boot/dts/kirkwood-lswvl.dts | 301 --------------------- > arch/arm/boot/dts/kirkwood-lswxl.dts | 301 --------------------- > 11 files changed, 930 insertions(+), 606 deletions(-) > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi > delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts > delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts > > -- > 2.1.4 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl 2016-01-21 16:00 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Gregory CLEMENT @ 2016-01-21 16:05 ` Roger Shimizu 2016-01-21 16:18 ` Gregory CLEMENT 0 siblings, 1 reply; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 16:05 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 22, 2016 at 1:00 AM, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote: > Hi Roger, > > On jeu., janv. 21 2016, Roger Shimizu <rogershimizu@gmail.com> wrote: > >> Dear kirkwood maintainers, >> >> Linkstation dts for ls-wxl and ls-wvl need some fixes: >> - [patch 1/7] and [patch 2/7] are fixes for gpio pin >> - [patch 3/7] and [patch 4/7] are fixes for gpio led >> Above 4 patches can be safely backported to 4.3/4.4 stable kernel. >> >> And in order to support more buffalo linkstation devices in convenient way, >> I split current 2 dts files into a few comoon dtsi files and device specific >> dts files. >> - [patch 5/7] relicense dts under GPLv2/X11 >> - [patch 6/7] split dts for lswxl >> - [patch 7/7] split dts for lswvl >> >> Changes in v2: >> - separate the fix and relicense patch >> - add "linkstation:" to all led labels >> Changes in v3: >> - address Andrew Lunn's suggestion to change commit message >> for [patch 3/7] and [patch 4/7] >> - add Andrew Lunn's "Reviewed-by" >> - address active high/low for the power LED > > I will apply this series on the mvebu branches when v4.5-rc1 will be > released (so it should be the next week). Dear Gregory, Thanks for your feedback! Just curious, since patch 0001~0004 are fixes, could it be applied earlier? Cheers, Roger ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl 2016-01-21 16:05 ` Roger Shimizu @ 2016-01-21 16:18 ` Gregory CLEMENT 2016-01-21 16:23 ` Roger Shimizu 0 siblings, 1 reply; 40+ messages in thread From: Gregory CLEMENT @ 2016-01-21 16:18 UTC (permalink / raw) To: linux-arm-kernel Hi Roger, On jeu., janv. 21 2016, Roger Shimizu <rogershimizu@gmail.com> wrote: > On Fri, Jan 22, 2016 at 1:00 AM, Gregory CLEMENT > <gregory.clement@free-electrons.com> wrote: >> Hi Roger, >> >> On jeu., janv. 21 2016, Roger Shimizu <rogershimizu@gmail.com> wrote: >> >>> Dear kirkwood maintainers, >>> >>> Linkstation dts for ls-wxl and ls-wvl need some fixes: >>> - [patch 1/7] and [patch 2/7] are fixes for gpio pin >>> - [patch 3/7] and [patch 4/7] are fixes for gpio led >>> Above 4 patches can be safely backported to 4.3/4.4 stable kernel. >>> >>> And in order to support more buffalo linkstation devices in convenient way, >>> I split current 2 dts files into a few comoon dtsi files and device specific >>> dts files. >>> - [patch 5/7] relicense dts under GPLv2/X11 >>> - [patch 6/7] split dts for lswxl >>> - [patch 7/7] split dts for lswvl >>> >>> Changes in v2: >>> - separate the fix and relicense patch >>> - add "linkstation:" to all led labels >>> Changes in v3: >>> - address Andrew Lunn's suggestion to change commit message >>> for [patch 3/7] and [patch 4/7] >>> - add Andrew Lunn's "Reviewed-by" >>> - address active high/low for the power LED >> >> I will apply this series on the mvebu branches when v4.5-rc1 will be >> released (so it should be the next week). > > Dear Gregory, > > Thanks for your feedback! > > Just curious, > since patch 0001~0004 are fixes, could it be applied earlier? Our branches go to Linus tree through the arm-soc tree. As they have just did a pull request I doubt a new one will be done this week. Moreover all our patches are based on the rc1: having a single refrence helps the arm-soc subsystem to merge all the contributions, that's why I am waiting for next week. And finally for this patch it is obviously too late for for 4.4 but we have plenty of time for 4.5. However, I plan to send these fixes to arm-soc early next week so it should be in 4.5-rc2, and as soon it will be in Linus tree then it should be backported to 4.4 and 4.3 by the stable team. Gregory > > Cheers, > Roger -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl 2016-01-21 16:18 ` Gregory CLEMENT @ 2016-01-21 16:23 ` Roger Shimizu 0 siblings, 0 replies; 40+ messages in thread From: Roger Shimizu @ 2016-01-21 16:23 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 22, 2016 at 1:18 AM, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote: > On jeu., janv. 21 2016, Roger Shimizu <rogershimizu@gmail.com> wrote: >> Just curious, >> since patch 0001~0004 are fixes, could it be applied earlier? > > Our branches go to Linus tree through the arm-soc tree. As they have > just did a pull request I doubt a new one will be done this week. > > Moreover all our patches are based on the rc1: having a single refrence > helps the arm-soc subsystem to merge all the contributions, that's why I > am waiting for next week. > > And finally for this patch it is obviously too late for for 4.4 but we > have plenty of time for 4.5. However, I plan to send these fixes to > arm-soc early next week so it should be in 4.5-rc2, and as soon it will > be in Linus tree then it should be backported to 4.4 and 4.3 by the > stable team. Dear Gregory, Understand the status. Will wait for the merge next week. Thank you! Cheers, Roger ^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu ` (7 preceding siblings ...) 2016-01-21 16:00 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Gregory CLEMENT @ 2016-01-25 15:17 ` Gregory CLEMENT 8 siblings, 0 replies; 40+ messages in thread From: Gregory CLEMENT @ 2016-01-25 15:17 UTC (permalink / raw) To: linux-arm-kernel Hi Roger, On jeu., janv. 21 2016, Roger Shimizu <rogershimizu@gmail.com> wrote: > Dear kirkwood maintainers, > > Linkstation dts for ls-wxl and ls-wvl need some fixes: > - [patch 1/7] and [patch 2/7] are fixes for gpio pin > - [patch 3/7] and [patch 4/7] are fixes for gpio led > Above 4 patches can be safely backported to 4.3/4.4 stable kernel. Paches 1-4 are applied on mvebu/fixes > > And in order to support more buffalo linkstation devices in convenient way, > I split current 2 dts files into a few comoon dtsi files and device specific > dts files. > - [patch 5/7] relicense dts under GPLv2/X11 > - [patch 6/7] split dts for lswxl > - [patch 7/7] split dts for lswvl Paches 5-7 are applied on mvebu/dt Thanks, Gregory > > Changes in v2: > - separate the fix and relicense patch > - add "linkstation:" to all led labels > Changes in v3: > - address Andrew Lunn's suggestion to change commit message > for [patch 3/7] and [patch 4/7] > - add Andrew Lunn's "Reviewed-by" > - address active high/low for the power LED > > Cheers. > > Roger Shimizu (7): > ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl > ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl > ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl > ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl > ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under > GPLv2/X11 > ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl > ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl > > .../devicetree/bindings/arm/marvell,kirkwood.txt | 6 +- > arch/arm/boot/dts/Makefile | 6 +- > arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 192 +++++++++++++ > .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 186 +++++++++++++ > arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 ++++ > arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++ > arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 ++++++++ > arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 ++++++++ > arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 ++++++++++++++ > arch/arm/boot/dts/kirkwood-lswvl.dts | 301 --------------------- > arch/arm/boot/dts/kirkwood-lswxl.dts | 301 --------------------- > 11 files changed, 930 insertions(+), 606 deletions(-) > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi > delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts > delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts > > -- > 2.1.4 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 40+ messages in thread
end of thread, other threads:[~2016-01-25 15:17 UTC | newest] Thread overview: 40+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-19 13:49 [PATCH 0/2] ARM: dts: kirkwood: split lswxl and lswvl with fixes Roger Shimizu 2016-01-19 13:49 ` [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl Roger Shimizu 2016-01-19 14:05 ` Andrew Lunn 2016-01-19 14:15 ` Roger Shimizu 2016-01-19 14:48 ` Andrew Lunn 2016-01-19 14:56 ` Roger Shimizu 2016-01-20 1:08 ` Andrew Lunn 2016-01-19 13:49 ` [PATCH 2/2] ARM: dts: kirkwood: split lswvl into linkstation lsvl and lswvl Roger Shimizu 2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu 2016-01-20 15:33 ` [PATCH v2 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu 2016-01-20 17:11 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl Roger Shimizu 2016-01-20 17:12 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu 2016-01-20 17:16 ` Andrew Lunn 2016-01-21 0:16 ` Roger Shimizu 2016-01-21 0:30 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl Roger Shimizu 2016-01-21 0:31 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 Roger Shimizu 2016-01-20 17:18 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu 2016-01-20 17:21 ` Sebastian Hesselbarth 2016-01-21 15:06 ` Roger Shimizu 2016-01-21 0:36 ` Andrew Lunn 2016-01-20 15:33 ` [PATCH v2 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl Roger Shimizu 2016-01-21 0:37 ` Andrew Lunn 2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu 2016-01-21 14:38 ` [PATCH v3 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl Roger Shimizu 2016-01-21 16:00 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Gregory CLEMENT 2016-01-21 16:05 ` Roger Shimizu 2016-01-21 16:18 ` Gregory CLEMENT 2016-01-21 16:23 ` Roger Shimizu 2016-01-25 15:17 ` Gregory CLEMENT
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).