| From ddd09a8697aeb02054aa9eb52408cbe0a2dd6a86 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 7 Nov 2018 10:58:01 +0100 |
| Subject: ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning |
| |
| From: Maxime Ripard <maxime.ripard@bootlin.com> |
| |
| [ Upstream commit 438a44ce7e51ce571f942433c6c7cb87c4c0effd ] |
| |
| All our pinctrl nodes were using a node name convention with a unit-address |
| to differentiate the different muxing options. However, since those nodes |
| didn't have a reg property, they were generating warnings in DTC. |
| |
| In order to accomodate for this, convert the old nodes to the syntax we've |
| been using for the new SoCs, including removing the letter suffix of the |
| node labels to the bank of those pins to make things more readable. |
| |
| Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> |
| Acked-by: Chen-Yu Tsai <wens@csie.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 4 ++-- |
| arch/arm/boot/dts/sun8i-v3s.dtsi | 10 +++++----- |
| 2 files changed, 7 insertions(+), 7 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts |
| index 387fc2aa546d6..333df90e8037c 100644 |
| --- a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts |
| +++ b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts |
| @@ -78,7 +78,7 @@ |
| }; |
| |
| &mmc0 { |
| - pinctrl-0 = <&mmc0_pins_a>; |
| + pinctrl-0 = <&mmc0_pins>; |
| pinctrl-names = "default"; |
| broken-cd; |
| bus-width = <4>; |
| @@ -87,7 +87,7 @@ |
| }; |
| |
| &uart0 { |
| - pinctrl-0 = <&uart0_pins_a>; |
| + pinctrl-0 = <&uart0_pb_pins>; |
| pinctrl-names = "default"; |
| status = "okay"; |
| }; |
| diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi |
| index 3a06dc5b37467..da5823c6fa3e6 100644 |
| --- a/arch/arm/boot/dts/sun8i-v3s.dtsi |
| +++ b/arch/arm/boot/dts/sun8i-v3s.dtsi |
| @@ -292,17 +292,17 @@ |
| interrupt-controller; |
| #interrupt-cells = <3>; |
| |
| - i2c0_pins: i2c0 { |
| + i2c0_pins: i2c0-pins { |
| pins = "PB6", "PB7"; |
| function = "i2c0"; |
| }; |
| |
| - uart0_pins_a: uart0@0 { |
| + uart0_pb_pins: uart0-pb-pins { |
| pins = "PB8", "PB9"; |
| function = "uart0"; |
| }; |
| |
| - mmc0_pins_a: mmc0@0 { |
| + mmc0_pins: mmc0-pins { |
| pins = "PF0", "PF1", "PF2", "PF3", |
| "PF4", "PF5"; |
| function = "mmc0"; |
| @@ -310,7 +310,7 @@ |
| bias-pull-up; |
| }; |
| |
| - mmc1_pins: mmc1 { |
| + mmc1_pins: mmc1-pins { |
| pins = "PG0", "PG1", "PG2", "PG3", |
| "PG4", "PG5"; |
| function = "mmc1"; |
| @@ -318,7 +318,7 @@ |
| bias-pull-up; |
| }; |
| |
| - spi0_pins: spi0 { |
| + spi0_pins: spi0-pins { |
| pins = "PC0", "PC1", "PC2", "PC3"; |
| function = "spi0"; |
| }; |
| -- |
| 2.20.1 |
| |
