Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 166620dc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add DT property for sync write delay for WLED"

parents 029a4d44 77f9cccd

arch/arm/boot/dts/qcom/msm-pmi8937.dtsi

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -393,7 +393,7 @@ 
			#pwm-cells = <2>;

		};



		qcom,leds@d800 {

		wled: qcom,leds@d800 {

			compatible = "qcom,qpnp-wled";

			reg = <0xd800 0x100>,

				<0xd900 0x100>;

arch/arm/boot/dts/qcom/msm-pmi8950.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -494,7 +494,7 @@ 


		};



		qcom,leds@d800 {

		wled: qcom,leds@d800 {

			compatible = "qcom,qpnp-wled";

			reg = <0xd800 0x100>,

				<0xd900 0x100>,

arch/arm/boot/dts/qcom/msm8937-cdp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
	qcom,follow-otst2-rb-disabled;

};



&wled {

	qcom,cons-sync-write-delay-us = <1000>;

};



&pm8937_gpios {

	gpio@c100 {

		qcom,mode = <0>;

arch/arm/boot/dts/qcom/msm8937-mtp.dtsi

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -23,6 +23,10 @@ 
	qcom,follow-otst2-rb-disabled;

};



&wled {

	qcom,cons-sync-write-delay-us = <1000>;

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";