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]
---
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 45a978defbdc..6edd682dbd29 100644
--- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
+++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
@@ -417,7 +417,7 @@
pinctrl-0 = <&pinctrl_dspi1>;
status = "okay";
- spi-flash@0 {
+ flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
@@ -430,7 +430,7 @@
};
};
- spi-flash@1 {
+ flash@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
@@ -519,7 +519,7 @@
#gpio-cells = <2>;
};
- lm75@48 {
+ temp-sensor@48 {
compatible = "national,lm75";
reg = <0x48>;
};
@@ -534,7 +534,7 @@
reg = <0x52>;
};
- ds1682@6b {
+ elapsed-time-recorder@6b {
compatible = "dallas,ds1682";
reg = <0x6b>;
};
@@ -551,7 +551,7 @@
reg = <0x38>;
};
- adt7411@4a {
+ adc@4a {
compatible = "adi,adt7411";
reg = <0x4a>;
};
@@ -563,7 +563,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>;
@@ -574,12 +574,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>;
};
@@ -591,17 +591,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>;
@@ -639,7 +639,7 @@
};
};
- tca9548@71 {
+ i2c-mux@71 {
compatible = "nxp,pca9548";
pinctrl-names = "default";
reg = <0x71>;
--
2.21.0
On Fri, Aug 23, 2019 at 05:27:47PM -0700, 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]
It doesn't apply to my branch.
Shawn
> ---
> 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 45a978defbdc..6edd682dbd29 100644
> --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
> +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
> @@ -417,7 +417,7 @@
> pinctrl-0 = <&pinctrl_dspi1>;
> status = "okay";
>
> - spi-flash@0 {
> + flash@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> compatible = "jedec,spi-nor";
> @@ -430,7 +430,7 @@
> };
> };
>
> - spi-flash@1 {
> + flash@1 {
> #address-cells = <1>;
> #size-cells = <1>;
> compatible = "jedec,spi-nor";
> @@ -519,7 +519,7 @@
> #gpio-cells = <2>;
> };
>
> - lm75@48 {
> + temp-sensor@48 {
> compatible = "national,lm75";
> reg = <0x48>;
> };
> @@ -534,7 +534,7 @@
> reg = <0x52>;
> };
>
> - ds1682@6b {
> + elapsed-time-recorder@6b {
> compatible = "dallas,ds1682";
> reg = <0x6b>;
> };
> @@ -551,7 +551,7 @@
> reg = <0x38>;
> };
>
> - adt7411@4a {
> + adc@4a {
> compatible = "adi,adt7411";
> reg = <0x4a>;
> };
> @@ -563,7 +563,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>;
> @@ -574,12 +574,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>;
> };
> @@ -591,17 +591,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>;
> @@ -639,7 +639,7 @@
> };
> };
>
> - tca9548@71 {
> + i2c-mux@71 {
> compatible = "nxp,pca9548";
> pinctrl-names = "default";
> reg = <0x71>;
> --
> 2.21.0
>