* [PATCH 1/3] ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay
2015-08-29 16:46 [PATCH 0/3] Add support for the Armada-370-based Seagate NAS Simon Guinot
@ 2015-08-29 16:46 ` Simon Guinot
2015-08-31 12:43 ` Andrew Lunn
2015-08-29 16:46 ` [PATCH 2/3] ARM: mvebu: add DT support for Seagate Personal Cloud Simon Guinot
` (2 subsequent siblings)
3 siblings, 1 reply; 14+ messages in thread
From: Simon Guinot @ 2015-08-29 16:46 UTC (permalink / raw)
To: linux-arm-kernel
From: Vincent Donnefort <vdonnefort@gmail.com>
This patch adds DT support for the Seagate NAS 2 and 4-Bay (n090201 and
n090401).
Chipset list (common):
- SoC Marvell Armada 370 88F6707, CPU @1.2GHz
- SDRAM memory: 512MB DDR3 600MHz (16-bits bandwidth)
- NAND flash 256MB, 8-bits (Micron MT29F2G08AAB or Hinyx H27U2G8F2CTR-BC)
- 2 SATA II ports (SoC)
- 1 Ethernet Gigabit ports (PHY Marvell 88E1518)
- 2 USB3 host ports (PCIe controller ASM1042)
- GPIO fan (4 speeds)
- External I2C RTC (MCP7940NT)
- 3 push buttons (power, backup and reset)
- 2 SATA LEDs (bi-color, blue and red)
- 1 power LED (bi-color, blue and red)
Only on 4-Bay models:
- 2 extra SATA III ports (PCIe AHCI controller Marvell 88SE9170)
- 1 extra Ethernet Gigabit ports (PHY Marvell 88E1518)
- I2C GPIO expander (PCA9554A)
- 2 extra SATA LEDs (bi-color, blue and red)
Note that support for the white SATA LEDs associated with HDDs 0 and 1
is missing. A dedicated LED driver is needed.
Signed-off-by: Vincent Donnefort <vdonnefort@gmail.com>
---
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/armada-370-n090201.dts | 28 ++++
arch/arm/boot/dts/armada-370-n090401.dts | 124 ++++++++++++++++
arch/arm/boot/dts/armada-370-n090x01.dtsi | 232 ++++++++++++++++++++++++++++++
4 files changed, 386 insertions(+)
create mode 100644 arch/arm/boot/dts/armada-370-n090201.dts
create mode 100644 arch/arm/boot/dts/armada-370-n090401.dts
create mode 100644 arch/arm/boot/dts/armada-370-n090x01.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 233159d2eaab..0a46613e90d2 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -699,6 +699,8 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
armada-370-db.dtb \
armada-370-dlink-dns327l.dtb \
armada-370-mirabox.dtb \
+ armada-370-n090201.dtb \
+ armada-370-n090401.dtb \
armada-370-netgear-rn102.dtb \
armada-370-netgear-rn104.dtb \
armada-370-rd.dtb \
diff --git a/arch/arm/boot/dts/armada-370-n090201.dts b/arch/arm/boot/dts/armada-370-n090201.dts
new file mode 100644
index 000000000000..b92b1ee067d6
--- /dev/null
+++ b/arch/arm/boot/dts/armada-370-n090201.dts
@@ -0,0 +1,28 @@
+/*
+ * Device Tree file for Seagate NAS 2-Bay (n090201)
+ *
+ * Copyright (C) 2015 Seagate
+ *
+ * Author: Vincent Donnefort <vdonnefort@gmail.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "armada-370-n090x01.dtsi"
+
+/ {
+ model = "Seagate NAS 2-Bay";
+ compatible = "seagate,n090201", "marvell,armada370", "marvell,armada-370-xp";
+
+ gpio-fan {
+ gpio-fan,speed-map =
+ < 0 3
+ 950 2
+ 1400 1
+ 1800 0>;
+ };
+};
diff --git a/arch/arm/boot/dts/armada-370-n090401.dts b/arch/arm/boot/dts/armada-370-n090401.dts
new file mode 100644
index 000000000000..c36f10f0eb04
--- /dev/null
+++ b/arch/arm/boot/dts/armada-370-n090401.dts
@@ -0,0 +1,124 @@
+/*
+ * Device Tree file for Seagate NAS 4-Bay
+ *
+ * Copyright (C) 2015 Seagate
+ *
+ * Author: Vincent Donnefort <vdonnefort@gmail.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+#include "armada-370-n090x01.dtsi"
+#include <dt-bindings/leds/leds-ns2.h>
+
+/ {
+ model = "Seagate NAS 4-Bay";
+ compatible = "seagate,n090401", "marvell,armada370", "marvell,armada-370-xp";
+
+ soc {
+ pcie-controller {
+ /* SATA AHCI controller 88SE9170 */
+ pcie at 1,0 {
+ status = "okay";
+ };
+ };
+
+ internal-regs {
+ mdio {
+ phy1: ethernet-phy at 1 {
+ reg = <1>;
+ };
+ };
+
+ ethernet at 74000 {
+ status = "okay";
+ pinctrl-0 = <&ge1_rgmii_pins>;
+ pinctrl-names = "default";
+ phy = <&phy1>;
+ phy-mode = "rgmii-id";
+ };
+
+ i2c at 11000 {
+ /* I2C GPIO expander (PCA9554A) */
+ pca9554: pca9554 at 21 {
+ compatible = "nxp,pca9554";
+ reg = <0x21>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ };
+ };
+ };
+ };
+
+ regulators {
+ regulator at 3 {
+ compatible = "regulator-fixed";
+ reg = <3>;
+ regulator-name = "SATA2 power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
+ };
+ regulator at 4 {
+ compatible = "regulator-fixed";
+ reg = <4>;
+ regulator-name = "SATA3 power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ gpio-leds {
+ red-sata2 {
+ label = "n090x01:red:sata2";
+ gpios = <&pca9554 0 GPIO_ACTIVE_LOW>;
+ };
+ red-sata3 {
+ label = "n090x01:red:sata3";
+ gpios = <&pca9554 3 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ leds-ns2 {
+ compatible = "lacie,ns2-leds";
+
+ white-sata2 {
+ label = "n090x01:white:sata2";
+ cmd-gpio = <&pca9554 1 GPIO_ACTIVE_HIGH>;
+ slow-gpio = <&pca9554 2 GPIO_ACTIVE_HIGH>;
+ num-modes = <4>;
+ modes-map = <NS_V2_LED_SATA 0 0
+ NS_V2_LED_OFF 0 1
+ NS_V2_LED_ON 1 0
+ NS_V2_LED_ON 1 1>;
+ };
+ white-sata3 {
+ label = "n090x01:white:sata3";
+ cmd-gpio = <&pca9554 4 GPIO_ACTIVE_HIGH>;
+ slow-gpio = <&pca9554 5 GPIO_ACTIVE_HIGH>;
+ num-modes = <4>;
+ modes-map = <NS_V2_LED_SATA 0 0
+ NS_V2_LED_OFF 0 1
+ NS_V2_LED_ON 1 0
+ NS_V2_LED_ON 1 1>;
+ };
+ };
+
+ gpio-fan {
+ gpio-fan,speed-map =
+ < 0 3
+ 800 2
+ 1050 1
+ 1300 0>;
+ };
+};
diff --git a/arch/arm/boot/dts/armada-370-n090x01.dtsi b/arch/arm/boot/dts/armada-370-n090x01.dtsi
new file mode 100644
index 000000000000..6142136f2db5
--- /dev/null
+++ b/arch/arm/boot/dts/armada-370-n090x01.dtsi
@@ -0,0 +1,232 @@
+/*
+ * Device Tree common file for the Seagate NAS 2 and 4-bay
+ * (n090201 and n090401).
+ *
+ * Copyright (C) 2015 Seagate
+ *
+ * Author: Vincent Donnefort <vdonnefort@gmail.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/*
+ * TODO: add support for the white SATA LEDs associated with HDD 0 and 1.
+ */
+
+#include "armada-370.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x20000000>; /* 512 MB */
+ };
+
+ soc {
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+ MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
+
+ pcie-controller {
+ status = "okay";
+
+ /* USB 3.0 bridge ASM1042A */
+ pcie at 2,0 {
+ status = "okay";
+ };
+ };
+
+ internal-regs {
+ serial at 12000 {
+ status = "okay";
+ };
+
+ sata at a0000 {
+ nr-ports = <2>;
+ status = "okay";
+ };
+
+ mdio {
+ pinctrl-0 = <&mdio_pins>;
+ pinctrl-names = "default";
+
+ phy0: ethernet-phy at 0 {
+ reg = <0>;
+ };
+ };
+
+ ethernet at 70000 {
+ status = "okay";
+ pinctrl-0 = <&ge0_rgmii_pins>;
+ pinctrl-names = "default";
+ phy = <&phy0>;
+ phy-mode = "rgmii-id";
+ };
+
+ i2c at 11000 {
+ status = "okay";
+ pinctrl-0 = <&i2c0_pins>;
+ pinctrl-names = "default";
+ clock-frequency = <100000>;
+
+ /* RTC - NXP 8563T (second source) */
+ rtc: rtc at 51 {
+ compatible = "nxp,pcf8563";
+ reg = <0x51>;
+ interrupts = <110>;
+ };
+ /* RTC - MCP7940NT */
+ rtc: rtc at 6f {
+ compatible = "microchip,mcp7941x";
+ reg = <0x6f>;
+ interrupts = <110>;
+ };
+ };
+
+ nand at d0000 {
+ status = "okay";
+ num-cs = <1>;
+ marvell,nand-keep-config;
+ marvell,nand-enable-arbiter;
+ nand-on-flash-bbt;
+ nand-ecc-strength = <4>;
+ nand-ecc-step-size = <512>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0 0x300000>;
+ };
+ partition at 300000 {
+ label = "device-tree";
+ reg = <0x300000 0x20000>;
+ };
+ partition at 320000 {
+ label = "linux";
+ reg = <0x320000 0x2000000>;
+ };
+ partition at 2320000 {
+ label = "rootfs";
+ reg = <0x2320000 0xdce0000>;
+ };
+ };
+ };
+
+ };
+
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ pinctrl-names = "default";
+
+ regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "SATA0 power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
+ };
+ regulator at 2 {
+ compatible = "regulator-fixed";
+ reg = <2>;
+ regulator-name = "SATA1 power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ gpio-fan {
+ compatible = "gpio-fan";
+ gpios = <&gpio2 0 0
+ &gpio2 1 0>;
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ button at 1 {
+ label = "Power button";
+ linux,code = <KEY_POWER>;
+ gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
+ debounce-interval = <100>;
+ };
+ button at 2 {
+ label = "Backup button";
+ linux,code = <KEY_OPTION>;
+ gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
+ debounce-interval = <100>;
+ };
+ button at 3 {
+ label = "Reset Button";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
+ debounce-interval = <100>;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ white-power {
+ label = "n090x01:white:power";
+ gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "timer";
+
+ };
+ red-power {
+ label = "n090x01:red:power";
+ gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
+ };
+ red-sata0 {
+ label = "n090x01:red:sata0";
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+ };
+ red-sata1 {
+ label = "n090x01:red:sata1";
+ gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ gpio_poweroff {
+ compatible = "gpio-poweroff";
+ gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
+ };
+};
+
+&pinctrl {
+ pinctrl-0 = <&hdd0_led_sata_pin>, <&hdd1_led_sata_pin>;
+ pinctrl-names = "default";
+
+ hdd0_led_sata_pin: hdd0-led-sata-pin {
+ marvell,pins = "mpp48";
+ marvell,function = "sata1";
+ };
+ hdd0_led_gpio_pin: hdd0-led-gpio-pin {
+ marvell,pins = "mpp48";
+ marvell,function = "gpio";
+ };
+ hdd1_led_sata_pin: hdd1-led-sata-pin {
+ marvell,pins = "mpp57";
+ marvell,function = "sata0";
+ };
+ hdd1_led_gpio_pin: hdd1-led-gpio-pin {
+ marvell,pins = "mpp57";
+ marvell,function = "gpio";
+ };
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 1/3] ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay
2015-08-29 16:46 ` [PATCH 1/3] ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay Simon Guinot
@ 2015-08-31 12:43 ` Andrew Lunn
2015-08-31 13:13 ` Simon Guinot
0 siblings, 1 reply; 14+ messages in thread
From: Andrew Lunn @ 2015-08-31 12:43 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Aug 29, 2015 at 06:46:43PM +0200, Simon Guinot wrote:
> From: Vincent Donnefort <vdonnefort@gmail.com>
>
> This patch adds DT support for the Seagate NAS 2 and 4-Bay (n090201 and
> n090401).
>
> Chipset list (common):
> - SoC Marvell Armada 370 88F6707, CPU @1.2GHz
> - SDRAM memory: 512MB DDR3 600MHz (16-bits bandwidth)
> - NAND flash 256MB, 8-bits (Micron MT29F2G08AAB or Hinyx H27U2G8F2CTR-BC)
> - 2 SATA II ports (SoC)
> - 1 Ethernet Gigabit ports (PHY Marvell 88E1518)
> - 2 USB3 host ports (PCIe controller ASM1042)
> - GPIO fan (4 speeds)
> - External I2C RTC (MCP7940NT)
> - 3 push buttons (power, backup and reset)
> - 2 SATA LEDs (bi-color, blue and red)
> - 1 power LED (bi-color, blue and red)
>
> Only on 4-Bay models:
> - 2 extra SATA III ports (PCIe AHCI controller Marvell 88SE9170)
> - 1 extra Ethernet Gigabit ports (PHY Marvell 88E1518)
> - I2C GPIO expander (PCA9554A)
> - 2 extra SATA LEDs (bi-color, blue and red)
>
> Note that support for the white SATA LEDs associated with HDDs 0 and 1
> is missing. A dedicated LED driver is needed.
>
> Signed-off-by: Vincent Donnefort <vdonnefort@gmail.com>
> ---
> arch/arm/boot/dts/Makefile | 2 +
> arch/arm/boot/dts/armada-370-n090201.dts | 28 ++++
> arch/arm/boot/dts/armada-370-n090401.dts | 124 ++++++++++++++++
> arch/arm/boot/dts/armada-370-n090x01.dtsi | 232 ++++++++++++++++++++++++++++++
> 4 files changed, 386 insertions(+)
> create mode 100644 arch/arm/boot/dts/armada-370-n090201.dts
> create mode 100644 arch/arm/boot/dts/armada-370-n090401.dts
> create mode 100644 arch/arm/boot/dts/armada-370-n090x01.dtsi
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 233159d2eaab..0a46613e90d2 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -699,6 +699,8 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
> armada-370-db.dtb \
> armada-370-dlink-dns327l.dtb \
> armada-370-mirabox.dtb \
> + armada-370-n090201.dtb \
> + armada-370-n090401.dtb \
> armada-370-netgear-rn102.dtb \
> armada-370-netgear-rn104.dtb \
> armada-370-rd.dtb \
> diff --git a/arch/arm/boot/dts/armada-370-n090201.dts b/arch/arm/boot/dts/armada-370-n090201.dts
> new file mode 100644
> index 000000000000..b92b1ee067d6
> --- /dev/null
> +++ b/arch/arm/boot/dts/armada-370-n090201.dts
> @@ -0,0 +1,28 @@
> +/*
> + * Device Tree file for Seagate NAS 2-Bay (n090201)
> + *
> + * Copyright (C) 2015 Seagate
> + *
> + * Author: Vincent Donnefort <vdonnefort@gmail.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2. This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
> +
> +/dts-v1/;
> +
> +#include "armada-370-n090x01.dtsi"
> +
> +/ {
> + model = "Seagate NAS 2-Bay";
On a similar line to Jason's comment. I'm sure Seagate has/is going to
have more than this 2-bay NAS. Can we have a more descriptive model
string here?
I could imagine an installer which looks through the list of available
DT blobs and creates a list showing the model and compatible string,
and asks the user, which should it use.
Andrew
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/3] ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay
2015-08-31 12:43 ` Andrew Lunn
@ 2015-08-31 13:13 ` Simon Guinot
2015-08-31 13:16 ` Andrew Lunn
0 siblings, 1 reply; 14+ messages in thread
From: Simon Guinot @ 2015-08-31 13:13 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 31, 2015 at 02:43:14PM +0200, Andrew Lunn wrote:
> On Sat, Aug 29, 2015 at 06:46:43PM +0200, Simon Guinot wrote:
> > From: Vincent Donnefort <vdonnefort@gmail.com>
> >
> > This patch adds DT support for the Seagate NAS 2 and 4-Bay (n090201 and
> > n090401).
> >
> > Chipset list (common):
> > - SoC Marvell Armada 370 88F6707, CPU @1.2GHz
> > - SDRAM memory: 512MB DDR3 600MHz (16-bits bandwidth)
> > - NAND flash 256MB, 8-bits (Micron MT29F2G08AAB or Hinyx H27U2G8F2CTR-BC)
> > - 2 SATA II ports (SoC)
> > - 1 Ethernet Gigabit ports (PHY Marvell 88E1518)
> > - 2 USB3 host ports (PCIe controller ASM1042)
> > - GPIO fan (4 speeds)
> > - External I2C RTC (MCP7940NT)
> > - 3 push buttons (power, backup and reset)
> > - 2 SATA LEDs (bi-color, blue and red)
> > - 1 power LED (bi-color, blue and red)
> >
> > Only on 4-Bay models:
> > - 2 extra SATA III ports (PCIe AHCI controller Marvell 88SE9170)
> > - 1 extra Ethernet Gigabit ports (PHY Marvell 88E1518)
> > - I2C GPIO expander (PCA9554A)
> > - 2 extra SATA LEDs (bi-color, blue and red)
> >
> > Note that support for the white SATA LEDs associated with HDDs 0 and 1
> > is missing. A dedicated LED driver is needed.
> >
> > Signed-off-by: Vincent Donnefort <vdonnefort@gmail.com>
> > ---
> > arch/arm/boot/dts/Makefile | 2 +
> > arch/arm/boot/dts/armada-370-n090201.dts | 28 ++++
> > arch/arm/boot/dts/armada-370-n090401.dts | 124 ++++++++++++++++
> > arch/arm/boot/dts/armada-370-n090x01.dtsi | 232 ++++++++++++++++++++++++++++++
> > 4 files changed, 386 insertions(+)
> > create mode 100644 arch/arm/boot/dts/armada-370-n090201.dts
> > create mode 100644 arch/arm/boot/dts/armada-370-n090401.dts
> > create mode 100644 arch/arm/boot/dts/armada-370-n090x01.dtsi
> >
> > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > index 233159d2eaab..0a46613e90d2 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -699,6 +699,8 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
> > armada-370-db.dtb \
> > armada-370-dlink-dns327l.dtb \
> > armada-370-mirabox.dtb \
> > + armada-370-n090201.dtb \
> > + armada-370-n090401.dtb \
> > armada-370-netgear-rn102.dtb \
> > armada-370-netgear-rn104.dtb \
> > armada-370-rd.dtb \
> > diff --git a/arch/arm/boot/dts/armada-370-n090201.dts b/arch/arm/boot/dts/armada-370-n090201.dts
> > new file mode 100644
> > index 000000000000..b92b1ee067d6
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/armada-370-n090201.dts
> > @@ -0,0 +1,28 @@
> > +/*
> > + * Device Tree file for Seagate NAS 2-Bay (n090201)
> > + *
> > + * Copyright (C) 2015 Seagate
> > + *
> > + * Author: Vincent Donnefort <vdonnefort@gmail.com>
> > + *
> > + * This file is licensed under the terms of the GNU General Public
> > + * License version 2. This program is licensed "as is" without any
> > + * warranty of any kind, whether express or implied.
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include "armada-370-n090x01.dtsi"
> > +
> > +/ {
> > + model = "Seagate NAS 2-Bay";
Hi Andrew,
>
> On a similar line to Jason's comment. I'm sure Seagate has/is going to
> have more than this 2-bay NAS. Can we have a more descriptive model
> string here?
It may sound crazy but I have nothing more than the hardware and product
names which are respectively "n090201" and "Seagate NAS 2-Bay" for this
board.
Maybe I could mix them both in the model string:
"Seagate NAS 2-Bay (n090201)" ?
>
> I could imagine an installer which looks through the list of available
> DT blobs and creates a list showing the model and compatible string,
> and asks the user, which should it use.
I can too.
Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150831/81d47cba/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/3] ARM: mvebu: add DT support for Seagate Personal Cloud
2015-08-29 16:46 [PATCH 0/3] Add support for the Armada-370-based Seagate NAS Simon Guinot
2015-08-29 16:46 ` [PATCH 1/3] ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay Simon Guinot
@ 2015-08-29 16:46 ` Simon Guinot
2015-08-31 12:59 ` Jason Cooper
2015-08-29 16:46 ` [PATCH 3/3] ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig Simon Guinot
2015-08-31 12:39 ` [PATCH 0/3] Add support for the Armada-370-based Seagate NAS Jason Cooper
3 siblings, 1 reply; 14+ messages in thread
From: Simon Guinot @ 2015-08-29 16:46 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds DT support for the Seagate Personal Cloud 1 and 2-Bay
(n090103 and n090203).
Chipset list:
- SoC Marvell Armada 370 88F6707, CPU @1GHz
- SDRAM memory: 512MB DDR3 667MHz (16-bits bandwidth)
- SPI flash 1MB (Macronix MX25L8006E)
- 1 or 2 SATA internal ports
- 1 Ethernet Gigabit port (PHY Marvell 88E1518)
- 1 USB3 host port (PCIe controller ASM1042)
- 1 USB2 host port (SoC)
- 2 push buttons (power and reset)
- 1 SATA LED (bi-color, white and red)
Note that support for the white SATA LED is missing. A dedicated LED
driver is needed.
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/armada-370-n090103.dts | 28 +++++
arch/arm/boot/dts/armada-370-n090203.dts | 42 ++++++++
arch/arm/boot/dts/armada-370-n090x03.dtsi | 174 ++++++++++++++++++++++++++++++
4 files changed, 246 insertions(+)
create mode 100644 arch/arm/boot/dts/armada-370-n090103.dts
create mode 100644 arch/arm/boot/dts/armada-370-n090203.dts
create mode 100644 arch/arm/boot/dts/armada-370-n090x03.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 0a46613e90d2..2b30300db972 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -699,7 +699,9 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
armada-370-db.dtb \
armada-370-dlink-dns327l.dtb \
armada-370-mirabox.dtb \
+ armada-370-n090103.dtb \
armada-370-n090201.dtb \
+ armada-370-n090203.dtb \
armada-370-n090401.dtb \
armada-370-netgear-rn102.dtb \
armada-370-netgear-rn104.dtb \
diff --git a/arch/arm/boot/dts/armada-370-n090103.dts b/arch/arm/boot/dts/armada-370-n090103.dts
new file mode 100644
index 000000000000..c94bed449050
--- /dev/null
+++ b/arch/arm/boot/dts/armada-370-n090103.dts
@@ -0,0 +1,28 @@
+/*
+ * Device Tree file for Seagate Personal Cloud NAS (n090103).
+ *
+ * Copyright (C) 2015 Seagate
+ *
+ * Author: Simon Guinot <simon.guinot@sequanux.org>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+#include "armada-370-n090x03.dtsi"
+
+/ {
+ model = "Seagate Personal Cloud";
+ compatible = "seagate,n090103", "marvell,armada370", "marvell,armada-370-xp";
+
+ soc {
+ internal-regs {
+ sata at a0000 {
+ status = "okay";
+ nr-ports = <1>;
+ };
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/armada-370-n090203.dts b/arch/arm/boot/dts/armada-370-n090203.dts
new file mode 100644
index 000000000000..3bc62b9f0b0c
--- /dev/null
+++ b/arch/arm/boot/dts/armada-370-n090203.dts
@@ -0,0 +1,42 @@
+/*
+ * Device Tree file for Seagate Personnal Cloud 2-Bay NAS (n090203).
+ *
+ * Copyright (C) 2015 Seagate
+ *
+ * Author: Simon Guinot <simon.guinot@sequanux.org>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+#include "armada-370-n090x03.dtsi"
+
+/ {
+ model = "Seagate Personnal Cloud 2-Bay";
+ compatible = "seagate,n090203", "marvell,armada370", "marvell,armada-370-xp";
+
+ soc {
+ internal-regs {
+ sata at a0000 {
+ status = "okay";
+ nr-ports = <2>;
+ };
+ };
+ };
+
+ regulators {
+ regulator at 2 {
+ compatible = "regulator-fixed";
+ reg = <2>;
+ regulator-name = "SATA1 power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/armada-370-n090x03.dtsi b/arch/arm/boot/dts/armada-370-n090x03.dtsi
new file mode 100644
index 000000000000..1bd67869ba78
--- /dev/null
+++ b/arch/arm/boot/dts/armada-370-n090x03.dtsi
@@ -0,0 +1,174 @@
+/*
+ * Device Tree common file for the Seagate Personal Cloud 1 and 2-Bay
+ * (n090103 and n090203).
+ *
+ * Copyright (C) 2015 Seagate
+ *
+ * Author: Simon Guinot <simon.guinot@sequanux.org>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/*
+ * TODO: add support for the white SATA LED.
+ */
+
+#include "armada-370.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x20000000>; /* 512 MB */
+ };
+
+ soc {
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+ MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
+
+ pcie-controller {
+ status = "okay";
+
+ /* USB 3.0 Bridge ASM1042A */
+ pcie at 1,0 {
+ status = "okay";
+ };
+ };
+
+ internal-regs {
+ serial at 12000 {
+ status = "okay";
+ };
+
+ mdio {
+ pinctrl-0 = <&mdio_pins>;
+ pinctrl-names = "default";
+
+ phy0: ethernet-phy at 0 {
+ reg = <0>;
+ };
+ };
+
+ ethernet at 74000 {
+ status = "okay";
+ pinctrl-0 = <&ge1_rgmii_pins>;
+ pinctrl-names = "default";
+ phy = <&phy0>;
+ phy-mode = "rgmii-id";
+ };
+
+ spi at 10600 {
+ status = "okay";
+ pinctrl-0 = <&spi0_pins2>;
+ pinctrl-names = "default";
+
+ spi-flash at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ /* MX25L8006E */
+ compatible = "mxicy,mx25l8005", "jedec,spi-nor";
+ reg = <0>; /* Chip select 0 */
+ spi-max-frequency = <50000000>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0 0x100000>;
+ };
+ };
+ };
+
+ usb at 50000 {
+ status = "okay";
+ };
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ regulator at 0 {
+ compatible = "regulator-fixed";
+ reg = <0>;
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
+ };
+ regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "SATA0 power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ button at 1 {
+ label = "Power button";
+ linux,code = <KEY_POWER>;
+ gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
+ debounce-interval = <100>;
+ };
+ button at 2 {
+ label = "Reset Button";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
+ debounce-interval = <100>;
+ };
+ button at 3 {
+ label = "USB VBUS error";
+ linux,code = <KEY_UNKNOWN>;
+ gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
+ debounce-interval = <100>;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ red-sata0 {
+ label = "n090x03:red:sata0";
+ gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+ };
+
+ gpio_poweroff {
+ compatible = "gpio-poweroff";
+ gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
+ };
+};
+
+&pinctrl {
+ pinctrl-0 = <&sata_led_pin>;
+ pinctrl-names = "default";
+
+ sata_led_pin: sata-led-pin {
+ marvell,pins = "mpp60";
+ marvell,function = "sata0";
+ };
+ gpio_led_pin: gpio-led-pin {
+ marvell,pins = "mpp60";
+ marvell,function = "gpio";
+ };
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 2/3] ARM: mvebu: add DT support for Seagate Personal Cloud
2015-08-29 16:46 ` [PATCH 2/3] ARM: mvebu: add DT support for Seagate Personal Cloud Simon Guinot
@ 2015-08-31 12:59 ` Jason Cooper
2015-08-31 14:28 ` Simon Guinot
0 siblings, 1 reply; 14+ messages in thread
From: Jason Cooper @ 2015-08-31 12:59 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Aug 29, 2015 at 06:46:44PM +0200, Simon Guinot wrote:
> This patch adds DT support for the Seagate Personal Cloud 1 and 2-Bay
> (n090103 and n090203).
>
> Chipset list:
> - SoC Marvell Armada 370 88F6707, CPU @1GHz
> - SDRAM memory: 512MB DDR3 667MHz (16-bits bandwidth)
> - SPI flash 1MB (Macronix MX25L8006E)
> - 1 or 2 SATA internal ports
> - 1 Ethernet Gigabit port (PHY Marvell 88E1518)
> - 1 USB3 host port (PCIe controller ASM1042)
> - 1 USB2 host port (SoC)
> - 2 push buttons (power and reset)
> - 1 SATA LED (bi-color, white and red)
Do you have long term URLs for these products? It would be nice to add
those. The best I could find is:
http://www.seagate.com/www-content/product-content/personal-cloud/en-us/doc/personal-cloud-ds1838-1-1501us.pdf
But none of the model numbers match what you've used in this patch
series. I imagine this will make it harder for newcomers to find the
relevant code.
> Note that support for the white SATA LED is missing. A dedicated LED
> driver is needed.
>
> Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
> ---
> arch/arm/boot/dts/Makefile | 2 +
> arch/arm/boot/dts/armada-370-n090103.dts | 28 +++++
> arch/arm/boot/dts/armada-370-n090203.dts | 42 ++++++++
> arch/arm/boot/dts/armada-370-n090x03.dtsi | 174 ++++++++++++++++++++++++++++++
> 4 files changed, 246 insertions(+)
> create mode 100644 arch/arm/boot/dts/armada-370-n090103.dts
> create mode 100644 arch/arm/boot/dts/armada-370-n090203.dts
> create mode 100644 arch/arm/boot/dts/armada-370-n090x03.dtsi
>
...
> diff --git a/arch/arm/boot/dts/armada-370-n090103.dts b/arch/arm/boot/dts/armada-370-n090103.dts
> new file mode 100644
> index 000000000000..c94bed449050
> --- /dev/null
> +++ b/arch/arm/boot/dts/armada-370-n090103.dts
> @@ -0,0 +1,28 @@
> +/*
> + * Device Tree file for Seagate Personal Cloud NAS (n090103).
> + *
> + * Copyright (C) 2015 Seagate
> + *
> + * Author: Simon Guinot <simon.guinot@sequanux.org>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2. This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
Based on previous discussions, I'm pretty sure I know what the answer
is, but I have to at least ask in case it was accidental. All other
armada-* files are dual licensed, GPLv2/X11. Was it intentional to
license these as GPLv2 only?
> +
> +/dts-v1/;
> +#include "armada-370-n090x03.dtsi"
> +
> +/ {
> + model = "Seagate Personal Cloud";
> + compatible = "seagate,n090103", "marvell,armada370", "marvell,armada-370-xp";
In line with my previous comment, can we add a compatible string here?
compatible = "seagate,n090103", "seagate,personalcloud", "marvell,armada370", "marvell,armada-370-xp";
> diff --git a/arch/arm/boot/dts/armada-370-n090203.dts b/arch/arm/boot/dts/armada-370-n090203.dts
> new file mode 100644
> index 000000000000..3bc62b9f0b0c
> --- /dev/null
> +++ b/arch/arm/boot/dts/armada-370-n090203.dts
> @@ -0,0 +1,42 @@
> +/*
> + * Device Tree file for Seagate Personnal Cloud 2-Bay NAS (n090203).
> + *
> + * Copyright (C) 2015 Seagate
> + *
> + * Author: Simon Guinot <simon.guinot@sequanux.org>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2. This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
> +
> +/dts-v1/;
> +#include "armada-370-n090x03.dtsi"
> +
> +/ {
> + model = "Seagate Personnal Cloud 2-Bay";
> + compatible = "seagate,n090203", "marvell,armada370", "marvell,armada-370-xp";
And then here:
compatible = "seagate,n090103", "seagate,personalcloud2", "marvell,armada370", "marvell,armada-370-xp";
or similar.
The same comments apply to the NAS versions as well.
thx,
Jason.
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 2/3] ARM: mvebu: add DT support for Seagate Personal Cloud
2015-08-31 12:59 ` Jason Cooper
@ 2015-08-31 14:28 ` Simon Guinot
2015-08-31 14:36 ` Andrew Lunn
0 siblings, 1 reply; 14+ messages in thread
From: Simon Guinot @ 2015-08-31 14:28 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 31, 2015 at 12:59:26PM +0000, Jason Cooper wrote:
> On Sat, Aug 29, 2015 at 06:46:44PM +0200, Simon Guinot wrote:
> > This patch adds DT support for the Seagate Personal Cloud 1 and 2-Bay
> > (n090103 and n090203).
> >
> > Chipset list:
> > - SoC Marvell Armada 370 88F6707, CPU @1GHz
> > - SDRAM memory: 512MB DDR3 667MHz (16-bits bandwidth)
> > - SPI flash 1MB (Macronix MX25L8006E)
> > - 1 or 2 SATA internal ports
> > - 1 Ethernet Gigabit port (PHY Marvell 88E1518)
> > - 1 USB3 host port (PCIe controller ASM1042)
> > - 1 USB2 host port (SoC)
> > - 2 push buttons (power and reset)
> > - 1 SATA LED (bi-color, white and red)
>
> Do you have long term URLs for these products? It would be nice to add
> those. The best I could find is:
>
> http://www.seagate.com/www-content/product-content/personal-cloud/en-us/doc/personal-cloud-ds1838-1-1501us.pdf
Definitively, it is not a long term URL. There is none available.
For the customer products such as the Personal Cloud, I don't think
that the hardware specifications are available. For the professional
products, it is a little bit better.
>
> But none of the model numbers match what you've used in this patch
> series. I imagine this will make it harder for newcomers to find the
> relevant code.
Indeed, the model number can be used to identify the product and the
hardware board. But unfortunately, I don't know how to read it. There is
a lot of informations encoded inside this number and the specifications
are not fully available to me. That's why I don't think it is a good
idea to use it.
And indeed again, the hardware name I am using can't be found easily by
a user. It is not written on the PCB nor on the casing. But the hardware
name is used by the stock U-Boot image to build an environment variable:
target.dtb. This variable holds the name of the DTB file to load
(armada-370-n090103.dtb for example) from hard disk during the boot
process. I was hoping I could keep Linux mainline naming compatible with
the stock U-Boot.
Simon
>
> > Note that support for the white SATA LED is missing. A dedicated LED
> > driver is needed.
> >
> > Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
> > ---
> > arch/arm/boot/dts/Makefile | 2 +
> > arch/arm/boot/dts/armada-370-n090103.dts | 28 +++++
> > arch/arm/boot/dts/armada-370-n090203.dts | 42 ++++++++
> > arch/arm/boot/dts/armada-370-n090x03.dtsi | 174 ++++++++++++++++++++++++++++++
> > 4 files changed, 246 insertions(+)
> > create mode 100644 arch/arm/boot/dts/armada-370-n090103.dts
> > create mode 100644 arch/arm/boot/dts/armada-370-n090203.dts
> > create mode 100644 arch/arm/boot/dts/armada-370-n090x03.dtsi
> >
>
> ...
>
> > diff --git a/arch/arm/boot/dts/armada-370-n090103.dts b/arch/arm/boot/dts/armada-370-n090103.dts
> > new file mode 100644
> > index 000000000000..c94bed449050
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/armada-370-n090103.dts
> > @@ -0,0 +1,28 @@
> > +/*
> > + * Device Tree file for Seagate Personal Cloud NAS (n090103).
> > + *
> > + * Copyright (C) 2015 Seagate
> > + *
> > + * Author: Simon Guinot <simon.guinot@sequanux.org>
> > + *
> > + * This file is licensed under the terms of the GNU General Public
> > + * License version 2. This program is licensed "as is" without any
> > + * warranty of any kind, whether express or implied.
> > + */
>
> Based on previous discussions, I'm pretty sure I know what the answer
> is, but I have to at least ask in case it was accidental. All other
> armada-* files are dual licensed, GPLv2/X11. Was it intentional to
> license these as GPLv2 only?
>
> > +
> > +/dts-v1/;
> > +#include "armada-370-n090x03.dtsi"
> > +
> > +/ {
> > + model = "Seagate Personal Cloud";
> > + compatible = "seagate,n090103", "marvell,armada370", "marvell,armada-370-xp";
>
> In line with my previous comment, can we add a compatible string here?
>
> compatible = "seagate,n090103", "seagate,personalcloud", "marvell,armada370", "marvell,armada-370-xp";
>
> > diff --git a/arch/arm/boot/dts/armada-370-n090203.dts b/arch/arm/boot/dts/armada-370-n090203.dts
> > new file mode 100644
> > index 000000000000..3bc62b9f0b0c
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/armada-370-n090203.dts
> > @@ -0,0 +1,42 @@
> > +/*
> > + * Device Tree file for Seagate Personnal Cloud 2-Bay NAS (n090203).
> > + *
> > + * Copyright (C) 2015 Seagate
> > + *
> > + * Author: Simon Guinot <simon.guinot@sequanux.org>
> > + *
> > + * This file is licensed under the terms of the GNU General Public
> > + * License version 2. This program is licensed "as is" without any
> > + * warranty of any kind, whether express or implied.
> > + */
> > +
> > +/dts-v1/;
> > +#include "armada-370-n090x03.dtsi"
> > +
> > +/ {
> > + model = "Seagate Personnal Cloud 2-Bay";
> > + compatible = "seagate,n090203", "marvell,armada370", "marvell,armada-370-xp";
>
> And then here:
>
> compatible = "seagate,n090103", "seagate,personalcloud2", "marvell,armada370", "marvell,armada-370-xp";
>
> or similar.
>
> The same comments apply to the NAS versions as well.
>
> thx,
>
> Jason.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150831/eec6621c/attachment-0001.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 2/3] ARM: mvebu: add DT support for Seagate Personal Cloud
2015-08-31 14:28 ` Simon Guinot
@ 2015-08-31 14:36 ` Andrew Lunn
0 siblings, 0 replies; 14+ messages in thread
From: Andrew Lunn @ 2015-08-31 14:36 UTC (permalink / raw)
To: linux-arm-kernel
> But the hardware name is used by the stock U-Boot image to build an
> environment variable: target.dtb. This variable holds the name of
> the DTB file to load (armada-370-n090103.dtb for example) from hard
> disk during the boot process. I was hoping I could keep Linux
> mainline naming compatible with the stock U-Boot.
Hi Simon
Could you make the suggestion towards the product managers that future
new products include seagate in the filename? That will greatly
increase the chance of keeping naming compatibility.
Andrew
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/3] ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig
2015-08-29 16:46 [PATCH 0/3] Add support for the Armada-370-based Seagate NAS Simon Guinot
2015-08-29 16:46 ` [PATCH 1/3] ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay Simon Guinot
2015-08-29 16:46 ` [PATCH 2/3] ARM: mvebu: add DT support for Seagate Personal Cloud Simon Guinot
@ 2015-08-29 16:46 ` Simon Guinot
2015-08-31 12:39 ` [PATCH 0/3] Add support for the Armada-370-based Seagate NAS Jason Cooper
3 siblings, 0 replies; 14+ messages in thread
From: Simon Guinot @ 2015-08-29 16:46 UTC (permalink / raw)
To: linux-arm-kernel
This patch enables the following options needed by the Seagate
Personal Cloud 1 and 2-Bay and the Seagate NAS 2 and 4-Bay:
SATA_AHCI
POWER_RESET_GPIO
RTC_DRV_DS1307
RTC_DRV_PCF8563
Additionnally this patch also enables NEW_LEDS which was missing for
some reasons.
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
---
arch/arm/configs/mvebu_v7_defconfig | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index 13fcd020e375..c6729bf0a8dd 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -61,6 +61,7 @@ CONFIG_MTD_SPI_NOR=y
CONFIG_EEPROM_AT24=y
CONFIG_BLK_DEV_SD=y
CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
CONFIG_AHCI_MVEBU=y
CONFIG_SATA_MV=y
CONFIG_NETDEVICES=y
@@ -85,6 +86,9 @@ CONFIG_SPI=y
CONFIG_SPI_ORION=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_PCA953X=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
CONFIG_SENSORS_GPIO_FAN=y
CONFIG_THERMAL=y
CONFIG_ARMADA_THERMAL=y
@@ -111,12 +115,15 @@ CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_DOVE=y
CONFIG_MMC_SDHCI_PXAV3=y
CONFIG_MMC_MVSDIO=y
-CONFIG_LEDS_GPIO=y
+CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_PCF8563=y
CONFIG_RTC_DRV_S35390A=y
CONFIG_RTC_DRV_MV=y
CONFIG_RTC_DRV_ARMADA38X=y
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 0/3] Add support for the Armada-370-based Seagate NAS
2015-08-29 16:46 [PATCH 0/3] Add support for the Armada-370-based Seagate NAS Simon Guinot
` (2 preceding siblings ...)
2015-08-29 16:46 ` [PATCH 3/3] ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig Simon Guinot
@ 2015-08-31 12:39 ` Jason Cooper
2015-08-31 13:02 ` Simon Guinot
3 siblings, 1 reply; 14+ messages in thread
From: Jason Cooper @ 2015-08-31 12:39 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Aug 29, 2015 at 06:46:42PM +0200, Simon Guinot wrote:
> Hi,
>
> This patch series adds support for the Seagate machines based on the
> Armada-370 Marvell SoC. This includes the Personal Cloud 1 and 2-Bay
> and the Seagate NAS 2 and 4-Bay.
>
> Thanks,
>
> Simon
>
> Simon Guinot (2):
> ARM: mvebu: add DT support for Seagate Personal Cloud
> ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig
>
> Vincent Donnefort (1):
> ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay
>
> arch/arm/boot/dts/Makefile | 4 +
> arch/arm/boot/dts/armada-370-n090103.dts | 28 ++++
> arch/arm/boot/dts/armada-370-n090201.dts | 28 ++++
> arch/arm/boot/dts/armada-370-n090203.dts | 42 ++++++
> arch/arm/boot/dts/armada-370-n090401.dts | 124 ++++++++++++++++
> arch/arm/boot/dts/armada-370-n090x01.dtsi | 232 ++++++++++++++++++++++++++++++
> arch/arm/boot/dts/armada-370-n090x03.dtsi | 174 ++++++++++++++++++++++
> arch/arm/configs/mvebu_v7_defconfig | 9 +-
> 8 files changed, 640 insertions(+), 1 deletion(-)
> create mode 100644 arch/arm/boot/dts/armada-370-n090103.dts
> create mode 100644 arch/arm/boot/dts/armada-370-n090201.dts
> create mode 100644 arch/arm/boot/dts/armada-370-n090203.dts
> create mode 100644 arch/arm/boot/dts/armada-370-n090401.dts
> create mode 100644 arch/arm/boot/dts/armada-370-n090x01.dtsi
> create mode 100644 arch/arm/boot/dts/armada-370-n090x03.dtsi
Could you please name these something more informative? e.g.
armada-370-seagate-personal-cloud-{1,2}.dts, etc?
thx,
Jason.
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 0/3] Add support for the Armada-370-based Seagate NAS
2015-08-31 12:39 ` [PATCH 0/3] Add support for the Armada-370-based Seagate NAS Jason Cooper
@ 2015-08-31 13:02 ` Simon Guinot
2015-08-31 13:03 ` Jason Cooper
0 siblings, 1 reply; 14+ messages in thread
From: Simon Guinot @ 2015-08-31 13:02 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 31, 2015 at 12:39:44PM +0000, Jason Cooper wrote:
> On Sat, Aug 29, 2015 at 06:46:42PM +0200, Simon Guinot wrote:
> > Hi,
> >
> > This patch series adds support for the Seagate machines based on the
> > Armada-370 Marvell SoC. This includes the Personal Cloud 1 and 2-Bay
> > and the Seagate NAS 2 and 4-Bay.
> >
> > Thanks,
> >
> > Simon
> >
> > Simon Guinot (2):
> > ARM: mvebu: add DT support for Seagate Personal Cloud
> > ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig
> >
> > Vincent Donnefort (1):
> > ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay
> >
> > arch/arm/boot/dts/Makefile | 4 +
> > arch/arm/boot/dts/armada-370-n090103.dts | 28 ++++
> > arch/arm/boot/dts/armada-370-n090201.dts | 28 ++++
> > arch/arm/boot/dts/armada-370-n090203.dts | 42 ++++++
> > arch/arm/boot/dts/armada-370-n090401.dts | 124 ++++++++++++++++
> > arch/arm/boot/dts/armada-370-n090x01.dtsi | 232 ++++++++++++++++++++++++++++++
> > arch/arm/boot/dts/armada-370-n090x03.dtsi | 174 ++++++++++++++++++++++
> > arch/arm/configs/mvebu_v7_defconfig | 9 +-
> > 8 files changed, 640 insertions(+), 1 deletion(-)
> > create mode 100644 arch/arm/boot/dts/armada-370-n090103.dts
> > create mode 100644 arch/arm/boot/dts/armada-370-n090201.dts
> > create mode 100644 arch/arm/boot/dts/armada-370-n090203.dts
> > create mode 100644 arch/arm/boot/dts/armada-370-n090401.dts
> > create mode 100644 arch/arm/boot/dts/armada-370-n090x01.dtsi
> > create mode 100644 arch/arm/boot/dts/armada-370-n090x03.dtsi
Hi Jason,
>
> Could you please name these something more informative? e.g.
> armada-370-seagate-personal-cloud-{1,2}.dts, etc?
Sure I can. But note that n090103 is an hardware name while Seagate
Personal Cloud is a product name. The former is unique while the latter
is not. For example, it is possible that we will see in a near future an
hardware update for the Personal Cloud.
But if you still feel it is the right way to go, I'll be glad to do the
changes.
Thanks,
Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150831/888a4915/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 0/3] Add support for the Armada-370-based Seagate NAS
2015-08-31 13:02 ` Simon Guinot
@ 2015-08-31 13:03 ` Jason Cooper
0 siblings, 0 replies; 14+ messages in thread
From: Jason Cooper @ 2015-08-31 13:03 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 31, 2015 at 03:02:36PM +0200, Simon Guinot wrote:
> On Mon, Aug 31, 2015 at 12:39:44PM +0000, Jason Cooper wrote:
> > On Sat, Aug 29, 2015 at 06:46:42PM +0200, Simon Guinot wrote:
> > > Hi,
> > >
> > > This patch series adds support for the Seagate machines based on the
> > > Armada-370 Marvell SoC. This includes the Personal Cloud 1 and 2-Bay
> > > and the Seagate NAS 2 and 4-Bay.
> > >
> > > Thanks,
> > >
> > > Simon
> > >
> > > Simon Guinot (2):
> > > ARM: mvebu: add DT support for Seagate Personal Cloud
> > > ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig
> > >
> > > Vincent Donnefort (1):
> > > ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay
> > >
> > > arch/arm/boot/dts/Makefile | 4 +
> > > arch/arm/boot/dts/armada-370-n090103.dts | 28 ++++
> > > arch/arm/boot/dts/armada-370-n090201.dts | 28 ++++
> > > arch/arm/boot/dts/armada-370-n090203.dts | 42 ++++++
> > > arch/arm/boot/dts/armada-370-n090401.dts | 124 ++++++++++++++++
> > > arch/arm/boot/dts/armada-370-n090x01.dtsi | 232 ++++++++++++++++++++++++++++++
> > > arch/arm/boot/dts/armada-370-n090x03.dtsi | 174 ++++++++++++++++++++++
> > > arch/arm/configs/mvebu_v7_defconfig | 9 +-
> > > 8 files changed, 640 insertions(+), 1 deletion(-)
> > > create mode 100644 arch/arm/boot/dts/armada-370-n090103.dts
> > > create mode 100644 arch/arm/boot/dts/armada-370-n090201.dts
> > > create mode 100644 arch/arm/boot/dts/armada-370-n090203.dts
> > > create mode 100644 arch/arm/boot/dts/armada-370-n090401.dts
> > > create mode 100644 arch/arm/boot/dts/armada-370-n090x01.dtsi
> > > create mode 100644 arch/arm/boot/dts/armada-370-n090x03.dtsi
>
> Hi Jason,
>
> >
> > Could you please name these something more informative? e.g.
> > armada-370-seagate-personal-cloud-{1,2}.dts, etc?
>
> Sure I can. But note that n090103 is an hardware name while Seagate
> Personal Cloud is a product name. The former is unique while the latter
> is not. For example, it is possible that we will see in a near future an
> hardware update for the Personal Cloud.
Understood, but I'd also like to make it a bit easier for hackers not
intimately familiar with the tree/products to find the file they are
interested in.
I've no problem with 'armada-370-seagate-personalcloud-n090103.dts'
either.
thx,
Jason.
^ permalink raw reply [flat|nested] 14+ messages in thread