Merge ~ondrak/ubuntu/+source/linux/+git/xenial:dtb-update into ~ubuntu-kernel/ubuntu/+source/linux/+git/xenial:snapdragon

[Ondrej Kubik]

UBUNTU: SAUCE: dtb: updating custom apq8016 for snappy to fix LED functionality

  Updating dragonboard 410c device tree LED definition to work properly on Ubuntu Core
  Use rfkill(0/1) for bluetooth and wifi LEDs
  setting LED1 as heartbeat
  setting LED4 as default-on

[Paolo Pisati (p-pisati)]

I don't have write access to the kernel repository, only the stable team has it: resend it to the ubuntu kernel ml for review.

Plus, it's missing an LB bug and the Buglink.

review: Disapprove

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-snappy.dtsi
index 68b3c75..56c63ce 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";
 			};
 		};