Support for another NSA310
cover Support for another NSA310
There are apparently three different designs of the ZyXEL NSA310 NAS box. This patchset adds support for a second one, refactoring the common DTS parts into a shared DTSI file.
What is not clear is naming. There is no obvious marketing name difference, hardware version label, etc. So for the same of argument, this new device uses the name NSA310a in DTS.
The second patch adds to the kirkwood_defconfig drivers not already in the default configuration, plus some additional drivers used by other kirkwood devices. The aim is to improve build test coverage.
Andrew
Andrew Lunn (2):
ARM: Kirkwood: Add support for another ZyXEL NSA210 variant
ARM: Kirkwood: update defconfig for used i2c devices, EXT4 FS, r8169
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 107 ++++++++++++++++ arch/arm/boot/dts/kirkwood-nsa310.dts | 100 +-------------- arch/arm/boot/dts/kirkwood-nsa310a.dts | 165 +++++++++++++++++++++++++ arch/arm/configs/kirkwood_defconfig | 10 +- 5 files changed, 283 insertions(+), 100 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-nsa310a.dts
Signature · 1 line
1.7.10.4
PATCH 1/2 ARM: Kirkwood: Add support for another ZyXEL NSA310 variant
There are a number of variants of the ZyXEL NSA310, with slightly different LEDs, buttons and i2c devices. Add a DTS file to support one more of these variants.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 107 ++++++++++++++++ arch/arm/boot/dts/kirkwood-nsa310.dts | 100 +-------------- arch/arm/boot/dts/kirkwood-nsa310a.dts | 165 +++++++++++++++++++++++++ 4 files changed, 274 insertions(+), 99 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-nsa310a.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -89,6 +89,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ kirkwood-ns2max.dtb \ kirkwood-ns2mini.dtb \ kirkwood-nsa310.dtb \ + kirkwood-nsa310a.dtb \ kirkwood-sheevaplug.dtb \ kirkwood-sheevaplug-esata.dtb \ kirkwood-topkick.dtb \
arch/arm/boot/dts/kirkwood-nsa310-common.dtsi new file +107 -0
107 lines not on this page · raw message
arch/arm/boot/dts/kirkwood-nsa310.dts +1 -99
129 lines not on this page · raw message
arch/arm/boot/dts/kirkwood-nsa310a.dts new file +165 -0
165 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Jason Cooper
AppliedPATCH 1/2 ARM: Kirkwood: Add support for another ZyXEL NSA310 variant
Quoted 5 lines · Andrew Lunn
There are a number of variants of the ZyXEL NSA310, with slightly different LEDs, buttons and i2c devices. Add a DTS file to support one more of these variants.
Signed-off-by Andrew Lunn <[email protected]>
Quoted 8 lines
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 107 ++++++++++++++++ arch/arm/boot/dts/kirkwood-nsa310.dts | 100 +-------------- arch/arm/boot/dts/kirkwood-nsa310a.dts | 165 +++++++++++++++++++++++++ 4 files changed, 274 insertions(+), 99 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-nsa310a.dts
Applied to mvebu/dt
thx,
Jason.
PATCH 2/2 ARM: Kirkwood: update defconfig for used i2c devices, EXT4 FS, r8169
In reply to Andrew LunnVarious kirkwood boards make use of i2c devices. Ensure the defconfig builds them. Also, EXT4 FS is also common on NAS boxes, so include it as well. And lastly, NSA310 has a RealTek 8169 onboard.
--- arch/arm/configs/kirkwood_defconfig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
arch/arm/configs/kirkwood_defconfig +9 -1
@@ -92,6 +92,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_ORION=y CONFIG_BLK_DEV_LOOP=y +CONFIG_EEPROM_AT24=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=m
@@ -103,6 +104,7 @@ CONFIG_NETDEVICES=y CONFIG_MII=y CONFIG_NET_DSA_MV88E6123_61_65=y CONFIG_MV643XX_ETH=y +CONFIG_R8169=y CONFIG_MARVELL_PHY=y CONFIG_LIBERTAS=y CONFIG_LIBERTAS_SDIO=y
@@ -123,7 +125,10 @@ CONFIG_I2C_MV64XXX=y CONFIG_SPI=y CONFIG_SPI_ORION=y CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set +CONFIG_SENSORS_ADT7475=y +CONFIG_SENSORS_LM63=y +CONFIG_SENSORS_LM75=y +CONFIG_SENSORS_LM85=y CONFIG_THERMAL=y CONFIG_KIRKWOOD_THERMAL=y CONFIG_WATCHDOG=y
@@ -164,6 +169,8 @@ CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_RS5C372=y +CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_S35390A=y CONFIG_RTC_DRV_MV=y CONFIG_DMADEVICES=y
@@ -171,6 +178,7 @@ CONFIG_MV_XOR=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_UDF_FS=m
Signature · 1 line
1.7.10.4
Jason Cooper
AppliedPATCH 2/2 ARM: Kirkwood: update defconfig for used i2c devices, EXT4 FS, r8169
Quoted 8 lines · Andrew Lunn
Various kirkwood boards make use of i2c devices. Ensure the defconfig builds them. Also, EXT4 FS is also common on NAS boxes, so include it as well. And lastly, NSA310 has a RealTek 8169 onboard.
Signed-off-by Andrew Lunn <[email protected]>--- arch/arm/configs/kirkwood_defconfig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Applied to mvebu/defconfig
thx,
Jason.
cover Support for another NSA310
In reply to Andrew LunnQuoted 11 lines · Andrew Lunn
There are apparently three different designs of the ZyXEL NSA310 NAS box. This patchset adds support for a second one, refactoring the common DTS parts into a shared DTSI file.
What is not clear is naming. There is no obvious marketing name difference, hardware version label, etc. So for the same of argument, this new device uses the name NSA310a in DTS.
The second patch adds to the
kirkwood_defconfigdrivers not already in the default configuration, plus some additional drivers used by other kirkwood devices. The aim is to improve build test coverage.
I've rebased these patches onto 3.11-rc4, which contains Thomas's PCI fix, so that the Ethernet should work again. There are no changes to my patches. It would be nice if people could test on there hardware and send some tested-by:
You can get the code from:
https://github.com/lunn/linux.git v3.11-rc4-nsa310-tdc
Thanks
Andrew
A message that is not in the archive (sent off-list or not yet received): [email protected]
cover Support for another NSA310
Quoted 12 lines · Tibor Harsszegi
Quoted 12 lines · Andrew Lunn
Quoted 11 lines
There are apparently three different designs of the ZyXEL NSA310 NAS box. This patchset adds support for a second one, refactoring the common DTS parts into a shared DTSI file.
What is not clear is naming. There is no obvious marketing name difference, hardware version label, etc. So for the same of argument, this new device uses the name NSA310a in DTS.
The second patch adds to the
kirkwood_defconfigdrivers not already in the default configuration, plus some additional drivers used by other kirkwood devices. The aim is to improve build test coverage.
Quoted 8 lines
Quoted 4 lines
I've rebased these patches onto 3.11-rc4, which contains Thomas's PCI fix, so that the Ethernet should work again. There are no changes to my patches. It would be nice if people could test on there hardware and send some tested-by:
Hello, can confirm the nsa310a works fine (sytem boots, LEDs are working, eth0
is up and running).
Hi Tibor
thanks for testing. Is it O.K. if i add a Tested-By: tag with your name. See:
Thanks
Andrew