Skip to contentSkip to conversation

fix and new support for orion5x based linkstation

PATCH Superseded Roger Shimizu 3 participants 14 messages Feb 5, 2016 – Feb 8, 2016

Subsystems (2)
Device tree bindings Arm and arm64 SoC sub-architectures (common parts)
lore
Share & tools
lore

Roger Shimizu

author
#0 lore raw

cover fix and new support for orion5x based linkstation

Dear Orion5x Maintainer,

Here're fix and new support for orion5x based linkstation devices.

Firstly, it add the missing mtd flash support, which I consider a fix and can be backported to stable kernels, so I made the patch explicit.

Second, like the changes I made for kirkwood based linkstation DT, I split the orion5x-linkstation-lswtgl.dts file into common and device specific part, in order to support more devices.

Third, so there's a new device.

Hope this can be kindly accepted. Thank you!

Cheers,
Roger

Roger Shimizu (3):
ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl
ARM: dts: orion5x: split linkstation lswtgl into common and device
parts
ARM: dts: orion5x: add device tree for buffalo linkstation ls-gl

 arch/arm/boot/dts/Makefile                       |   1 +
 arch/arm/boot/dts/linkstation-fan.dtsi           |  72 ++++++++
 arch/arm/boot/dts/linkstation-gpio-simple.dtsi   | 105 +++++++++++
 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts   |  87 +++++++++
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 214 +++++------------------
 arch/arm/boot/dts/orion5x-linkstation.dtsi       | 180 +++++++++++++++++++
 6 files changed, 491 insertions(+), 168 deletions(-)
 create mode 100644 arch/arm/boot/dts/linkstation-fan.dtsi
 create mode 100644 arch/arm/boot/dts/linkstation-gpio-simple.dtsi
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 1/3 ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl

MTD flash stores u-boot and u-boot environment on linkstation lswtgl. The latter one can be easily read/write by u-boot-tools package in Debian.

Signed-off-by Roger Shimizu <[email protected]>
---
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts +31 -0
index 420788229e6f..aae8a7aceab7 100644
@@ -228,6 +228,37 @@
 	};
 };
 
+&devbus_bootcs {
+	status = "okay";
+	devbus,keep-config;
+
+	flash at 0 {
+		compatible = "jedec-flash";
+		reg = <0 0x40000>;
+		bank-width = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			header at 0 {
+				reg = <0 0x30000>;
+				read-only;
+			};
+
+			uboot at 30000 {
+				reg = <0x30000 0xF000>;
+				read-only;
+			};
+
+			uboot_env at 3F000 {
+				reg = <0x3F000 0x1000>;
+			};
+		};
+	};
+};
+
 &mdio {
 	status = "okay";
Signature · 1 line
2.1.4
#2 lore raw

PATCH 1/3 ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl

Quoted 4 lines · Roger Shimizu

MTD flash stores u-boot and u-boot environment on linkstation lswtgl. The latter one can be easily read/write by u-boot-tools package in Debian.

Signed-off-by Roger Shimizu <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>

Thanks for using the partitions node.

Andrew

Quoted 49 lines
---
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts +31 -0
index 420788229e6f..aae8a7aceab7 100644
@@ -228,6 +228,37 @@
 	};
 };
 
+&devbus_bootcs {
+	status = "okay";
+	devbus,keep-config;
+
+	flash at 0 {
+		compatible = "jedec-flash";
+		reg = <0 0x40000>;
+		bank-width = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			header at 0 {
+				reg = <0 0x30000>;
+				read-only;
+			};
+
+			uboot at 30000 {
+				reg = <0x30000 0xF000>;
+				read-only;
+			};
+
+			uboot_env at 3F000 {
+				reg = <0x3F000 0x1000>;
+			};
+		};
+	};
+};
+
 &mdio {
 	status = "okay";
Signature · 1 line
2.1.4
author
#3 lore raw

PATCH 1/3 ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl

Dear Andrew,

Quoted 9 lines · Andrew Lunn
Quoted 4 lines · Roger Shimizu

MTD flash stores u-boot and u-boot environment on linkstation lswtgl. The latter one can be easily read/write by u-boot-tools package in Debian.

Signed-off-by Roger Shimizu <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>

Thanks for using the partitions node.

Since you did not comment my patch v2 yet, I'm wondering that
- My patch 1/3 is a fix, which fixes the issue since 4.3, so it will be firstly applied to 4.5-rc branch as usual, and as I understand the process then it will be backported to 4.4/4.3 stable branch.
- If it's the case described above, it's better not to use partitions node, which was introduced since 4.4.
- By any case, my v2 patch 2/3 and 3/3, which uses partitions node, is fine.

If you agree, I can submit a v3 in minutes.
Thank you and looking forward to your feedback!

Cheers,

Signature · 2 lines
Roger Shimizu, GMT +9 Tokyo
PGP/GPG: 17B3ACB1
author
#4 lore raw

PATCH 2/3 ARM: dts: orion5x: split linkstation lswtgl into common and device parts

In reply to Roger Shimizu

In order to support more linkstation devices, common part of current .dts file goes into .dtsi file. Some .dtsi are not with "orion5x" prefix because other kirkwood based linkstation devices are in this shape, and will be migrated some time later.
- orion5x-linkstation.dtsi
- linkstation-gpio-simple.dtsi
- linkstation-fan.dtsi
while all rest part remains in device specific .dts file:
- orion5x-linkstation-lswtgl.dts

Signed-off-by Roger Shimizu <[email protected]>
---
 arch/arm/boot/dts/linkstation-fan.dtsi           |  72 +++++++
 arch/arm/boot/dts/linkstation-gpio-simple.dtsi   | 105 ++++++++++
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 243 +++++------------------
 arch/arm/boot/dts/orion5x-linkstation.dtsi       | 180 +++++++++++++++++
 4 files changed, 402 insertions(+), 198 deletions(-)
 create mode 100644 arch/arm/boot/dts/linkstation-fan.dtsi
 create mode 100644 arch/arm/boot/dts/linkstation-gpio-simple.dtsi
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi
arch/arm/boot/dts/linkstation-fan.dtsi new file +72 -0
new file mode 100644
index 000000000000..e211a3c47a76
@@ -0,0 +1,72 @@
+/*
+ * Device Tree common file for gpio-fan on Buffalo Linkstation
+ *
+ * Copyright (C) 2015, 2016
+ * Roger Shimizu <[email protected]>
+ *
+ * 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.
+ */
+
+/ {
+	gpio_fan {
+		compatible = "gpio-fan";
+		pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
+		pinctrl-names = "default";
+
+		gpio-fan,speed-map =
+			<0		3
+			1500	2
+			3250	1
+			5000	0>;
+	};
+};
+
+&pinctrl {
+	pmx_fan_low: pmx-fan-low {
+		marvell,function = "gpio";
+	};
+
+	pmx_fan_high: pmx-fan-high {
+		marvell,function = "gpio";
+	};
+
+	pmx_fan_lock: pmx-fan-lock {
+		marvell,function = "gpio";
+	};
+};
arch/arm/boot/dts/linkstation-gpio-simple.dtsi new file +105 -0

105 lines not on this page · raw message

arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts +45 -198

301 lines not on this page · raw message

arch/arm/boot/dts/orion5x-linkstation.dtsi new file +180 -0

180 lines not on this page · raw message

Signature · 1 line
2.1.4
#5 lore raw

PATCH 2/3 ARM: dts: orion5x: split linkstation lswtgl into common and device parts

Quoted 7 lines · Roger Shimizu

In order to support more linkstation devices, common part of current .dts file goes into .dtsi file. Some .dtsi are not with "orion5x" prefix because other kirkwood based linkstation devices are in this shape, and will be migrated some time later.
- orion5x-linkstation.dtsi
- linkstation-gpio-simple.dtsi
- linkstation-fan.dtsi

Hi Roger

I would prefer these have an mvebu- prefix. That then covers orion5x and kirkwood.

Otherwise these look O.K.

Andrew

author
#6 lore raw

PATCH 3/3 ARM: dts: orion5x: add device tree for buffalo linkstation ls-gl

In reply to Roger Shimizu

Add dts file to support Buffalo Linkstation LS-GL
(a.k.a Buffalo Linkstation Pro/Live), which is marvell orion5x based 3.5" HDD NAS.

Product info:
- (JPN) http://buffalo.jp/products/catalog/item/l/ls-gl/
- (ENG) http://www.buffalotech.com/products/network-storage/linkstation/linkstation-pro

This device tree is based on the board file:
arch/arm/mach-orion5x/kurobox_pro-setup.c
However, that board file also support Kurobox Pro, which is not supported by device tree yet. So the board file is not removed.

Signed-off-by Roger Shimizu <[email protected]>
---
 arch/arm/boot/dts/Makefile                     |  1 +
 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 87 ++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
arch/arm/boot/dts/Makefile +1 -0
index 68625754f398..15a52c1be78a 100644
@@ -496,6 +496,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
 dtb-$(CONFIG_ARCH_ORION5X) += \
 	orion5x-lacie-d2-network.dtb \
 	orion5x-lacie-ethernet-disk-mini-v2.dtb \
+	orion5x-linkstation-lsgl.dtb \
 	orion5x-linkstation-lswtgl.dtb \
 	orion5x-lswsgl.dtb \
 	orion5x-maxtor-shared-storage-2.dtb \
arch/arm/boot/dts/orion5x-linkstation-lsgl.dts new file +87 -0

87 lines not on this page · raw message

Signature · 1 line
2.1.4
#7 lore raw

PATCH 3/3 ARM: dts: orion5x: add device tree for buffalo linkstation ls-gl

Quoted 8 lines · Roger Shimizu

Add dts file to support Buffalo Linkstation LS-GL
(a.k.a Buffalo Linkstation Pro/Live), which is marvell orion5x based 3.5" HDD NAS.

Product info:
- (JPN) http://buffalo.jp/products/catalog/item/l/ls-gl/
- (ENG) http://www.buffalotech.com/products/network-storage/linkstation/linkstation-pro

Quoted 6 lines

This device tree is based on the board file:
arch/arm/mach-orion5x/kurobox_pro-setup.c
However, that board file also support Kurobox Pro, which is not supported by device tree yet. So the board file is not removed.

Signed-off-by Roger Shimizu <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>

Thanks
Andrew

Quoted 114 lines
---
 arch/arm/boot/dts/Makefile                     |  1 +
 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 87 ++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
arch/arm/boot/dts/Makefile +1 -0
index 68625754f398..15a52c1be78a 100644
@@ -496,6 +496,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
 dtb-$(CONFIG_ARCH_ORION5X) += \
 	orion5x-lacie-d2-network.dtb \
 	orion5x-lacie-ethernet-disk-mini-v2.dtb \
+	orion5x-linkstation-lsgl.dtb \
 	orion5x-linkstation-lswtgl.dtb \
 	orion5x-lswsgl.dtb \
 	orion5x-maxtor-shared-storage-2.dtb \
arch/arm/boot/dts/orion5x-linkstation-lsgl.dts new file +87 -0
new file mode 100644
index 000000000000..1cf644bfd7ea
@@ -0,0 +1,87 @@
+/*
+ * Device Tree file for Buffalo Linkstation LS-GL
+ *       (also known as Buffalo Linkstation Pro/Live)
+ *
+ * Copyright (C) 2016
+ * Roger Shimizu <[email protected]>
+ *
+ * Based on the board file arch/arm/mach-orion5x/kurobox_pro-setup.c
+ * Copyright (C) Ronen Shitrit <[email protected]>
+ *
+ * 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 "orion5x-linkstation.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	model = "Buffalo Linkstation Pro/Live";
+	compatible = "buffalo,lsgl", "marvell,orion5x-88f5182", "marvell,orion5x";
+
+	memory { /* 128 MB */
+		device_type = "memory";
+		reg = <0x00000000 0x8000000>;
+	};
+};
+
+&pinctrl {
+	pmx_power_hdd: pmx-power-hdd {
+		marvell,pins = "mpp1";
+		marvell,function = "gpio";
+	};
+
+	pmx_power_usb: pmx-power-usb {
+		marvell,pins = "mpp9";
+		marvell,function = "gpio";
+	};
+};
+
+&hdd_power {
+	gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+};
+
+&usb_power {
+	gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+};
+
+&ehci1 {
+	status = "okay";
+};
Signature · 1 line
2.1.4
author
#8 lore raw

v2 cover fix and new support for orion5x based linkstation

In reply to Roger Shimizu

Dear Orion5x Maintainer,

Here're fix and new support for orion5x based linkstation devices.

Firstly, it add the missing mtd flash support, which I consider a fix and can be backported to stable kernels, so I made the patch explicit.

Second, like the changes I made for kirkwood based linkstation DT, I split the orion5x-linkstation-lswtgl.dts file into common and device specific part, in order to support more devices.

Third, so there's a new device.

Hope this can be kindly accepted. Thank you!

Changes in v2:
- add "Fixes" tag for patch 1/3
- add "mvebu-" prefix to common .dtsi file to share between orion5x and kirkwood, which address comment from Andrew Lunn
- add "Reviewed-by" tag from Andrew Lunn for all 3 patches

Cheers,
Roger

Roger Shimizu (3):
ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl
ARM: dts: orion5x: split linkstation lswtgl into common and device
parts
ARM: dts: orion5x: add device tree for buffalo linkstation ls-gl

 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi       |  72 +++++++
 .../boot/dts/mvebu-linkstation-gpio-simple.dtsi    | 105 ++++++++++
 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts     |  87 +++++++++
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts   | 214 +++++----------------
 arch/arm/boot/dts/orion5x-linkstation.dtsi         | 180 +++++++++++++++++
 6 files changed, 491 insertions(+), 168 deletions(-)
 create mode 100644 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi
 create mode 100644 arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi
Signature · 1 line
2.1.4
author
#9 lore raw

PATCH v2 1/3 ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl

MTD flash stores u-boot and u-boot environment on linkstation lswtgl. The latter one can be easily read/write by u-boot-tools package in Debian.

Fixes dc57844a736f ("ARM: dts: orion5x: add buffalo linkstation ls-wtgl")
Signed-off-by Roger Shimizu <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
---
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts +31 -0
index 420788229e6f..aae8a7aceab7 100644
@@ -228,6 +228,37 @@
 	};
 };
 
+&devbus_bootcs {
+	status = "okay";
+	devbus,keep-config;
+
+	flash at 0 {
+		compatible = "jedec-flash";
+		reg = <0 0x40000>;
+		bank-width = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			header at 0 {
+				reg = <0 0x30000>;
+				read-only;
+			};
+
+			uboot at 30000 {
+				reg = <0x30000 0xF000>;
+				read-only;
+			};
+
+			uboot_env at 3F000 {
+				reg = <0x3F000 0x1000>;
+			};
+		};
+	};
+};
+
 &mdio {
 	status = "okay";
Signature · 1 line
2.1.4
author
#10 lore raw

PATCH v2 2/3 ARM: dts: orion5x: split linkstation lswtgl into common and device parts

In reply to Roger Shimizu

In order to support more linkstation devices, common part of current .dts file goes into .dtsi file. Some .dtsi start with "mvebu-" prefix because other kirkwood based linkstation devices are similar, and will be migrated to use these .dtsi some time later.
- orion5x-linkstation.dtsi
- mvebu-linkstation-fan.dtsi
- mvebu-linkstation-gpio-simple.dtsi
while all rest part remains in device specific .dts file:
- orion5x-linkstation-lswtgl.dts

Signed-off-by Roger Shimizu <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
---
 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi       |  72 ++++++
 .../boot/dts/mvebu-linkstation-gpio-simple.dtsi    | 105 +++++++++
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts   | 243 ++++-----------------
 arch/arm/boot/dts/orion5x-linkstation.dtsi         | 180 +++++++++++++++
 4 files changed, 402 insertions(+), 198 deletions(-)
 create mode 100644 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi
 create mode 100644 arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi
arch/arm/boot/dts/mvebu-linkstation-fan.dtsi new file +72 -0
new file mode 100644
index 000000000000..e211a3c47a76
@@ -0,0 +1,72 @@
+/*
+ * Device Tree common file for gpio-fan on Buffalo Linkstation
+ *
+ * Copyright (C) 2015, 2016
+ * Roger Shimizu <[email protected]>
+ *
+ * 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.
+ */
+
+/ {
+	gpio_fan {
+		compatible = "gpio-fan";
+		pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
+		pinctrl-names = "default";
+
+		gpio-fan,speed-map =
+			<0		3
+			1500	2
+			3250	1
+			5000	0>;
+	};
+};
+
+&pinctrl {
+	pmx_fan_low: pmx-fan-low {
+		marvell,function = "gpio";
+	};
+
+	pmx_fan_high: pmx-fan-high {
+		marvell,function = "gpio";
+	};
+
+	pmx_fan_lock: pmx-fan-lock {
+		marvell,function = "gpio";
+	};
+};
arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi new file +105 -0

105 lines not on this page · raw message

arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts +45 -198

301 lines not on this page · raw message

arch/arm/boot/dts/orion5x-linkstation.dtsi new file +180 -0

180 lines not on this page · raw message

Signature · 1 line
2.1.4
author
#11 lore raw

PATCH v2 3/3 ARM: dts: orion5x: add device tree for buffalo linkstation ls-gl

In reply to Roger Shimizu

Add dts file to support Buffalo Linkstation LS-GL
(a.k.a Buffalo Linkstation Pro/Live), which is marvell orion5x based 3.5" HDD NAS.

Product info:
- (JPN) http://buffalo.jp/products/catalog/item/l/ls-gl/
- (ENG) http://www.buffalotech.com/products/network-storage/linkstation/linkstation-pro

This device tree is based on the board file:
arch/arm/mach-orion5x/kurobox_pro-setup.c
However, that board file also support Kurobox Pro, which is not supported by device tree yet. So the board file is not removed.

Signed-off-by Roger Shimizu <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
---
 arch/arm/boot/dts/Makefile                     |  1 +
 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 87 ++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
arch/arm/boot/dts/Makefile +1 -0
index 68625754f398..15a52c1be78a 100644
@@ -496,6 +496,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
 dtb-$(CONFIG_ARCH_ORION5X) += \
 	orion5x-lacie-d2-network.dtb \
 	orion5x-lacie-ethernet-disk-mini-v2.dtb \
+	orion5x-linkstation-lsgl.dtb \
 	orion5x-linkstation-lswtgl.dtb \
 	orion5x-lswsgl.dtb \
 	orion5x-maxtor-shared-storage-2.dtb \
arch/arm/boot/dts/orion5x-linkstation-lsgl.dts new file +87 -0

87 lines not on this page · raw message

Signature · 1 line
2.1.4
#12 lore raw

v2 cover fix and new support for orion5x based linkstation

In reply to Roger Shimizu

Hi Roger,

Quoted 21 lines · Roger Shimizu

Dear Orion5x Maintainer,

Here're fix and new support for orion5x based linkstation devices.

Firstly, it add the missing mtd flash support, which I consider a fix and can be backported to stable kernels, so I made the patch explicit.

Second, like the changes I made for kirkwood based linkstation DT, I split the orion5x-linkstation-lswtgl.dts file into common and device specific part, in order to support more devices.

Third, so there's a new device.

Hope this can be kindly accepted. Thank you!

Changes in v2:
- add "Fixes" tag for patch 1/3
- add "mvebu-" prefix to common .dtsi file to share between orion5x and kirkwood, which address comment from Andrew Lunn
- add "Reviewed-by" tag from Andrew Lunn for all 3 patches

Quoted 8 lines

Cheers,
Roger

Roger Shimizu (3):
ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl
ARM: dts: orion5x: split linkstation lswtgl into common and device
parts
ARM: dts: orion5x: add device tree for buffalo linkstation ls-gl

The 3 patches have been applied on mvebu/dt

Thanks,

Gregory

Quoted 16 lines
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi       |  72 +++++++
 .../boot/dts/mvebu-linkstation-gpio-simple.dtsi    | 105 ++++++++++
 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts     |  87 +++++++++
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts   | 214 +++++----------------
 arch/arm/boot/dts/orion5x-linkstation.dtsi         | 180 +++++++++++++++++
 6 files changed, 491 insertions(+), 168 deletions(-)
 create mode 100644 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi
 create mode 100644 arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi
Signature · 1 line
2.1.4
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#13 lore raw

v2 cover fix and new support for orion5x based linkstation

Hi,

Quoted 28 lines · Gregory CLEMENT

Hi Roger,

Quoted 24 lines · Roger Shimizu

Dear Orion5x Maintainer,

Here're fix and new support for orion5x based linkstation devices.

Firstly, it add the missing mtd flash support, which I consider a fix and can be backported to stable kernels, so I made the patch explicit.

Second, like the changes I made for kirkwood based linkstation DT, I split the orion5x-linkstation-lswtgl.dts file into common and device specific part, in order to support more devices.

Third, so there's a new device.

Hope this can be kindly accepted. Thank you!

Changes in v2:
- add "Fixes" tag for patch 1/3
- add "mvebu-" prefix to common .dtsi file to share between orion5x and kirkwood, which address comment from Andrew Lunn
- add "Reviewed-by" tag from Andrew Lunn for all 3 patches

Cheers,
Roger

Quoted 8 lines
Quoted 5 lines

Roger Shimizu (3):
ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl
ARM: dts: orion5x: split linkstation lswtgl into common and device
parts
ARM: dts: orion5x: add device tree for buffalo linkstation ls-gl

The 3 patches have been applied on mvebu/dt

Humm, finally I moved the first patch to mvebu/fixes

Gregory

Quoted 33 lines

Thanks,

Gregory

Quoted 16 lines
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi       |  72 +++++++
 .../boot/dts/mvebu-linkstation-gpio-simple.dtsi    | 105 ++++++++++
 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts     |  87 +++++++++
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts   | 214 +++++----------------
 arch/arm/boot/dts/orion5x-linkstation.dtsi         | 180 +++++++++++++++++
 6 files changed, 491 insertions(+), 168 deletions(-)
 create mode 100644 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi
 create mode 100644 arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
 create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi
Signature · 1 line
2.1.4
Signature · 9 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com