| Message ID | 20190327113317.10785-2-festevam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] ARM: dts: imx: Switch Zii dts to SPDX identifier | expand |
On Wed, Mar 27, 2019 at 08:33:17AM -0300, Fabio Estevam 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: Fabio Estevam <festevam@gmail.com> > --- > arch/arm/boot/dts/vf610-zii-cfu1.dts | 8 ++++---- > arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 14 +++++++------- > arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 8 ++++---- > arch/arm/boot/dts/vf610-zii-dev.dtsi | 4 ++-- > arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 10 +++++----- > arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 8 ++++---- > 6 files changed, 26 insertions(+), 26 deletions(-) > > diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts > index 6c78122401a1..5a1be11ad1d3 100644 > --- a/arch/arm/boot/dts/vf610-zii-cfu1.dts > +++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts > @@ -89,7 +89,7 @@ > pinctrl-0 = <&pinctrl_dspi1>; > status = "okay"; > > - m25p128@0 { > + flash@0 { > #address-cells = <1>; > #size-cells = <1>; > compatible = "m25p128", "jedec,spi-nor"; > @@ -207,7 +207,7 @@ > pinctrl-0 = <&pinctrl_i2c0>; > status = "okay"; > > - pca9554@22 { > + io-expander9554@22 { s/io-expander9554/io-expander > compatible = "nxp,pca9554"; > reg = <0x22>; > gpio-controller; > @@ -218,13 +218,13 @@ > reg = <0x48>; > }; > > - at24c04@52 { > + eeprom@52 { > compatible = "atmel,24c04"; > reg = <0x52>; > label = "nvm"; > }; > > - at24c04@54 { > + eeprom4@54 { s/eeprom4/eeprom > compatible = "atmel,24c04"; > reg = <0x54>; > label = "nameplate"; > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > index e5fb9d9924f3..914c355ab495 100644 > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > @@ -300,7 +300,7 @@ > &gpio1 8 GPIO_ACTIVE_HIGH>; > num-chipselects = <2>; > > - m25p128@0 { > + flash@0 { > compatible = "m25p128", "jedec,spi-nor"; > #address-cells = <1>; > #size-cells = <1>; > @@ -329,7 +329,7 @@ > pinctrl-0 = <&pinctrl_i2c0>; > status = "okay"; > > - gpio5: pca9554@20 { > + gpio5: io-expander@20 { > compatible = "nxp,pca9554"; > reg = <0x20>; > gpio-controller; > @@ -337,7 +337,7 @@ > > }; > > - gpio6: pca9554@22 { > + gpio6: io-expander@22 { > compatible = "nxp,pca9554"; > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_pca9554_22>; > @@ -370,7 +370,7 @@ > #size-cells = <0>; > reg = <0>; > > - sfp1: at24c04@50 { > + sfp1: eeprom@50 { > compatible = "atmel,24c02"; > reg = <0x50>; > }; > @@ -381,7 +381,7 @@ > #size-cells = <0>; > reg = <1>; > > - sfp2: at24c04@50 { > + sfp2: eeprom@50 { > compatible = "atmel,24c02"; > reg = <0x50>; > }; > @@ -392,7 +392,7 @@ > #size-cells = <0>; > reg = <2>; > > - sfp3: at24c04@50 { > + sfp3: eeprom@50 { > compatible = "atmel,24c02"; > reg = <0x50>; > }; > @@ -403,7 +403,7 @@ > #size-cells = <0>; > reg = <3>; > > - sfp4: at24c04@50 { > + sfp4: eeprom@50 { > compatible = "atmel,24c02"; > reg = <0x50>; > }; > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > index e9e660aafc07..01191a23dfea 100644 > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > @@ -239,7 +239,7 @@ > status = "okay"; > spi-num-chipselects = <2>; > > - m25p128@0 { > + flash@0 { > compatible = "m25p128", "jedec,spi-nor"; > #address-cells = <1>; > #size-cells = <1>; > @@ -275,7 +275,7 @@ > * P1 - WE2_CMD > * P2 - WE2_CLK > */ > - gpio5: pca9557@18 { > + gpio5: io-expander@18 { > compatible = "nxp,pca9557"; > reg = <0x18>; > gpio-controller; > @@ -323,7 +323,7 @@ > * IO0 - WE1_CLK > * IO1 - WE1_CMD > */ > - gpio7: pca9554@22 { > + gpio7: io-expander@22 { > compatible = "nxp,pca9554"; > reg = <0x22>; > gpio-controller; > @@ -333,7 +333,7 @@ > }; > > &i2c1 { > - at24mac602@50 { > + eeprom@50 { > compatible = "atmel,24c02"; > reg = <0x50>; > read-only; > diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi > index 19eb4a849efb..36bbb8a9f4d8 100644 > --- a/arch/arm/boot/dts/vf610-zii-dev.dtsi > +++ b/arch/arm/boot/dts/vf610-zii-dev.dtsi > @@ -147,12 +147,12 @@ > reg = <0x48>; > }; > > - at24c04@50 { > + eeprom@50 { > compatible = "atmel,24c04"; > reg = <0x50>; > }; > > - at24c04@52 { > + eeprom@52 { > compatible = "atmel,24c04"; > reg = <0x52>; > }; > diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > index e3952e9ea0db..0a0259b20f0b 100644 > --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > @@ -505,14 +505,14 @@ > pinctrl-0 = <&pinctrl_i2c0>; > status = "okay"; > > - gpio5: pca9554@20 { > + gpio5: io-expander@20 { > compatible = "nxp,pca9554"; > reg = <0x20>; > gpio-controller; > #gpio-cells = <2>; > }; > > - gpio6: pca9554@22 { > + gpio6: io-expander@22 { > compatible = "nxp,pca9554"; > reg = <0x22>; > gpio-controller; > @@ -524,12 +524,12 @@ > reg = <0x48>; > }; > > - at24c04@50 { > + eeprom@50 { > compatible = "atmel,24c04"; > reg = <0x50>; > }; > > - at24c04@52 { > + eeprom@52 { > compatible = "atmel,24c04"; > reg = <0x52>; > }; > @@ -577,7 +577,7 @@ > reg = <0x4f>; > }; > > - gpio7: pca9555@23 { > + gpio7: io-expanderf@23 { s/io-expanderf/io-expander Shawn > compatible = "nxp,pca9555"; > gpio-controller; > #gpio-cells = <2>; > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > index 8366bae632d6..453fce80f858 100644 > --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > @@ -69,7 +69,7 @@ > */ > status = "disabled"; > > - m25p128@0 { > + flash@0 { > #address-cells = <1>; > #size-cells = <1>; > compatible = "m25p128", "jedec,spi-nor"; > @@ -194,7 +194,7 @@ > pinctrl-0 = <&pinctrl_i2c0>; > status = "okay"; > > - gpio6: pca9505@22 { > + gpio6: io-expander@22 { > compatible = "nxp,pca9554"; > reg = <0x22>; > gpio-controller; > @@ -206,13 +206,13 @@ > reg = <0x48>; > }; > > - at24c04@50 { > + eeprom@50 { > compatible = "atmel,24c04"; > reg = <0x50>; > label = "nameplate"; > }; > > - at24c04@52 { > + eeprom@52 { > compatible = "atmel,24c04"; > reg = <0x52>; > }; > -- > 2.17.1 >
diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts index 6c78122401a1..5a1be11ad1d3 100644 --- a/arch/arm/boot/dts/vf610-zii-cfu1.dts +++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts @@ -89,7 +89,7 @@ pinctrl-0 = <&pinctrl_dspi1>; status = "okay"; - m25p128@0 { + flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "m25p128", "jedec,spi-nor"; @@ -207,7 +207,7 @@ pinctrl-0 = <&pinctrl_i2c0>; status = "okay"; - pca9554@22 { + io-expander9554@22 { compatible = "nxp,pca9554"; reg = <0x22>; gpio-controller; @@ -218,13 +218,13 @@ reg = <0x48>; }; - at24c04@52 { + eeprom@52 { compatible = "atmel,24c04"; reg = <0x52>; label = "nvm"; }; - at24c04@54 { + eeprom4@54 { compatible = "atmel,24c04"; reg = <0x54>; label = "nameplate"; diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts index e5fb9d9924f3..914c355ab495 100644 --- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts @@ -300,7 +300,7 @@ &gpio1 8 GPIO_ACTIVE_HIGH>; num-chipselects = <2>; - m25p128@0 { + flash@0 { compatible = "m25p128", "jedec,spi-nor"; #address-cells = <1>; #size-cells = <1>; @@ -329,7 +329,7 @@ pinctrl-0 = <&pinctrl_i2c0>; status = "okay"; - gpio5: pca9554@20 { + gpio5: io-expander@20 { compatible = "nxp,pca9554"; reg = <0x20>; gpio-controller; @@ -337,7 +337,7 @@ }; - gpio6: pca9554@22 { + gpio6: io-expander@22 { compatible = "nxp,pca9554"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pca9554_22>; @@ -370,7 +370,7 @@ #size-cells = <0>; reg = <0>; - sfp1: at24c04@50 { + sfp1: eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; }; @@ -381,7 +381,7 @@ #size-cells = <0>; reg = <1>; - sfp2: at24c04@50 { + sfp2: eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; }; @@ -392,7 +392,7 @@ #size-cells = <0>; reg = <2>; - sfp3: at24c04@50 { + sfp3: eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; }; @@ -403,7 +403,7 @@ #size-cells = <0>; reg = <3>; - sfp4: at24c04@50 { + sfp4: eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; }; diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts index e9e660aafc07..01191a23dfea 100644 --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts @@ -239,7 +239,7 @@ status = "okay"; spi-num-chipselects = <2>; - m25p128@0 { + flash@0 { compatible = "m25p128", "jedec,spi-nor"; #address-cells = <1>; #size-cells = <1>; @@ -275,7 +275,7 @@ * P1 - WE2_CMD * P2 - WE2_CLK */ - gpio5: pca9557@18 { + gpio5: io-expander@18 { compatible = "nxp,pca9557"; reg = <0x18>; gpio-controller; @@ -323,7 +323,7 @@ * IO0 - WE1_CLK * IO1 - WE1_CMD */ - gpio7: pca9554@22 { + gpio7: io-expander@22 { compatible = "nxp,pca9554"; reg = <0x22>; gpio-controller; @@ -333,7 +333,7 @@ }; &i2c1 { - at24mac602@50 { + eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; read-only; diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi index 19eb4a849efb..36bbb8a9f4d8 100644 --- a/arch/arm/boot/dts/vf610-zii-dev.dtsi +++ b/arch/arm/boot/dts/vf610-zii-dev.dtsi @@ -147,12 +147,12 @@ reg = <0x48>; }; - at24c04@50 { + eeprom@50 { compatible = "atmel,24c04"; reg = <0x50>; }; - at24c04@52 { + eeprom@52 { compatible = "atmel,24c04"; reg = <0x52>; }; diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts index e3952e9ea0db..0a0259b20f0b 100644 --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts @@ -505,14 +505,14 @@ pinctrl-0 = <&pinctrl_i2c0>; status = "okay"; - gpio5: pca9554@20 { + gpio5: io-expander@20 { compatible = "nxp,pca9554"; reg = <0x20>; gpio-controller; #gpio-cells = <2>; }; - gpio6: pca9554@22 { + gpio6: io-expander@22 { compatible = "nxp,pca9554"; reg = <0x22>; gpio-controller; @@ -524,12 +524,12 @@ reg = <0x48>; }; - at24c04@50 { + eeprom@50 { compatible = "atmel,24c04"; reg = <0x50>; }; - at24c04@52 { + eeprom@52 { compatible = "atmel,24c04"; reg = <0x52>; }; @@ -577,7 +577,7 @@ reg = <0x4f>; }; - gpio7: pca9555@23 { + gpio7: io-expanderf@23 { compatible = "nxp,pca9555"; gpio-controller; #gpio-cells = <2>; diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts index 8366bae632d6..453fce80f858 100644 --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts @@ -69,7 +69,7 @@ */ status = "disabled"; - m25p128@0 { + flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "m25p128", "jedec,spi-nor"; @@ -194,7 +194,7 @@ pinctrl-0 = <&pinctrl_i2c0>; status = "okay"; - gpio6: pca9505@22 { + gpio6: io-expander@22 { compatible = "nxp,pca9554"; reg = <0x22>; gpio-controller; @@ -206,13 +206,13 @@ reg = <0x48>; }; - at24c04@50 { + eeprom@50 { compatible = "atmel,24c04"; reg = <0x50>; label = "nameplate"; }; - at24c04@52 { + eeprom@52 { compatible = "atmel,24c04"; reg = <0x52>; };
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: Fabio Estevam <festevam@gmail.com> --- arch/arm/boot/dts/vf610-zii-cfu1.dts | 8 ++++---- arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 14 +++++++------- arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 8 ++++---- arch/arm/boot/dts/vf610-zii-dev.dtsi | 4 ++-- arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 10 +++++----- arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-)