Kirkwood DT Documentation

PATCH New Andrew Lunn 4 participants 11 messages Mar 22, 2014 – Apr 7, 2014

Subsystems (2)

Device tree bindings I2C subsystem host drivers

lore

Share & tools

lore

Andrew Lunn

author

2014-03-22 12:45 UTC #0 lore raw

cover Kirkwood DT Documentation

This patchset fixes up a number of issues found by checkpatch in the kirkwood DT files or binding Documentation. Vendor Prefixes are documented, missing prefixes are added, incorrect prefixes are corrected, and Kirkwood SoCs are documented.

Note that some of these patches contain UTF-8 characters, which the mailing lists sometime don't like. The patches can also be found in

https://github.com/lunn/linux.git v3.14-rc7-next-20140321-dt

which is based on linux-next tag next-20140321.

Andrew Lunn (5):
DT: Vendor: Add prefixes used by Kirkwood devices
DT: bindings: add missing Marvell Kirkwood SoC documentation
ARM: Kirkwood: Fix Atmel vendor prefix
DT: I2C: Add trivial bindings used by kirkwood boards
ARM: Kirkwood: DT: Add missing vendor prefix

 .../devicetree/bindings/arm/marvell,kirkwood.txt   | 97 ++++++++++++++++++++++
 .../devicetree/bindings/i2c/trivial-devices.txt    | 16 ++++
 .../devicetree/bindings/vendor-prefixes.txt        | 13 ++-
 arch/arm/boot/dts/kirkwood-b3.dts                  |  2 +-
 arch/arm/boot/dts/kirkwood-cloudbox.dts            |  2 +-
 arch/arm/boot/dts/kirkwood-dreamplug.dts           |  2 +-
 arch/arm/boot/dts/kirkwood-laplug.dts              |  2 +-
 arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts     |  2 +-
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi         |  4 +-
 arch/arm/boot/dts/kirkwood-nsa310.dts              |  2 +-
 arch/arm/boot/dts/kirkwood-nsa310a.dts             |  2 +-
 arch/arm/boot/dts/kirkwood-openblocks_a6.dts       |  2 +-
 arch/arm/boot/dts/kirkwood-openblocks_a7.dts       |  2 +-
 13 files changed, 136 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/marvell,kirkwood.txt

Signature · 1 line

1.9.1

Andrew Lunn

author

2014-03-22 12:45 UTC #1 lore raw

PATCH 1/5 DT: Vendor: Add prefixes used by Kirkwood devices

Add a number of vendor prefixes by kirkwood devices. These are not all stock tickers, but have been in use for a while so changing would not be easy.

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

---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Documentation/devicetree/bindings/vendor-prefixes.txt +12 -1

index 0f01c9bf19c8..838e8bbbabca 100644
@@ -24,2 +24,3 @@ bosch	Bosch Sensortec GmbH
 brcm	Broadcom Corporation
+buffalo	Buffalo, Inc.
 calxeda	Calxeda

@@ -35,4 +36,4 @@ dallas	Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom	DAVICOM Semiconductor, Inc.
-dlink	D-Link Systems, Inc.
 denx	Denx Software Engineering
+dlink	D-Link Corporation
 dmo	Data Modul AG

@@ -44,2 +45,3 @@ est	ESTeem Wireless Modems
 eukrea  Eukr?a Electromatique
+excito	Excito
 fsl	Freescale Semiconductor

@@ -57,2 +59,3 @@ ibm	International Business Machines (IBM)
 idt	Integrated Device Technologies, Inc.
+iom	Iomega Corporation
 img	Imagination Technologies Ltd.

@@ -62,2 +65,3 @@ isl	Intersil
 karo	Ka-Ro electronics GmbH
+keymile	Keymile GmbH
 lacie	LaCie

@@ -72,2 +76,4 @@ mosaixtech	Mosaix Technologies, Inc.
 moxa	Moxa
+mpl	MPL AG
+mxicy	Macronix International Co., Ltd.
 national	National Semiconductor

@@ -84,2 +90,3 @@ phytec	PHYTEC Messtechnik GmbH
 picochip	Picochip Ltd
+plathome	Plat'Home Co., Ltd.
 powervr	PowerVR (deprecated, use img)

@@ -88,2 +95,3 @@ qcom	Qualcomm Technologies, Inc
 qnap	QNAP Systems, Inc.
+raidsonic	RaidSonic Technology GmbH
 ralink	Mediatek/Ralink Technology Corp.

@@ -97,2 +105,3 @@ sbs	Smart Battery System
 schindler	Schindler
+seagate	Seagate Technology PLC
 sil	Silicon Image

@@ -113,2 +122,3 @@ toshiba	Toshiba Corporation
 toumaz	Toumaz
+usi	Universal Scientifc Industrial Co., Ltd.
 v3	V3 Semiconductor

@@ -121 +131,2 @@ xes	Extreme Engineering Solutions (X-ES)
 xlnx	Xilinx
+zyxel	ZyXEL Communications Corp.

Signature · 1 line

1.9.1

Rob Herring

2014-04-07 16:13 UTC #2 lore raw

PATCH 1/5 DT: Vendor: Add prefixes used by Kirkwood devices

Quoted 8 lines · Andrew Lunn

Add a number of vendor prefixes by kirkwood devices. These are not all stock tickers, but have been in use for a while so changing would not be easy.
Signed-off-by Andrew Lunn <[email protected]>
---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Looks like I missed these. Applied patches 1, 2, and 4 for 3.15.

Rob

Andrew Lunn

author

2014-04-07 16:13 UTC #3 lore raw

PATCH 1/5 DT: Vendor: Add prefixes used by Kirkwood devices

Quoted 11 lines · Rob Herring

Quoted 8 lines · Andrew Lunn
Add a number of vendor prefixes by kirkwood devices. These are not all stock tickers, but have been in use for a while so changing would not be easy.
Signed-off-by Andrew Lunn <[email protected]>
---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
Looks like I missed these. Applied patches 1, 2, and 4 for 3.15.

Thanks Rob.

Jason, please can you pick up the others?

Thanks
Andrew

Andrew Lunn

author

2014-03-22 12:45 UTC #4 lore raw

PATCH 2/5 DT: bindings: add missing Marvell Kirkwood SoC documentation

In reply to Andrew Lunn

Marvell Kirkwood SoC binding have not yet been documented. Add the documentation including the supported SoCs and boards.

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

---
 .../devicetree/bindings/arm/marvell,kirkwood.txt   | 97 ++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/marvell,kirkwood.txt

Documentation/devicetree/bindings/arm/marvell,kirkwood.txt new file +97 -0

new file mode 100644
index 000000000000..925ecbf6e7b7
@@ -0,0 +1,97 @@
+Marvell Kirkwood SoC Family Device Tree Bindings
+------------------------------------------------
+
+Boards with a SoC of the Marvell Kirkwook family, eg 88f6281
+
+* Required root node properties:
+compatible: must contain "marvell,kirkwood"
+
+In addition, the above compatible shall be extended with the specific
+SoC. Currently known SoC compatibles are:
+
+"marvell,kirkwood-88f6192"
+"marvell,kirkwood-88f6281"
+"marvell,kirkwood-88f6282"
+"marvell,kirkwood-88f6283"
+"marvell,kirkwood-88f6702"
+"marvell,kirkwood-98DX4122"
+
+And in addition, the compatible shall be extended with the specific
+board. Currently known boards are:
+
+"buffalo,lschlv2"
+"buffalo,lsxhl"
+"buffalo,lsxl"
+"dlink,dns-320"
+"dlink,dns-320-a1"
+"dlink,dns-325"
+"dlink,dns-325-a1"
+"dlink,dns-kirkwood"
+"excito,b3"
+"globalscale,dreamplug-003-ds2001"
+"globalscale,guruplug"
+"globalscale,guruplug-server-plus"
+"globalscale,sheevaplug"
+"globalscale,sheevaplug"
+"globalscale,sheevaplug-esata"
+"globalscale,sheevaplug-esata-rev13"
+"iom,iconnect"
+"iom,iconnect-1.1"
+"iom,ix2-200"
+"keymile,km_kirkwood"
+"lacie,cloudbox"
+"lacie,inetspace_v2"
+"lacie,laplug"
+"lacie,netspace_lite_v2"
+"lacie,netspace_max_v2"
+"lacie,netspace_mini_v2"
+"lacie,netspace_v2"
+"marvell,db-88f6281-bp"
+"marvell,db-88f6282-bp"
+"marvell,mv88f6281gtw-ge"
+"marvell,rd88f6281"
+"marvell,rd88f6281"
+"marvell,rd88f6281-a0"
+"marvell,rd88f6281-a1"
+"mpl,cec4"
+"mpl,cec4-10"
+"netgear,readynas"
+"netgear,readynas"
+"netgear,readynas-duo-v2"
+"netgear,readynas-nv+-v2"
+"plathome,openblocks-a6"
+"plathome,openblocks-a7"
+"raidsonic,ib-nas6210"
+"raidsonic,ib-nas6210-b"
+"raidsonic,ib-nas6220"
+"raidsonic,ib-nas6220-b"
+"raidsonic,ib-nas62x0"
+"seagate,dockstar"
+"seagate,goflexnet"
+"synology,ds109"
+"synology,ds110jv10"
+"synology,ds110jv20"
+"synology,ds110jv30"
+"synology,ds111"
+"synology,ds209"
+"synology,ds210jv10"
+"synology,ds210jv20"
+"synology,ds212"
+"synology,ds212jv10"
+"synology,ds212jv20"
+"synology,ds212pv10"
+"synology,ds409"
+"synology,ds409slim"
+"synology,ds410j"
+"synology,ds411"
+"synology,ds411j"
+"synology,ds411slim"
+"synology,ds413jv10"
+"synology,rs212"
+"synology,rs409"
+"synology,rs411"
+"synology,rs812"
+"usi,topkick"
+"usi,topkick-1281P2"
+"zyxel,nsa310"
+"zyxel,nsa310a"

Signature · 1 line

1.9.1

Andrew Lunn

author

2014-03-22 12:45 UTC #5 lore raw

PATCH 3/5 ARM: Kirkwood: Fix Atmel vendor prefix

In reply to Andrew Lunn

The documented vendor prefix for Atmel is 'atmel' not 'at' as used in these .dts[i] files.

The i2c framework actually ignores the prefix, so making this change does not cause compatibility issues.

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

---
 arch/arm/boot/dts/kirkwood-laplug.dts      | 2 +-
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/kirkwood-laplug.dts +1 -1

index c9e82eff9bf2..6761ffa2c4ab 100644
@@ -50,3 +50,3 @@
 			eeprom at 50 {
-				compatible = "at,24c04";
+				compatible = "atmel,24c04";
 				pagesize = <16>;

arch/arm/boot/dts/kirkwood-ns2-common.dtsi +1 -1

index 743152f31a81..843eb478b3e4 100644
@@ -52,3 +52,3 @@
 			eeprom at 50 {
-				compatible = "at,24c04";
+				compatible = "atmel,24c04";
 				pagesize = <16>;

Signature · 1 line

1.9.1

Andrew Lunn

author

2014-03-22 12:45 UTC #6 lore raw

PATCH 4/5 DT: I2C: Add trivial bindings used by kirkwood boards

In reply to Andrew Lunn

Add a number of eeproms and temperature sensors/fan controllers used by kirkwood boards.

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

---
 .../devicetree/bindings/i2c/trivial-devices.txt          | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Documentation/devicetree/bindings/i2c/trivial-devices.txt +16 -0

index 71724d026ffa..bef86e57c388 100644
@@ -15,4 +15,18 @@ adi,adt7461		+/-1C TDM Extended Temp Range I.C
 adt7461			+/-1C TDM Extended Temp Range I.C
+adi,adt7473		+/-1C TDM Extended Temp Range I.C
+adi,adt7475		+/-1C TDM Extended Temp Range I.C
+adi,adt7476		+/-1C TDM Extended Temp Range I.C
+adi,adt7490		+/-1C TDM Extended Temp Range I.C
 at,24c08		i2c serial eeprom  (24cxx)
+atmel,24c00		i2c serial eeprom  (24cxx)
+atmel,24c01		i2c serial eeprom  (24cxx)
 atmel,24c02		i2c serial eeprom  (24cxx)
+atmel,24c04		i2c serial eeprom  (24cxx)
+atmel,24c16		i2c serial eeprom  (24cxx)
+atmel,24c32		i2c serial eeprom  (24cxx)
+atmel,24c64		i2c serial eeprom  (24cxx)
+atmel,24c128		i2c serial eeprom  (24cxx)
+atmel,24c256		i2c serial eeprom  (24cxx)
+atmel,24c512		i2c serial eeprom  (24cxx)
+atmel,24c1024		i2c serial eeprom  (24cxx)
 atmel,at97sc3204t	i2c trusted platform module (TPM)

@@ -48,4 +62,6 @@ maxim,max6625		9-Bit/12-Bit Temperature Sensors with I?C-Compatible Serial Inte
 mc,rv3029c2		Real Time Clock Module with I2C-Bus
+national,lm63		Temperature sensor with integrated fan control
 national,lm75		I2C TEMP SENSOR
 national,lm80		Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor
+national,lm85		Temperature sensor with integrated fan control
 national,lm92		?0.33?C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface

Signature · 1 line

1.9.1

Andrew Lunn

author

2014-03-22 12:46 UTC #7 lore raw

PATCH 5/5 ARM: Kirkwood: DT: Add missing vendor prefix

In reply to Andrew Lunn

Add vendor prefixes to compatible strings where they are missing.

Both the I2C and MTD framework ignore the prefix, so adding them has no effect on backwards compatibility.

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

---
 arch/arm/boot/dts/kirkwood-b3.dts              | 2 +-
 arch/arm/boot/dts/kirkwood-cloudbox.dts        | 2 +-
 arch/arm/boot/dts/kirkwood-dreamplug.dts       | 2 +-
 arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 +-
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi     | 2 +-
 arch/arm/boot/dts/kirkwood-nsa310.dts          | 2 +-
 arch/arm/boot/dts/kirkwood-nsa310a.dts         | 2 +-
 arch/arm/boot/dts/kirkwood-openblocks_a6.dts   | 2 +-
 arch/arm/boot/dts/kirkwood-openblocks_a7.dts   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

arch/arm/boot/dts/kirkwood-b3.dts +1 -1

index 40791053106b..6becedebaa4e 100644
@@ -77,3 +77,3 @@
 				#size-cells = <1>;
-				compatible = "m25p16";
+				compatible = "st,m25p16";
 				reg = <0>;

arch/arm/boot/dts/kirkwood-cloudbox.dts +1 -1

index 0e06fd3cee4d..3b62aeeaa3a2 100644
@@ -48,3 +48,3 @@
 				#size-cells = <1>;
-				compatible = "mx25l4005a";
+				compatible = "mxicy,mx25l4005a";
 				reg = <0>;

arch/arm/boot/dts/kirkwood-dreamplug.dts +1 -1

index ef3463e0ae19..28b3ee369778 100644
@@ -45,3 +45,3 @@
 				#size-cells = <1>;
-				compatible = "mx25l1606e";
+				compatible = "mxicy,mx25l1606e";
 				reg = <0>;

arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +1 -1

index 2cb0dc529165..32c6fb4a1162 100644
@@ -58,3 +58,3 @@
 				#size-cells = <1>;
-				compatible = "mx25l12805d";
+				compatible = "mxicy,mx25l12805d";
 				reg = <0>;

arch/arm/boot/dts/kirkwood-ns2-common.dtsi +1 -1

index 843eb478b3e4..e6e5ec4fe6b9 100644
@@ -34,3 +34,3 @@
 				#size-cells = <1>;
-				compatible = "mx25l4005a";
+				compatible = "mxicy,mx25l4005a";
 				reg = <0>;

arch/arm/boot/dts/kirkwood-nsa310.dts +1 -1

index 03fa24cf3344..0a07af9d8e58 100644
@@ -106,3 +106,3 @@
 			adt7476: adt7476a at 2e {
-				compatible = "adt7476";
+				compatible = "adi,adt7476";
 				reg = <0x2e>;

arch/arm/boot/dts/kirkwood-nsa310a.dts +1 -1

index a5e779452867..27ca6a79c48a 100644
@@ -96,3 +96,3 @@
 			lm85: lm85 at 2e {
-				compatible = "lm85";
+				compatible = "national,lm85";
 				reg = <0x2e>;

arch/arm/boot/dts/kirkwood-openblocks_a6.dts +1 -1

index b88da9392c32..0650beafc1de 100644
@@ -42,3 +42,3 @@
 			s35390a: s35390a at 30 {
-				compatible = "s35390a";
+				compatible = "sii,s35390a";
 				reg = <0x30>;

arch/arm/boot/dts/kirkwood-openblocks_a7.dts +1 -1

index b2f7cae06839..38520a287514 100644
@@ -54,3 +54,3 @@
 			s24c02: s24c02 at 50 {
-				compatible = "24c02";
+				compatible = "atmel,24c02";
 				reg = <0x50>;

Signature · 1 line

1.9.1

Jason Cooper

2014-03-24 00:22 UTC #8 lore raw

cover Kirkwood DT Documentation

In reply to Andrew Lunn

arm-soc maintainers,

Quoted 11 lines · Andrew Lunn

This patchset fixes up a number of issues found by checkpatch in the kirkwood DT files or binding Documentation. Vendor Prefixes are documented, missing prefixes are added, incorrect prefixes are corrected, and Kirkwood SoCs are documented.
Note that some of these patches contain UTF-8 characters, which the mailing lists sometime don't like. The patches can also be found in
https://github.com/lunn/linux.git v3.14-rc7-next-20140321-dt
which is based on linux-next tag next-20140321.

I'd like to take this in as 'fixes-non-critical' for v3.15. However, I'm having trouble finding a stable, conflict-free branch to base it on. The main problem seems to be vendor-prefixes.txt.

How would you prefer I handle this? Or, would you guys just like to take the series directly? I'm fine either way.

If taking directly,

Acked-by Jason Cooper <[email protected]>

thx,

Jason.

Quoted 26 lines

 .../devicetree/bindings/arm/marvell,kirkwood.txt   | 97 ++++++++++++++++++++++
 .../devicetree/bindings/i2c/trivial-devices.txt    | 16 ++++
 .../devicetree/bindings/vendor-prefixes.txt        | 13 ++-
 arch/arm/boot/dts/kirkwood-b3.dts                  |  2 +-
 arch/arm/boot/dts/kirkwood-cloudbox.dts            |  2 +-
 arch/arm/boot/dts/kirkwood-dreamplug.dts           |  2 +-
 arch/arm/boot/dts/kirkwood-laplug.dts              |  2 +-
 arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts     |  2 +-
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi         |  4 +-
 arch/arm/boot/dts/kirkwood-nsa310.dts              |  2 +-
 arch/arm/boot/dts/kirkwood-nsa310a.dts             |  2 +-
 arch/arm/boot/dts/kirkwood-openblocks_a6.dts       |  2 +-
 arch/arm/boot/dts/kirkwood-openblocks_a7.dts       |  2 +-
 13 files changed, 136 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/marvell,kirkwood.txt

Signature · 1 line

1.9.1

Arnd Bergmann

2014-03-29 00:22 UTC #9 lore raw

cover Kirkwood DT Documentation

Quoted 19 lines · Jason Cooper

arm-soc maintainers,
Quoted 11 lines · Andrew Lunn
This patchset fixes up a number of issues found by checkpatch in the kirkwood DT files or binding Documentation. Vendor Prefixes are documented, missing prefixes are added, incorrect prefixes are corrected, and Kirkwood SoCs are documented.
Note that some of these patches contain UTF-8 characters, which the mailing lists sometime don't like. The patches can also be found in
https://github.com/lunn/linux.git v3.14-rc7-next-20140321-dt
which is based on linux-next tag next-20140321.
I'd like to take this in as 'fixes-non-critical' for v3.15. However, I'm having trouble finding a stable, conflict-free branch to base it on. The main problem seems to be vendor-prefixes.txt.

Quoted 6 lines

How would you prefer I handle this? Or, would you guys just like to take the series directly? I'm fine either way.
If taking directly,
Acked-by Jason Cooper <[email protected]>

I think Rob should take the binding changes, we can take the dts file changes. Can you send them as patches relative to the next/dt branch to arm at kernel.org?

Arnd

Jason Cooper

2014-04-07 16:59 UTC #10 lore raw

cover Kirkwood DT Documentation

In reply to Andrew Lunn

Quoted 10 lines · Andrew Lunn

This patchset fixes up a number of issues found by checkpatch in the kirkwood DT files or binding Documentation. Vendor Prefixes are documented, missing prefixes are added, incorrect prefixes are corrected, and Kirkwood SoCs are documented.
Note that some of these patches contain UTF-8 characters, which the mailing lists sometime don't like. The patches can also be found in
https://github.com/lunn/linux.git v3.14-rc7-next-20140321-dt

Quoted 8 lines

which is based on linux-next tag next-20140321.
Andrew Lunn (5):
DT: Vendor: Add prefixes used by Kirkwood devices
DT: bindings: add missing Marvell Kirkwood SoC documentation
ARM: Kirkwood: Fix Atmel vendor prefix
DT: I2C: Add trivial bindings used by kirkwood boards
ARM: Kirkwood: DT: Add missing vendor prefix

Patches 3 and 5 five taken in to mvebu/dt-fixes-non-critical for v3.15. Updated our for-next branch.

If all goes well, I'll send a pull request later in the week.

thx,

Jason.