diff mbox

[U-Boot,v2,6/6] sun50i: dts: update DTS to avoid warnings

Message ID 1487796452-25951-7-git-send-email-philipp.tomsich@theobroma-systems.com
State Superseded
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Commit Message

Philipp Tomsich Feb. 22, 2017, 8:47 p.m. UTC 
Nodes that don't contain a reg-entry should not have an @xxx name
attached.  To silence the dt-compiler warnings, we update the DTS.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---
 arch/arm/dts/sun50i-a64.dtsi | 57 ++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 21 deletions(-)

Comments

Maxime Ripard Feb. 22, 2017, 11:20 p.m. UTC | #1 
On Wed, Feb 22, 2017 at 09:47:32PM +0100, Philipp Tomsich wrote:
> +<<<<<<< HEAD
>  				allwinner,drive = <SUN4I_PINCTRL_30_MA>;
>  				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +=======
> +				drive-strength = < 30 >;
> +				bias-pull-up;
>  			};
>  
> -			i2c0_pins: i2c0_pins {
> +			mmc2_8bit_pins: mmc2-8bit {
> +				allwinner,pins = "PC5", "PC6", "PC8",
> +						 "PC9", "PC10", "PC11",
> +						 "PC12", "PC13", "PC14",
> +						 "PC15", "PC16";
> +				allwinner,function = "mmc2";
> +				drive-strength = < 30 >;
> +				bias-pull-up;
> +>>>>>>> 20221b3... [f] dts warnings

Hmmm, are you sure about those ? :)
Philipp Tomsich Feb. 22, 2017, 11:24 p.m. UTC | #2 
> On 23 Feb 2017, at 00:20, Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> 
> On Wed, Feb 22, 2017 at 09:47:32PM +0100, Philipp Tomsich wrote:
>> +<<<<<<< HEAD
>> 				allwinner,drive = <SUN4I_PINCTRL_30_MA>;
>> 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> +=======
>> +				drive-strength = < 30 >;
>> +				bias-pull-up;
>> 			};
>> 
>> -			i2c0_pins: i2c0_pins {
>> +			mmc2_8bit_pins: mmc2-8bit {
>> +				allwinner,pins = "PC5", "PC6", "PC8",
>> +						 "PC9", "PC10", "PC11",
>> +						 "PC12", "PC13", "PC14",
>> +						 "PC15", "PC16";
>> +				allwinner,function = "mmc2";
>> +				drive-strength = < 30 >;
>> +				bias-pull-up;
>> +>>>>>>> 20221b3... [f] dts warnings
> 
> Hmmm, are you sure about those ? :)

I can’t believe this slipped through. I think I need more sleep.
At least the patch-format wasn’t such a mess this time around…

Cheers,
Philipp.
diff mbox

Patch

diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi
index 54b68e0..4911d6a 100644
--- a/arch/arm/dts/sun50i-a64.dtsi
+++ b/arch/arm/dts/sun50i-a64.dtsi
@@ -88,7 +88,7 @@ 
 		method = "smc";
 	};
 
-	memory {
+	memory: memory@40000000 {
 		device_type = "memory";
 		reg = <0x40000000 0>;
 	};
@@ -378,84 +378,84 @@ 
 			interrupt-controller;
 			#interrupt-cells = <3>;
 
-			uart0_pins_a: uart0_pins_a {
+			uart0_pins_a: uart0-pins-a {
 				allwinner,pins = "PB8", "PB9";
 				allwinner,function = "uart0";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart0_pins_b: uart0@1 {
+			uart0_pins_b: uart0-pins-b {
 				allwinner,pins = "PF2", "PF3";
 				allwinner,function = "uart0";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart1_2pins: uart1_2@0 {
+			uart1_2pins: uart1-2pins {
 				allwinner,pins = "PG6", "PG7";
 				allwinner,function = "uart1";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart1_4pins: uart1_4@0 {
+			uart1_4pins: uart1-4pins {
 				allwinner,pins = "PG6", "PG7", "PG8", "PG9";
 				allwinner,function = "uart1";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart2_2pins: uart2_2@0 {
+			uart2_2pins: uart2-2pins {
 				allwinner,pins = "PB0", "PB1";
 				allwinner,function = "uart2";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart2_4pins: uart2_4@0 {
+			uart2_4pins: uart2-4pins {
 				allwinner,pins = "PB0", "PB1", "PB2", "PB3";
 				allwinner,function = "uart2";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart3_pins_a: uart3@0 {
+			uart3_pins_a: uart3-pins-a {
 				allwinner,pins = "PD0", "PD1";
 				allwinner,function = "uart3";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart3_2pins_b: uart3_2@1 {
+			uart3_2pins_b: uart3-2pins-b {
 				allwinner,pins = "PH4", "PH5";
 				allwinner,function = "uart3";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart3_4pins_b: uart3_4@1 {
+			uart3_4pins_b: uart3-4pins-b {
 				allwinner,pins = "PH4", "PH5", "PH6", "PH7";
 				allwinner,function = "uart3";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart4_2pins: uart4_2@0 {
+			uart4_2pins: uart4-2pins {
 				allwinner,pins = "PD2", "PD3";
 				allwinner,function = "uart4";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			uart4_4pins: uart4_4@0 {
+			uart4_4pins: uart4-4pins {
 				allwinner,pins = "PD2", "PD3", "PD4", "PD5";
 				allwinner,function = "uart4";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			mmc0_pins: mmc0@0 {
+			mmc0_pins: mmc0-pins {
 				allwinner,pins = "PF0", "PF1", "PF2", "PF3",
 						 "PF4", "PF5";
 				allwinner,function = "mmc0";
@@ -463,14 +463,14 @@ 
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			mmc0_default_cd_pin: mmc0_cd_pin@0 {
+			mmc0_default_cd_pin: mmc0-cd-pin {
 				allwinner,pins = "PF6";
 				allwinner,function = "gpio_in";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
 			};
 
-			mmc1_pins: mmc1@0 {
+			mmc1_pins: mmc1-pins {
 				allwinner,pins = "PG0", "PG1", "PG2", "PG3",
 						 "PG4", "PG5";
 				allwinner,function = "mmc1";
@@ -478,36 +478,51 @@ 
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			mmc2_pins: mmc2@0 {
+			mmc2_pins: mmc2-pins {
 				allwinner,pins = "PC1", "PC5", "PC6", "PC8",
 						 "PC9", "PC10";
 				allwinner,function = "mmc2";
+<<<<<<< HEAD
 				allwinner,drive = <SUN4I_PINCTRL_30_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+=======
+				drive-strength = < 30 >;
+				bias-pull-up;
 			};
 
-			i2c0_pins: i2c0_pins {
+			mmc2_8bit_pins: mmc2-8bit {
+				allwinner,pins = "PC5", "PC6", "PC8",
+						 "PC9", "PC10", "PC11",
+						 "PC12", "PC13", "PC14",
+						 "PC15", "PC16";
+				allwinner,function = "mmc2";
+				drive-strength = < 30 >;
+				bias-pull-up;
+>>>>>>> 20221b3... [f] dts warnings
+			};
+
+			i2c0_pins: i2c0-pins {
 				allwinner,pins = "PH0", "PH1";
 				allwinner,function = "i2c0";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			i2c1_pins: i2c1_pins {
+			i2c1_pins: i2c1-pins {
 				allwinner,pins = "PH2", "PH3";
 				allwinner,function = "i2c1";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			i2c2_pins: i2c2_pins {
+			i2c2_pins: i2c2-pins {
 				allwinner,pins = "PE14", "PE15";
 				allwinner,function = "i2c2";
 				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			rmii_pins: rmii_pins {
+			rmii_pins: rmii-pins {
 				allwinner,pins = "PD10", "PD11", "PD13", "PD14",
 						 "PD17", "PD18", "PD19", "PD20",
 						 "PD22", "PD23";
@@ -516,7 +531,7 @@ 
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
-			rgmii_pins: rgmii_pins {
+			rgmii_pins: rgmii-pins {
 				allwinner,pins = "PD8", "PD9", "PD10", "PD11",
 						 "PD12", "PD13", "PD15",
 						 "PD16", "PD17", "PD18", "PD19",