arm64: dts: fsl: Fix I2C and SPI bus warnings

[ Upstream commit b739c177e1aeab532f355493439a1901b85be38c ]

dtc has new checks for I2C and SPI buses. Fix the SPI bus node names
and warnings in unit-addresses.

arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@57: I2C bus unit address format error, expected "53"
arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@56: I2C bus unit address format error, expected "52"

Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index 68ac78c4564dc74cdfd0f40697c1b599bee72add..5da732f82fa0cb0fc844b73bfdd20d347a786628 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -337,7 +337,7 @@ i2c1: i2c@2190000 {
                        status = "disabled";
                };
 
-               dspi: dspi@2100000 {
+               dspi: spi@2100000 {
                        compatible = "fsl,ls1012a-dspi", "fsl,ls1021a-v1.0-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 7881e3d81a9aba6134fc66a7d35e6d02daa4009a..b9c0f2de8f12c4ed9be5f25d56a62634c216a221 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -284,7 +284,7 @@ ifc: ifc@1530000 {
                        interrupts = <0 43 0x4>;
                };
 
-               qspi: quadspi@1550000 {
+               qspi: spi@1550000 {
                        compatible = "fsl,ls1043a-qspi", "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -382,7 +382,7 @@ qportals: qman-portals@500000000 {
                        ranges = <0x0 0x5 0x00000000 0x8000000>;
                };
 
-               dspi0: dspi@2100000 {
+               dspi0: spi@2100000 {
                        compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -395,7 +395,7 @@ dspi0: dspi@2100000 {
                        status = "disabled";
                };
 
-               dspi1: dspi@2110000 {
+               dspi1: spi@2110000 {
                        compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
index 440e111651d53d9bba85763f0a04cde2796022b3..a59b48203688a47db12732f019255800b9880def 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
@@ -57,12 +57,12 @@ temp-sensor@4c {
                reg = <0x4c>;
        };
 
-       eeprom@56 {
+       eeprom@52 {
                compatible = "atmel,24c512";
                reg = <0x52>;
        };
 
-       eeprom@57 {
+       eeprom@53 {
                compatible = "atmel,24c512";
                reg = <0x53>;
        };

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index ef83786b8b905d57852ad6637bd2d4dfb5683c43..de6af453a6e168520e2b875521114d5b10ea0444 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -202,7 +202,7 @@ ifc: ifc@1530000 {
                        interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
                };
 
-               qspi: quadspi@1550000 {
+               qspi: spi@1550000 {
                        compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -361,7 +361,7 @@ tmu: tmu@1f00000 {
                        #thermal-sensor-cells = <1>;
                };
 
-               dspi: dspi@2100000 {
+               dspi: spi@2100000 {
                        compatible = "fsl,ls1021a-v1.0-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
index 8cb78dd9967281d06c1cd10c4a55b0bebe337e6e..ebe0cd4bf2b7e2f8539741d61ec14def4565562e 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -469,7 +469,7 @@ smmu: iommu@5000000 {
                        mmu-masters = <&fsl_mc 0x300 0>;
                };
 
-               dspi: dspi@2100000 {
+               dspi: spi@2100000 {
                        status = "disabled";
                        compatible = "fsl,ls2080a-dspi", "fsl,ls2085a-dspi";
                        #address-cells = <1>;
@@ -595,7 +595,7 @@ ifc: ifc@2240000 {
                                  3 0 0x5 0x20000000 0x00010000>;
                };
 
-               qspi: quadspi@20c0000 {
+               qspi: spi@20c0000 {
                        status = "disabled";
                        compatible = "fsl,ls2080a-qspi", "fsl,ls1021a-qspi";
                        #address-cells = <1>;