Skip to contentSkip to conversation

Add support for the Armada-370-based Seagate NAS

PATCH Superseded Simon Guinot 2 participants 6 messages Sep 11, 2015 – Sep 22, 2015

Subsystems (4)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover Add support for the Armada-370-based Seagate NAS

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.

Changes for v2:
- Rename DTS files using the products names.
- Update model and compatible properties as well.
- Add some informations allowing to identify the devices in the commit message and in the DTS files headers.
- Remove duplicated rtc alias in armada-370-seagate-nas-xbay.dtsi.

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-seagate-nas-2bay.dts  |  36 ++++
 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts  | 133 ++++++++++++
 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 231 +++++++++++++++++++++
 .../armada-370-seagate-personnal-cloud-2bay.dts    |  51 +++++
 .../dts/armada-370-seagate-personnal-cloud.dts     |  37 ++++
 .../dts/armada-370-seagate-personnal-cloud.dtsi    | 174 ++++++++++++++++
 arch/arm/configs/mvebu_v7_defconfig                |   9 +-
 8 files changed, 674 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personnal-cloud-2bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personnal-cloud.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personnal-cloud.dtsi
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/3 ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay

From: Vincent Donnefort <[email protected]>

This patch adds DT support for the Seagate NAS 2 and 4-Bay.

Here are some informations allowing to identify these devices:

Product name                 | Seagate NAS 2-Bay | Seagate NAS 4-Bay
Code name (board/PCB)        | Dart 2-Bay        | Dart 4-Bay
Model name (case sticker)    | SRPD20            | SRPD40
Material desc (product spec) | STCTxxxxxxx       | STCUxxxxxxx

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.

---
 arch/arm/boot/dts/Makefile                         |   2 +
 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts  |  36 ++++
 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts  | 133 ++++++++++++
 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 231 +++++++++++++++++++++
 4 files changed, 402 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi

Changes for v2:
- Rename DTS files using the products names.
- Update model and compatible properties as well.
- Add some informations allowing to identify the devices in the commit message and in the DTS files headers.
- Remove duplicated rtc alias in armada-370-seagate-nas-xbay.dtsi.

arch/arm/boot/dts/Makefile +2 -0
index 233159d2eaab..4f89c35239c0 100644
@@ -702,6 +702,8 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
 	armada-370-netgear-rn102.dtb \
 	armada-370-netgear-rn104.dtb \
 	armada-370-rd.dtb \
+	armada-370-seagate-nas-2bay.dtb \
+	armada-370-seagate-nas-4bay.dtb \
 	armada-370-synology-ds213j.dtb
 dtb-$(CONFIG_MACH_ARMADA_375) += \
 	armada-375-db.dtb
arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts new file +36 -0
new file mode 100644
index 000000000000..43dd69a54ff1
@@ -0,0 +1,36 @@
+/*
+ * Device Tree file for Seagate NAS 2-Bay (Armada 370 SoC).
+ *
+ * Copyright (C) 2015 Seagate
+ *
+ * Author: Vincent Donnefort <[email protected]>
+ *
+ * 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.
+ */
+
+/*
+ * Here are some informations allowing to identify the device:
+ *
+ * Product name                 : Seagate NAS 2-Bay
+ * Code name (board/PCB)        : Dart 2-Bay
+ * Model name (case sticker)    : SRPD20
+ * Material desc (product spec) : STCTxxxxxxx
+ */
+
+/dts-v1/;
+#include "armada-370-seagate-nas-xbay.dtsi"
+
+/ {
+	model = "Seagate NAS 2-Bay (Dart, SRPD20)";
+	compatible = "seagate,dart-2", "marvell,armada370", "marvell,armada-370-xp";
+
+	gpio-fan {
+		gpio-fan,speed-map =
+			<   0 3
+			  950 2
+			 1400 1
+			 1800 0>;
+	};
+};
arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts new file +133 -0

133 lines not on this page · raw message

arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi new file +231 -0

231 lines not on this page · raw message

Signature · 1 line
2.1.4
maintainer
#2 lore raw

PATCH v2 1/3 ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay

Quoted 10 lines · Simon Guinot

From: Vincent Donnefort <[email protected]>

This patch adds DT support for the Seagate NAS 2 and 4-Bay.

Here are some informations allowing to identify these devices:

Product name                 | Seagate NAS 2-Bay | Seagate NAS 4-Bay
Code name (board/PCB)        | Dart 2-Bay        | Dart 4-Bay
Model name (case sticker)    | SRPD20            | SRPD40
Material desc (product spec) | STCTxxxxxxx       | STCUxxxxxxx

Hi Simon

Thanks for adding this information.

arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi line 155

Quoted 5 lines
arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi new file +5 -0
+	gpio-fan {
+		compatible = "gpio-fan";
+		gpios = <&gpio2 0 0
+			 &gpio2 1 0>;
+	};

Minor nit-pick

GPIO_ACTIVE_HIGH could be used here. Other than that:

for the whole series.

Andrew

#3 lore raw

PATCH v2 2/3 ARM: mvebu: add DT support for Seagate Personal Cloud

In reply to Simon Guinot

This patch adds DT support for the Seagate Personal Cloud 1 and 2-Bay.

Here are some informations allowing to identify these devices:

Product name                 | Personal Cloud | Personal Cloud 2-Bay
Code name (board/PCB)        | Cumulus        | Cumulus Max
Model name (case sticker)    | SRN21C         | SRN22C
Material desc (product spec) | STCRxxxxxxx    | STCSxxxxxxx

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.

---
 arch/arm/boot/dts/Makefile                         |   2 +
 .../armada-370-seagate-personnal-cloud-2bay.dts    |  51 ++++++
 .../dts/armada-370-seagate-personnal-cloud.dts     |  37 +++++
 .../dts/armada-370-seagate-personnal-cloud.dtsi    | 174 +++++++++++++++++++++
 4 files changed, 264 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personnal-cloud-2bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personnal-cloud.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personnal-cloud.dtsi

Changes for v2:
- Rename DTS files using the products names.
- Update model and compatible properties as well.
- Add some informations allowing to identify the devices in the commit message and in the DTS files headers.

arch/arm/boot/dts/Makefile +2 -0
index 4f89c35239c0..cbcdde68aa73 100644
@@ -704,6 +704,8 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
 	armada-370-rd.dtb \
 	armada-370-seagate-nas-2bay.dtb \
 	armada-370-seagate-nas-4bay.dtb \
+	armada-370-seagate-personnal-cloud.dtb \
+	armada-370-seagate-personnal-cloud-2bay.dtb \
 	armada-370-synology-ds213j.dtb
 dtb-$(CONFIG_MACH_ARMADA_375) += \
 	armada-375-db.dtb
arch/arm/boot/dts/armada-370-seagate-personnal-cloud-2bay.dts new file +51 -0

51 lines not on this page · raw message

arch/arm/boot/dts/armada-370-seagate-personnal-cloud.dts new file +37 -0
new file mode 100644
index 000000000000..66de26e698c6
@@ -0,0 +1,37 @@
+/*
+ * Device Tree file for Seagate Personal Cloud NAS (Armada 370 SoC).
+ *
+ * Copyright (C) 2015 Seagate
+ *
+ * Author: Simon Guinot <[email protected]>
+ *
+ * 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.
+ */
+
+/*
+ * Here are some informations allowing to identify the device:
+ *
+ * Product name                 : Seagate Personal Cloud
+ * Code name (board/PCB)        : Cumulus
+ * Model name (case sticker)    : SRN21C
+ * Material desc (product spec) : STCRxxxxxxx
+ */
+
+/dts-v1/;
+#include "armada-370-seagate-personnal-cloud.dtsi"
+
+/ {
+	model = "Seagate Personal Cloud (Cumulus, SRN21C)";
+	compatible = "seagate,cumulus", "marvell,armada370", "marvell,armada-370-xp";
+
+	soc {
+		internal-regs {
+			sata at a0000 {
+				status = "okay";
+				nr-ports = <1>;
+			};
+		};
+	};
+};
arch/arm/boot/dts/armada-370-seagate-personnal-cloud.dtsi new file +174 -0

174 lines not on this page · raw message

Signature · 1 line
2.1.4
#4 lore raw

PATCH v2 3/3 ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig

In reply to Simon Guinot

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.

---
 arch/arm/configs/mvebu_v7_defconfig | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/configs/mvebu_v7_defconfig +8 -1
index 13fcd020e375..c6729bf0a8dd 100644
@@ -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
Signature · 1 line
2.1.4
#5 lore raw

v2 cover Add support for the Armada-370-based Seagate NAS

In reply to Simon Guinot
Quoted 6 lines · Simon Guinot

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.

Quoted 6 lines

Changes for v2:
- Rename DTS files using the products names.
- Update model and compatible properties as well.
- Add some informations allowing to identify the devices in the commit message and in the DTS files headers.
- Remove duplicated rtc alias in armada-370-seagate-nas-xbay.dtsi.

Hi Jason, Andrew, Gregory, and Sebastian,

Please, consider merging this patch series.

Thanks,

Simon

Quoted 7 lines

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

Quoted 24 lines
 arch/arm/boot/dts/Makefile                         |   4 +
 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts  |  36 ++++
 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts  | 133 ++++++++++++
 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 231 +++++++++++++++++++++
 .../armada-370-seagate-personnal-cloud-2bay.dts    |  51 +++++
 .../dts/armada-370-seagate-personnal-cloud.dts     |  37 ++++
 .../dts/armada-370-seagate-personnal-cloud.dtsi    | 174 ++++++++++++++++
 arch/arm/configs/mvebu_v7_defconfig                |   9 +-
 8 files changed, 674 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personnal-cloud-2bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personnal-cloud.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personnal-cloud.dtsi
Signature · 7 lines
2.1.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-------------- 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/20150922/87140c0e/attachment.sig>