[Xenial,snapdragon] UBUNTU: SAUCE: dtb: update LEDs

Message ID 20180629164008.5091-1-jesse.sung@canonical.com
State New
Headers show
Series
  • [Xenial,snapdragon] UBUNTU: SAUCE: dtb: update LEDs
Related show

Commit Message

Wen-chien Jesse Sung June 29, 2018, 4:40 p.m.
From: Vinay Simha BN <vinaysimha@inforcecomputing.com>

BugLink: https://launchpad.net/bugs/1776725

Use rfkill LEDs for BT and WLAN, LED1 as heartbeat, and set LED4 as
default-on.

DS3 - BT LED   - PMIC - MPP_03 (rfkill0)
DS2 - WLAN LED - PMIC - MPP_02 (rfkill1)

DS6 - LED1 - APQ  - GPIO_95  - (heartbeat)
DS5 - LED2 - APQ  - GPIO_120 - (mmc1)
DS1 - LED3 - PMIC - GPIO_01  - (mmc0)
DS4 - LED4 - PMIC - GPIO_02  - (default-on)

Signed-off-by: Vinay Simha BN <vinaysimha@inforcecomputing.com>

(Modify commit log for SRU)
Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
---
 arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Hui Wang July 4, 2018, 3:46 a.m. | #1
Some board specific changes.

Acked-by: Hui Wang <hui.wang@canonical.com>

On 2018年06月30日 00:40, Wen-chien Jesse Sung wrote:
> From: Vinay Simha BN <vinaysimha@inforcecomputing.com>
>
> BugLink: https://launchpad.net/bugs/1776725
>
> Use rfkill LEDs for BT and WLAN, LED1 as heartbeat, and set LED4 as
> default-on.
>
> DS3 - BT LED   - PMIC - MPP_03 (rfkill0)
> DS2 - WLAN LED - PMIC - MPP_02 (rfkill1)
>
> DS6 - LED1 - APQ  - GPIO_95  - (heartbeat)
> DS5 - LED2 - APQ  - GPIO_120 - (mmc1)
> DS1 - LED3 - PMIC - GPIO_01  - (mmc0)
> DS4 - LED4 - PMIC - GPIO_02  - (default-on)
>
> Signed-off-by: Vinay Simha BN <vinaysimha@inforcecomputing.com>
>
> (Modify commit log for SRU)
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> ---
>   arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
> index 68b3c757c17a..56c63ce3dc48 100644
> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
> +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
> @@ -218,7 +218,7 @@
>   
>   			led@1 {
>   				label = "apq8016-sbc:green:user1";
> -				gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
> +				gpios = <&msmgpio 95 GPIO_ACTIVE_HIGH>;
>   				linux,default-trigger = "heartbeat";
>   				default-state = "off";
>   			};
> @@ -240,21 +240,21 @@
>   			led@4 {
>   				label = "apq8016-sbc:green:user4";
>   				gpios = <&pm8916_gpios 2 GPIO_ACTIVE_HIGH>;
> -				linux,default-trigger = "none";
> +				linux,default-trigger = "default-on";
>   				default-state = "off";
>   			};
>   
>   			led@5 {
>   				label = "apq8016-sbc:yellow:wlan";
>   				gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>;
> -				linux,default-trigger = "wlan";
> +				linux,default-trigger = "rfkill1";
>   				default-state = "off";
>   			};
>   
>   			led@6 {
>   				label = "apq8016-sbc:blue:bt";
>   				gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;
> -				linux,default-trigger = "bt";
> +				linux,default-trigger = "rfkill0";
>   				default-state = "off";
>   			};
>   		};
Paolo Pisati July 4, 2018, 3:49 p.m. | #2
Acked-by: Paolo Pisati <paolo.pisati@canonical.com>

Did you check if Bionic needs this too?

On Fri, Jun 29, 2018 at 6:40 PM, Wen-chien Jesse Sung
<jesse.sung@canonical.com> wrote:
> From: Vinay Simha BN <vinaysimha@inforcecomputing.com>
>
> BugLink: https://launchpad.net/bugs/1776725
>
> Use rfkill LEDs for BT and WLAN, LED1 as heartbeat, and set LED4 as
> default-on.
>
> DS3 - BT LED   - PMIC - MPP_03 (rfkill0)
> DS2 - WLAN LED - PMIC - MPP_02 (rfkill1)
>
> DS6 - LED1 - APQ  - GPIO_95  - (heartbeat)
> DS5 - LED2 - APQ  - GPIO_120 - (mmc1)
> DS1 - LED3 - PMIC - GPIO_01  - (mmc0)
> DS4 - LED4 - PMIC - GPIO_02  - (default-on)
>
> Signed-off-by: Vinay Simha BN <vinaysimha@inforcecomputing.com>
>
> (Modify commit log for SRU)
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> ---
>  arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
> index 68b3c757c17a..56c63ce3dc48 100644
> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
> +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
> @@ -218,7 +218,7 @@
>
>                         led@1 {
>                                 label = "apq8016-sbc:green:user1";
> -                               gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
> +                               gpios = <&msmgpio 95 GPIO_ACTIVE_HIGH>;
>                                 linux,default-trigger = "heartbeat";
>                                 default-state = "off";
>                         };
> @@ -240,21 +240,21 @@
>                         led@4 {
>                                 label = "apq8016-sbc:green:user4";
>                                 gpios = <&pm8916_gpios 2 GPIO_ACTIVE_HIGH>;
> -                               linux,default-trigger = "none";
> +                               linux,default-trigger = "default-on";
>                                 default-state = "off";
>                         };
>
>                         led@5 {
>                                 label = "apq8016-sbc:yellow:wlan";
>                                 gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>;
> -                               linux,default-trigger = "wlan";
> +                               linux,default-trigger = "rfkill1";
>                                 default-state = "off";
>                         };
>
>                         led@6 {
>                                 label = "apq8016-sbc:blue:bt";
>                                 gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;
> -                               linux,default-trigger = "bt";
> +                               linux,default-trigger = "rfkill0";
>                                 default-state = "off";
>                         };
>                 };
> --
> 2.17.1
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Stefan Bader July 12, 2018, 1:35 p.m. | #3
Applied to xenial/snapdragon.

Patch

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
index 68b3c757c17a..56c63ce3dc48 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
@@ -218,7 +218,7 @@ 
 
 			led@1 {
 				label = "apq8016-sbc:green:user1";
-				gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
+				gpios = <&msmgpio 95 GPIO_ACTIVE_HIGH>;
 				linux,default-trigger = "heartbeat";
 				default-state = "off";
 			};
@@ -240,21 +240,21 @@ 
 			led@4 {
 				label = "apq8016-sbc:green:user4";
 				gpios = <&pm8916_gpios 2 GPIO_ACTIVE_HIGH>;
-				linux,default-trigger = "none";
+				linux,default-trigger = "default-on";
 				default-state = "off";
 			};
 
 			led@5 {
 				label = "apq8016-sbc:yellow:wlan";
 				gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>;
-				linux,default-trigger = "wlan";
+				linux,default-trigger = "rfkill1";
 				default-state = "off";
 			};
 
 			led@6 {
 				label = "apq8016-sbc:blue:bt";
 				gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;
-				linux,default-trigger = "bt";
+				linux,default-trigger = "rfkill0";
 				default-state = "off";
 			};
 		};