| From 91aacff9f40461acd269ccef8da9983e126eb849 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 13 Sep 2018 13:12:31 -0500 |
| Subject: ARM: dts: marvell: Fix SPI and I2C bus warnings |
| |
| From: Rob Herring <robh@kernel.org> |
| |
| [ Upstream commit cf680cc5251487b9a39919c3cda31a108af19cf8 ] |
| |
| dtc has new checks for I2C and SPI buses. Fix the warnings in node names |
| and unit-addresses. |
| |
| arch/arm/boot/dts/dove-cubox.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60" |
| arch/arm/boot/dts/dove-cubox-es.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60" |
| arch/arm/boot/dts/dove-cubox.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' |
| arch/arm/boot/dts/dove-cubox-es.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' |
| arch/arm/boot/dts/dove-dove-db.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' |
| arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' |
| arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@14600: node name for SPI buses should be 'spi' |
| arch/arm/boot/dts/orion5x-kuroboxpro.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" |
| arch/arm/boot/dts/orion5x-linkstation-lschl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" |
| arch/arm/boot/dts/orion5x-linkstation-lsgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" |
| arch/arm/boot/dts/orion5x-linkstation-lswtgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" |
| |
| Cc: Jason Cooper <jason@lakedaemon.net> |
| Cc: Andrew Lunn <andrew@lunn.ch> |
| Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> |
| Cc: Gregory Clement <gregory.clement@bootlin.com> |
| Signed-off-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/dove-cubox.dts | 2 +- |
| arch/arm/boot/dts/dove.dtsi | 6 +++--- |
| arch/arm/boot/dts/orion5x-linkstation.dtsi | 2 +- |
| 3 files changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts |
| index 580e3cbcfbf7c..3e1584e787aec 100644 |
| --- a/arch/arm/boot/dts/dove-cubox.dts |
| +++ b/arch/arm/boot/dts/dove-cubox.dts |
| @@ -87,7 +87,7 @@ |
| status = "okay"; |
| clock-frequency = <100000>; |
| |
| - si5351: clock-generator { |
| + si5351: clock-generator@60 { |
| compatible = "silabs,si5351a-msop"; |
| reg = <0x60>; |
| #address-cells = <1>; |
| diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi |
| index 4a0a5115b2984..250ad0535e8cc 100644 |
| --- a/arch/arm/boot/dts/dove.dtsi |
| +++ b/arch/arm/boot/dts/dove.dtsi |
| @@ -155,7 +155,7 @@ |
| 0xffffe000 MBUS_ID(0x03, 0x01) 0 0x0000800 /* CESA SRAM 2k */ |
| 0xfffff000 MBUS_ID(0x0d, 0x00) 0 0x0000800>; /* PMU SRAM 2k */ |
| |
| - spi0: spi-ctrl@10600 { |
| + spi0: spi@10600 { |
| compatible = "marvell,orion-spi"; |
| #address-cells = <1>; |
| #size-cells = <0>; |
| @@ -168,7 +168,7 @@ |
| status = "disabled"; |
| }; |
| |
| - i2c: i2c-ctrl@11000 { |
| + i2c: i2c@11000 { |
| compatible = "marvell,mv64xxx-i2c"; |
| reg = <0x11000 0x20>; |
| #address-cells = <1>; |
| @@ -218,7 +218,7 @@ |
| status = "disabled"; |
| }; |
| |
| - spi1: spi-ctrl@14600 { |
| + spi1: spi@14600 { |
| compatible = "marvell,orion-spi"; |
| #address-cells = <1>; |
| #size-cells = <0>; |
| diff --git a/arch/arm/boot/dts/orion5x-linkstation.dtsi b/arch/arm/boot/dts/orion5x-linkstation.dtsi |
| index ebd93df5d07a8..b6c9b85951ea6 100644 |
| --- a/arch/arm/boot/dts/orion5x-linkstation.dtsi |
| +++ b/arch/arm/boot/dts/orion5x-linkstation.dtsi |
| @@ -156,7 +156,7 @@ |
| &i2c { |
| status = "okay"; |
| |
| - rtc { |
| + rtc@32 { |
| compatible = "ricoh,rs5c372a"; |
| reg = <0x32>; |
| }; |
| -- |
| 2.20.1 |
| |