Skip to contentSkip to conversation

DT support for kirkwood based Synology NAS boxes

PATCH Superseded klightspeed at killerwolves.net 2 participants 6 messages Feb 19, 2014

Subsystems (4)

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v6 cover DT support for kirkwood based Synology NAS boxes

This patchset adds support for around 30 kirkwood bases Synology NAS boxes. Patch #1 documents vendor prefixes. Patch #2 generalizes the qnap power off driver so that it can also be used for Synology devices. Patch #3 fixes i2c trivial device prefixes. Patch #4 adds the synology DT files.

v2:
Typo fix in qnap-poweroff.c
Use ricoy stock ticker instead of ricoh
Describe the lego structure of the hardware

v3:
Merge synology dtsi files into a single dtsi file

v4:
Various minor fixes to synology dtsi file

v5:
Fix typos in commit messages
Remove unnecessary casts in qnap-poweroff.c

v6:
Revert qnap vendor prefix change from v5

Andrew Lunn (3):
DT: Vendor prefixes: Add ricoh, qnap, sii and synology
Power: Reset: Generalize qnap-poweroff to with on Synology devices.
DT: i2c: Trivial: Add sii, s35390a, fix ricoh vendor prefix

klightspeed at killerwolves.net (1):
ARM: Kirkwood: Add support for many Synology NAS devices

 .../devicetree/bindings/i2c/trivial-devices.txt    |   3 +-
 .../bindings/power_supply/qnap-poweroff.txt        |   5 +-
 .../devicetree/bindings/vendor-prefixes.txt        |   4 +
 arch/arm/boot/dts/Makefile                         |  15 +
 arch/arm/boot/dts/kirkwood-ds109.dts               |  41 +
 arch/arm/boot/dts/kirkwood-ds110jv10.dts           |  41 +
 arch/arm/boot/dts/kirkwood-ds111.dts               |  44 ++
 arch/arm/boot/dts/kirkwood-ds112.dts               |  48 ++
 arch/arm/boot/dts/kirkwood-ds209.dts               |  44 ++
 arch/arm/boot/dts/kirkwood-ds210.dts               |  46 ++
 arch/arm/boot/dts/kirkwood-ds212.dts               |  47 ++
 arch/arm/boot/dts/kirkwood-ds212j.dts              |  41 +
 arch/arm/boot/dts/kirkwood-ds409.dts               |  48 ++
 arch/arm/boot/dts/kirkwood-ds409slim.dts           |  40 +
 arch/arm/boot/dts/kirkwood-ds411.dts               |  52 ++
 arch/arm/boot/dts/kirkwood-ds411j.dts              |  48 ++
 arch/arm/boot/dts/kirkwood-ds411slim.dts           |  48 ++
 arch/arm/boot/dts/kirkwood-rs212.dts               |  48 ++
 arch/arm/boot/dts/kirkwood-rs409.dts               |  44 ++
 arch/arm/boot/dts/kirkwood-rs411.dts               |  44 ++
 arch/arm/boot/dts/kirkwood-synology.dtsi           | 871 +++++++++++++++++++++
 drivers/power/reset/qnap-poweroff.c                |  49 +-
 22 files changed, 1657 insertions(+), 14 deletions(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-ds109.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds110jv10.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds111.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds112.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds209.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds210.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds212.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds212j.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds409.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds409slim.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds411.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds411j.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds411slim.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-rs212.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-rs409.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-rs411.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-synology.dtsi
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH v6 1/4 DT: Vendor prefixes: Add ricoh, qnap, sii and synology

From: Andrew Lunn <[email protected]>

The following patches make use of vendor names:
* ricoy (Ricoh Co. Ltd.);
* qnap (QNAP Systems, Inc.);
* sii (Seiko Instruments, Inc.); and
* synology (Synology, Inc.)

Add them to the vendor prefix list.

---
v2:
Use stock ticker for Ricoh as vendor name
s/Richoh/Ricoh/

v5:
Add vendor prefix for QNAP

v6:
Revert qnap vendor prefix change from v5
Now properly based on -rc1

---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.txt +4 -0
index 40ce2df..ef1b77c 100644
@@ -68,10 +68,12 @@ picochip	Picochip Ltd
 powervr	PowerVR (deprecated, use img)
 qca	Qualcomm Atheros, Inc.
 qcom	Qualcomm, Inc
+qnap	QNAP Systems, Inc.
 ralink	Mediatek/Ralink Technology Corp.
 ramtron	Ramtron International
 realtek Realtek Semiconductor Corp.
 renesas	Renesas Electronics Corporation
+ricoy	Ricoh Co. Ltd.
 rockchip	Fuzhou Rockchip Electronics Co., Ltd
 samsung	Samsung Semiconductor
 sbs	Smart Battery System
@@ -79,12 +81,14 @@ schindler	Schindler
 sil	Silicon Image
 silabs	Silicon Laboratories
 simtek
+sii	Seiko Instruments, Inc.
 sirf	SiRF Technology, Inc.
 snps 	Synopsys, Inc.
 st	STMicroelectronics
 ste	ST-Ericsson
 stericsson	ST-Ericsson
+synology	Synology, Inc.
 ti	Texas Instruments
 tlm	Trusted Logic Mobility
 toshiba	Toshiba Corporation
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH v6 2/4 Power: Reset: Generalize qnap-poweroff to work on Synology devices.

In reply to klightspeed at killerwolves.net

From: Andrew Lunn <[email protected]>

The Synology NAS devices use a very similar mechanism to QNAP NAS devices to power off. Both send a single charactor command to a PIC, over the second serial port. However the baud rate and the command differ. Generalize the driver to support this.

Cc Anton Vorontsov <[email protected]>
Cc Dmitry Eremin-Solenikov <[email protected]>
Cc David Woodhouse <[email protected]>
---
 .../bindings/power_supply/qnap-poweroff.txt        |  5 ++-
 drivers/power/reset/qnap-poweroff.c                | 49 ++++++++++++++++------
 2 files changed, 41 insertions(+), 13 deletions(-)
Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt +4 -1
index 0347d83..af25e77 100644
@@ -6,8 +6,11 @@ Orion5x SoCs. Sending the character 'A', at 19200 baud, tells the
 microcontroller to turn the power off. This driver adds a handler to
 pm_power_off which is called to turn the power off.
 
+Synology NAS devices use a similar scheme, but a different baud rate,
+9600, and a different character, '1'.
+
 Required Properties:
-- compatible: Should be "qnap,power-off"
+- compatible: Should be "qnap,power-off" or "synology,power-off"
 
 - reg: Address and length of the register set for UART1
 - clocks: tclk clock
drivers/power/reset/qnap-poweroff.c +37 -12

87 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#3 lore raw

PATCH v6 3/4 DT: i2c: Trivial: Add sii, s35390a, fix ricoh vendor prefix

In reply to klightspeed at killerwolves.net

From: Andrew Lunn <[email protected]>

Add the Seiko Instruments Inc S35390a to the list of trivial i2c devices. At the same time, correct the vendor prefix for ricoh, which should be the ticker symbol ricoy.

---
 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/i2c/trivial-devices.txt +2 -1
index 1a1ac2e..5f37191 100644
@@ -56,8 +56,9 @@ ovti,ov5642		OV5642: Color CMOS QSXGA (5-megapixel) Image Sensor with OmniBSI an
 pericom,pt7c4338	Real-time Clock Module
 plx,pex8648		48-Lane, 12-Port PCI Express Gen 2 (5.0 GT/s) Switch
 ramtron,24c64		i2c serial eeprom  (24cxx)
-ricoh,rs5c372a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
+ricoy,rs5c372a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
 samsung,24ad0xd1	S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
+sii,s35390a		2-wire CMOS real-time clock
 st-micro,24c256		i2c serial eeprom  (24cxx)
 stm,m41t00		Serial Access TIMEKEEPER
 stm,m41t62		Serial real-time clock (RTC) with alarm
Signature · 1 line
1.8.3.2
#4 lore raw

PATCH v6 3/4 DT: i2c: Trivial: Add sii, s35390a, fix ricoh vendor prefix

Quoted 17 lines · klightspeed at killerwolves.net

From: Andrew Lunn <[email protected]>

Add the Seiko Instruments Inc S35390a to the list of trivial i2c devices. At the same time, correct the vendor prefix for ricoh, which should be the ticker symbol ricoy.

---
 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/i2c/trivial-devices.txt +0 -0
index 1a1ac2e..5f37191 100644

Documentation/devicetree/bindings/i2c/trivial-devices.txt ovti,ov5642 OV5642: Color CMOS QSXGA (5-megapixel) Image Sensor with OmniBSI an · line 59

Quoted 5 lines
Documentation/devicetree/bindings/i2c/trivial-devices.txt +1 -1
@@ -56,8 +56,9 @@ ovti,ov5642		OV5642: Color CMOS QSXGA (5-megapixel) Image Sensor with OmniBSI an
 pericom,pt7c4338	Real-time Clock Module
 plx,pex8648		48-Lane, 12-Port PCI Express Gen 2 (5.0 GT/s) Switch
 ramtron,24c64		i2c serial eeprom  (24cxx)
-ricoh,rs5c372a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
+ricoy,rs5c372a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC

Sorry, I should've caught this before. 'ricoh,' has been is use by two dts files since at least v3.10. See:

f236f5aabe8eb ARM: kirkwood: Add support for NETGEAR ReadyNAS Duo v2 using DT

So same as qnap, let's stick with what is already there.

thx,

Jason.

Quoted 8 lines
Documentation/devicetree/bindings/i2c/trivial-devices.txt +1 -0
 samsung,24ad0xd1	S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
+sii,s35390a		2-wire CMOS real-time clock
 st-micro,24c256		i2c serial eeprom  (24cxx)
 stm,m41t00		Serial Access TIMEKEEPER
 stm,m41t62		Serial real-time clock (RTC) with alarm
Signature · 1 line
1.8.3.2
#5 lore raw

PATCH v6 4/4 ARM: Kirkwood: Add support for many Synology NAS devices

In reply to klightspeed at killerwolves.net

From: "[email protected]" <[email protected]>

Add device tree fragments and files to support many of the kirkwood based Synology NAS devices. This is a modification of Andrew Lunn's <[email protected]> translation of the board setup file maintained by Ben Peddell <[email protected]>

The Ricoh RS5C372 RTC was used in all 2009 units and some 2010 units. All other Synology Kirkwood-based DiskStations and RackStations use the Seiko S35390A RTC.

Most of the 1-bay and 2-bay units use the GPIOs that are multiplexed with the built-in SATA interface activity/presence pins on mpp 20-23, while the 4-bay units use ge01 and a PCIe SATA controller, and put the software controlled HDD leds on mpp 36-43.

Most of the 6281 units with HDD power controls use mpp 29 and 31, while most of the 6282 units with HDD power controls use mpp 30, 34, 44 and 45 and provide a model ID on mpp 28, 29, 46 and 47. Pre-2012 units and most 4-bay units didn't have a separate power control for HDD1. These power controls are presumably to limit startup current from the 12V brick power supply.

Instead of using separate dtsi files in a synology directory, this patch uses a single dtsi file containing all of the modules for these boards, with all of the modules not common to all boards disabled. The board dts files then enable the appropriate modules for their boards.

---
v2:
Fix gpio's which should be gpo.
Rebase onto v3-14-rc1
Update RTC nodes with vendor name.
Update SPI flash node with vendor name.
Add a description of the lego
Use ricoy, i.e. the stock ticker

v3:
Merge Synology dtsi files into single dtsi file

v4:
Various minor fixes to synology dtsi file

---
 arch/arm/boot/dts/Makefile               |  15 +
 arch/arm/boot/dts/kirkwood-ds109.dts     |  41 ++
 arch/arm/boot/dts/kirkwood-ds110jv10.dts |  41 ++
 arch/arm/boot/dts/kirkwood-ds111.dts     |  44 ++
 arch/arm/boot/dts/kirkwood-ds112.dts     |  48 ++
 arch/arm/boot/dts/kirkwood-ds209.dts     |  44 ++
 arch/arm/boot/dts/kirkwood-ds210.dts     |  46 ++
 arch/arm/boot/dts/kirkwood-ds212.dts     |  47 ++
 arch/arm/boot/dts/kirkwood-ds212j.dts    |  41 ++
 arch/arm/boot/dts/kirkwood-ds409.dts     |  48 ++
 arch/arm/boot/dts/kirkwood-ds409slim.dts |  40 ++
 arch/arm/boot/dts/kirkwood-ds411.dts     |  52 ++
 arch/arm/boot/dts/kirkwood-ds411j.dts    |  48 ++
 arch/arm/boot/dts/kirkwood-ds411slim.dts |  48 ++
 arch/arm/boot/dts/kirkwood-rs212.dts     |  48 ++
 arch/arm/boot/dts/kirkwood-rs409.dts     |  44 ++
 arch/arm/boot/dts/kirkwood-rs411.dts     |  44 ++
 arch/arm/boot/dts/kirkwood-synology.dtsi | 871 +++++++++++++++++++++++++++++++
 18 files changed, 1610 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-ds109.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds110jv10.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds111.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds112.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds209.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds210.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds212.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds212j.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds409.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds409slim.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds411.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds411j.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ds411slim.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-rs212.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-rs409.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-rs411.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-synology.dtsi
arch/arm/boot/dts/Makefile +15 -0
index 6d1e43d..e286abc 100644
@@ -90,6 +90,18 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 	kirkwood-dns325.dtb \
 	kirkwood-dockstar.dtb \
 	kirkwood-dreamplug.dtb \
+	kirkwood-ds109.dtb \
+	kirkwood-ds110jv10.dtb \
+	kirkwood-ds111.dtb \
+	kirkwood-ds209.dtb \
+	kirkwood-ds210.dtb \
+	kirkwood-ds212.dtb \
+	kirkwood-ds212j.dtb \
+	kirkwood-ds409.dtb \
+	kirkwood-ds409slim.dtb \
+	kirkwood-ds411.dtb \
+	kirkwood-ds411j.dtb \
+	kirkwood-ds411slim.dtb \
 	kirkwood-goflexnet.dtb \
 	kirkwood-guruplug-server-plus.dtb \
 	kirkwood-ib62x0.dtb \
@@ -112,6 +124,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 	kirkwood-nsa310a.dtb \
 	kirkwood-openblocks_a6.dtb \
 	kirkwood-openblocks_a7.dtb \
+	kirkwood-rs212.dtb \
+	kirkwood-rs409.dtb \
+	kirkwood-rs411.dtb \
 	kirkwood-sheevaplug.dtb \
 	kirkwood-sheevaplug-esata.dtb \
 	kirkwood-topkick.dtb \
arch/arm/boot/dts/kirkwood-ds109.dts new file +41 -0

41 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds110jv10.dts new file +41 -0

41 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds111.dts new file +44 -0

44 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds112.dts new file +48 -0

48 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds209.dts new file +44 -0

44 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds210.dts new file +46 -0

46 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds212.dts new file +47 -0

47 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds212j.dts new file +41 -0

41 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds409.dts new file +48 -0

48 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds409slim.dts new file +40 -0
new file mode 100644
index 0000000..1848a62
@@ -0,0 +1,40 @@
+/*
+ * Andrew Lunn <[email protected]>
+ * Ben Peddell <[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.
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-synology.dtsi"
+
+/ {
+	model = "Synology 409slim";
+	compatible = "synology,ds409slim", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x8000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8";
+	};
+
+	gpio-fan-150-32-35 {
+		status = "okay";
+	};
+
+	gpio-leds-hdd-20 {
+		status = "okay";
+	};
+};
+
+&rs5c372 {
+	status = "okay";
+};
arch/arm/boot/dts/kirkwood-ds411.dts new file +52 -0

52 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds411j.dts new file +48 -0

48 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-ds411slim.dts new file +48 -0

48 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-rs212.dts new file +48 -0

48 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-rs409.dts new file +44 -0

44 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-rs411.dts new file +44 -0

44 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-synology.dtsi new file +871 -0

871 lines not on this page · raw message

Signature · 1 line
1.8.3.2