2019-12-11 14:06:15

by Andrey Smirnov

Subject: [PATCH v2 1/2] ARM: dts: vf610-zii-scu4-aib: Use generic names for DT nodes

The devicetree specification recommends using generic node names.

Some ZII dts files already follow such recommendation, but some don't,
so use generic node names for consistency among the ZII dts files.

Signed-off-by: Andrey Smirnov <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Chris Healy <[email protected]>
Cc: Cory Tusar <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: [email protected]
Cc: [email protected]
---

Changes since [v1]:

- Rebased on top of 12/05 linux-next

- Added "ARM: dts: vf610-zii-scu4-aib: Add node for switch
watchdog" to this series, which was previously accidental and
implicit prerequisite for this patch

[v1] lore.kernel.org/lkml/[email protected]

arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
index d7caf618f980..a02c7ea3b92d 100644
--- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
+++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
@@ -407,7 +407,7 @@
pinctrl-0 = <&pinctrl_dspi1>;
status = "okay";

- spi-flash@0 {
+ flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
@@ -420,7 +420,7 @@
};
};

- spi-flash@1 {
+ flash@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
@@ -509,7 +509,7 @@
#gpio-cells = <2>;
};

- lm75@48 {
+ temp-sensor@48 {
compatible = "national,lm75";
reg = <0x48>;
};
@@ -524,7 +524,7 @@
reg = <0x52>;
};

- ds1682@6b {
+ elapsed-time-recorder@6b {
compatible = "dallas,ds1682";
reg = <0x6b>;
};
@@ -536,7 +536,7 @@
pinctrl-0 = <&pinctrl_i2c1>;
status = "okay";

- adt7411@4a {
+ adc@4a {
compatible = "adi,adt7411";
reg = <0x4a>;
};
@@ -548,7 +548,7 @@
pinctrl-0 = <&pinctrl_i2c2>;
status = "okay";

- gpio9: sx1503q@20 {
+ gpio9: io-expander@20 {
compatible = "semtech,sx1503q";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sx1503_20>;
@@ -559,12 +559,12 @@
interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
};

- lm75@4e {
+ temp-sensor@4e {
compatible = "national,lm75";
reg = <0x4e>;
};

- lm75@4f {
+ temp-sensor@4f {
compatible = "national,lm75";
reg = <0x4f>;
};
@@ -576,17 +576,17 @@
reg = <0x23>;
};

- adt7411@4a {
+ adc@4a {
compatible = "adi,adt7411";
reg = <0x4a>;
};

- at24c08@54 {
+ eeprom@54 {
compatible = "atmel,24c08";
reg = <0x54>;
};

- tca9548@70 {
+ i2c-mux@70 {
compatible = "nxp,pca9548";
pinctrl-names = "default";
#address-cells = <1>;
@@ -625,7 +625,7 @@
};
};

- tca9548@71 {
+ i2c-mux@71 {
compatible = "nxp,pca9548";
pinctrl-names = "default";
reg = <0x71>;
--
2.21.0

2019-12-11 14:07:54

by Andrey Smirnov

Subject: [PATCH v2 2/2] ARM: dts: vf610-zii-scu4-aib: Add node for switch watchdog

Add I2C child node for switch watchdog present on SCU4.

Signed-off-by: Andrey Smirnov <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Chris Healy <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
index a02c7ea3b92d..b642520199ba 100644
--- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
+++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
@@ -536,6 +536,11 @@
pinctrl-0 = <&pinctrl_i2c1>;
status = "okay";

+ watchdog@38 {
+ compatible = "zii,rave-wdt";
+ reg = <0x38>;
+ };
+
adc@4a {
compatible = "adi,adt7411";
reg = <0x4a>;
--
2.21.0

2019-12-12 02:29:10

by Shawn Guo

Subject: Re: [PATCH v2 1/2] ARM: dts: vf610-zii-scu4-aib: Use generic names for DT nodes

On Wed, Dec 11, 2019 at 06:04:43AM -0800, Andrey Smirnov wrote:
> The devicetree specification recommends using generic node names.
>
> Some ZII dts files already follow such recommendation, but some don't,
> so use generic node names for consistency among the ZII dts files.
>
> Signed-off-by: Andrey Smirnov <[email protected]>
> Cc: Shawn Guo <[email protected]>
> Cc: Chris Healy <[email protected]>
> Cc: Cory Tusar <[email protected]>
> Cc: Fabio Estevam <[email protected]>
> Cc: [email protected]
> Cc: [email protected]

Applied both, thanks.