diff mbox series

arm64: dts: rockchip: arm64: make the system run light heartbeat

Message ID 20210705050614.75564-1-peterwillcn@gmail.com (mailing list archive)
State New, archived
Headers show
Series arm64: dts: rockchip: arm64: make the system run light heartbeat | expand

Commit Message

Xiaobo Tian July 5, 2021, 5:06 a.m. UTC 
Make the system run light heartbeat, remove the wrong supply voltage.

Signed-off-by: xiaobo <peterwillcn@gmail.com>
---
 .../boot/dts/rockchip/rk3399-nanopi-r4s.dts   | 49 ++++++-------------
 1 file changed, 15 insertions(+), 34 deletions(-)

Comments

Heiko Stuebner July 5, 2021, 8:20 a.m. UTC | #1 
Hi,

Am Montag, 5. Juli 2021, 07:06:14 CEST schrieb xiaobo:
> Make the system run light heartbeat, remove the wrong supply voltage.

as mentioned in the other patch, this patch also does too many things
at once ... and includes unrelated changes like removing that FriendlyElec
header from the top comment.

Similarly a commit message should explain the "why" the change is needed.
The file previously defined 3 LEDs, with your change only 2, so does the
board only have 2 LEDs?

And when you're removing the vcc3v3 supply voltage, this should be
a separate patch and describe why defining that voltage is wrong.


Also please version your patches, as I got this patch 2 times with
1 hour distance, without any mention what changed between them.

The way this should look like is:

----- 8< -----
[PATCH v2] arm64: dts: ...

Commit message

---
changes in v2:
- foo

 .../boot/dts/rockchip/rk3399-nanopi-r4s.dts   | 49 ++++++-------------
 1 file changed, 15 insertions(+), 34 deletions(-)
[...]
----- 8< -----

> 
> Signed-off-by: xiaobo <peterwillcn@gmail.com>

Also please adjust the Signed-off-by line + patch authorship
to reflect your name :-)

I.e. below we can see
 + * Copyright (C) 2020 Xiaobo Tian <peterwillcn@gmail.com>

so Signed-off-by and author should match this please.

You can set this in the git config globally for future work:
$ git config --global user.name "Xiaobo Tian"
$ git config --global user.email peterwillcn@gmail.com

and also for individual commits that already exist with
$ git commit --amend --author="Xiaobo Tian <peterwillcn@gmail.com>"


Thanks
Heiko



> ---
>  .../boot/dts/rockchip/rk3399-nanopi-r4s.dts   | 49 ++++++-------------
>  1 file changed, 15 insertions(+), 34 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
> index fa5809887643..899c6a0fc6a1 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
> @@ -1,14 +1,15 @@
>  // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>  /*
> - * FriendlyElec NanoPC-T4 board device tree source
> - *
> + * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
>   * Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd.
>   * (http://www.friendlyarm.com)
>   *
> + * Copyright (c) 2016 Arm Ltd.
>   * Copyright (c) 2018 Collabora Ltd.
>   *
>   * Copyright (c) 2020 Jensen Huang <jensenhuang@friendlyarm.com>
>   * Copyright (c) 2020 Marty Jones <mj8263788@gmail.com>
> + * Copyright (C) 2020 Xiaobo Tian <peterwillcn@gmail.com>
>   * Copyright (c) 2021 Tianling Shen <cnsztl@gmail.com>
>   */
>  
> @@ -21,28 +22,6 @@ / {
>  
>  	/delete-node/ display-subsystem;
>  
> -	gpio-leds {
> -		pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
> -
> -		/delete-node/ led-0;
> -
> -		lan_led: led-lan {
> -			gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
> -			label = "green:lan";
> -		};
> -
> -		sys_led: led-sys {
> -			gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
> -			label = "red:sys";
> -			default-state = "on";
> -		};
> -
> -		wan_led: led-wan {
> -			gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
> -			label = "green:wan";
> -		};
> -	};
> -
>  	gpio-keys {
>  		pinctrl-0 = <&reset_button_pin>;
>  
> @@ -72,6 +51,18 @@ &i2c4 {
>  	status = "disabled";
>  };
>  
> +&leds {
> +	lan_led: led-1 {
> +		gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
> +		label = "green:lan";
> +	};
> +
> +	wan_led: led-2 {
> +		gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
> +		label = "green:wan";
> +	};
> +};
> +
>  &pcie0 {
>  	max-link-speed = <1>;
>  	num-lanes = <1>;
> @@ -80,16 +71,10 @@ &pcie0 {
>  
>  &pinctrl {
>  	gpio-leds {
> -		/delete-node/ status-led-pin;
> -
>  		lan_led_pin: lan-led-pin {
>  			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
>  		};
>  
> -		sys_led_pin: sys-led-pin {
> -			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -
>  		wan_led_pin: wan-led-pin {
>  			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
>  		};
> @@ -127,7 +112,3 @@ &uart0 {
>  &usbdrd_dwc3_0 {
>  	dr_mode = "host";
>  };
> -
> -&vcc3v3_sys {
> -	vin-supply = <&vcc5v0_sys>;
> -};
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
index fa5809887643..899c6a0fc6a1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -1,14 +1,15 @@ 
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * FriendlyElec NanoPC-T4 board device tree source
- *
+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
  * Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd.
  * (http://www.friendlyarm.com)
  *
+ * Copyright (c) 2016 Arm Ltd.
  * Copyright (c) 2018 Collabora Ltd.
  *
  * Copyright (c) 2020 Jensen Huang <jensenhuang@friendlyarm.com>
  * Copyright (c) 2020 Marty Jones <mj8263788@gmail.com>
+ * Copyright (C) 2020 Xiaobo Tian <peterwillcn@gmail.com>
  * Copyright (c) 2021 Tianling Shen <cnsztl@gmail.com>
  */
 
@@ -21,28 +22,6 @@  / {
 
 	/delete-node/ display-subsystem;
 
-	gpio-leds {
-		pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
-
-		/delete-node/ led-0;
-
-		lan_led: led-lan {
-			gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
-			label = "green:lan";
-		};
-
-		sys_led: led-sys {
-			gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
-			label = "red:sys";
-			default-state = "on";
-		};
-
-		wan_led: led-wan {
-			gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
-			label = "green:wan";
-		};
-	};
-
 	gpio-keys {
 		pinctrl-0 = <&reset_button_pin>;
 
@@ -72,6 +51,18 @@  &i2c4 {
 	status = "disabled";
 };
 
+&leds {
+	lan_led: led-1 {
+		gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
+		label = "green:lan";
+	};
+
+	wan_led: led-2 {
+		gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+		label = "green:wan";
+	};
+};
+
 &pcie0 {
 	max-link-speed = <1>;
 	num-lanes = <1>;
@@ -80,16 +71,10 @@  &pcie0 {
 
 &pinctrl {
 	gpio-leds {
-		/delete-node/ status-led-pin;
-
 		lan_led_pin: lan-led-pin {
 			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
-		sys_led_pin: sys-led-pin {
-			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
 		wan_led_pin: wan-led-pin {
 			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
@@ -127,7 +112,3 @@  &uart0 {
 &usbdrd_dwc3_0 {
 	dr_mode = "host";
 };
-
-&vcc3v3_sys {
-	vin-supply = <&vcc5v0_sys>;
-};