From ffa55386f17cff29f6c3ffbe873335511e253932 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Thu, 6 Dec 2018 10:02:29 +0100 Subject: [PATCH] ramips: fix dtc compiler warnings The latest dtc compiler considers nodes named i2c or spi as the respective bus: /pinctrl/i2c: incorrect #address-cells for I2C bus /pinctrl/spi: incorrect #address-cells for SPI bus Rename the node to fix the false positives. Fix the spi node unit address for the DWR-512-B and UBNT-ER-e50 to get rid of the following warning: SPI bus unit address format error, expected "n" Signed-off-by: Mathias Kresin --- target/linux/ramips/dts/DWR-512-B.dts | 2 +- target/linux/ramips/dts/UBNT-ER-e50.dtsi | 2 +- target/linux/ramips/dts/mt7620a.dtsi | 8 ++++---- target/linux/ramips/dts/mt7620n.dtsi | 8 ++++---- target/linux/ramips/dts/mt7621.dtsi | 8 ++++---- target/linux/ramips/dts/mt7628an.dtsi | 8 ++++---- target/linux/ramips/dts/rt2880.dtsi | 8 ++++---- target/linux/ramips/dts/rt3050.dtsi | 8 ++++---- target/linux/ramips/dts/rt3352.dtsi | 8 ++++---- target/linux/ramips/dts/rt3883.dtsi | 8 ++++---- target/linux/ramips/dts/rt5350.dtsi | 8 ++++---- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/target/linux/ramips/dts/DWR-512-B.dts b/target/linux/ramips/dts/DWR-512-B.dts index d1dc97ff7e..d865ced704 100644 --- a/target/linux/ramips/dts/DWR-512-B.dts +++ b/target/linux/ramips/dts/DWR-512-B.dts @@ -115,7 +115,7 @@ &spi1 { status = "okay"; - spidev@1 { + spidev@0 { #address-cells = <1>; #size-cells = <1>; compatible = "siliconlabs,si3210"; diff --git a/target/linux/ramips/dts/UBNT-ER-e50.dtsi b/target/linux/ramips/dts/UBNT-ER-e50.dtsi index 2a983d08ff..b3949a39f0 100644 --- a/target/linux/ramips/dts/UBNT-ER-e50.dtsi +++ b/target/linux/ramips/dts/UBNT-ER-e50.dtsi @@ -91,7 +91,7 @@ */ status = "disabled"; - m25p80@0 { + m25p80@1 { compatible = "jedec,spi-nor"; reg = <1>; spi-max-frequency = <10000000>; diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index 2d6ec49370..150c0e14ca 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -334,8 +334,8 @@ }; }; - spi_pins: spi { - spi { + spi_pins: spi_pins { + spi_pins { ralink,group = "spi"; ralink,function = "spi"; }; @@ -348,8 +348,8 @@ }; }; - i2c_pins: i2c { - i2c { + i2c_pins: i2c_pins { + i2c_pins { ralink,group = "i2c"; ralink,function = "i2c"; }; diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi index 7fa15a6cef..54370a0c75 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/target/linux/ramips/dts/mt7620n.dtsi @@ -255,8 +255,8 @@ }; }; - spi_pins: spi { - spi { + spi_pins: spi_pins { + spi_pins { ralink,group = "spi"; ralink,function = "spi"; }; @@ -269,8 +269,8 @@ }; }; - i2c_pins: i2c { - i2c { + i2c_pins: i2c_pins { + i2c_pins { ralink,group = "i2c"; ralink,function = "i2c"; }; diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi index 3c610e49d5..be4d8eeff9 100644 --- a/target/linux/ramips/dts/mt7621.dtsi +++ b/target/linux/ramips/dts/mt7621.dtsi @@ -239,15 +239,15 @@ state_default: pinctrl0 { }; - i2c_pins: i2c { - i2c { + i2c_pins: i2c_pins { + i2c_pins { ralink,group = "i2c"; ralink,function = "i2c"; }; }; - spi_pins: spi { - spi { + spi_pins: spi_pins { + spi_pins { ralink,group = "spi"; ralink,function = "spi"; }; diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi index b8a8bb9103..91f715c245 100644 --- a/target/linux/ramips/dts/mt7628an.dtsi +++ b/target/linux/ramips/dts/mt7628an.dtsi @@ -281,8 +281,8 @@ state_default: pinctrl0 { }; - spi_pins: spi { - spi { + spi_pins: spi_pins { + spi_pins { ralink,group = "spi"; ralink,function = "spi"; }; @@ -295,8 +295,8 @@ }; }; - i2c_pins: i2c { - i2c { + i2c_pins: i2c_pins { + i2c_pins { ralink,group = "i2c"; ralink,function = "i2c"; }; diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index c163657eda..762fe49e7c 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -158,15 +158,15 @@ }; }; - i2c_pins: i2c { - i2c { + i2c_pins: i2c_pins { + i2c_pins { ralink,group = "i2c"; ralink,function = "i2c"; }; }; - spi_pins: spi { - spi { + spi_pins: spi_pins { + spi_pins { ralink,group = "spi"; ralink,function = "spi"; }; diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index 40b1b2126c..84ddb061e6 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -250,15 +250,15 @@ }; }; - i2c_pins: i2c { - i2c { + i2c_pins: i2c_pins { + i2c_pins { ralink,group = "i2c"; ralink,function = "i2c"; }; }; - spi_pins: spi { - spi { + spi_pins: spi_pins { + spi_pins { ralink,group = "spi"; ralink,function = "spi"; }; diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index 547de2cb4c..548a6bb84a 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -259,8 +259,8 @@ state_default: pinctrl0 { }; - i2c_pins: i2c { - i2c { + i2c_pins: i2c_pins { + i2c_pins { ralink,group = "i2c"; ralink,function = "i2c"; }; @@ -280,8 +280,8 @@ }; }; - spi_pins: spi { - spi { + spi_pins: spi_pins { + spi_pins { ralink,group = "spi"; ralink,function = "spi"; }; diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index 599b3723e9..fffac16911 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -279,15 +279,15 @@ state_default: pinctrl0 { }; - i2c_pins: i2c { - i2c { + i2c_pins: i2c_pins { + i2c_pins { ralink,group = "i2c"; ralink,function = "i2c"; }; }; - spi_pins: spi { - spi { + spi_pins: spi_pins { + spi_pins { ralink,group = "spi"; ralink,function = "spi"; }; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 1cc35f12a3..10ccc52cdc 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -273,15 +273,15 @@ state_default: pinctrl0 { }; - i2c_pins: i2c { - i2c { + i2c_pins: i2c_pins { + i2c_pins { ralink,group = "i2c"; ralink,function = "i2c"; }; }; - spi_pins: spi { - spi { + spi_pins: spi_pins { + spi_pins { ralink,group = "spi"; ralink,function = "spi"; }; -- 2.30.2