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

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

Merge changes Icc60d6b5,I8e44088f,I14c15544,I1f4bbf49,I00264ef1 into msm-4.14 

* changes:
  ARM: dts: msm: Enable WLED and LCDB for sdmshrike platforms
  ARM: dts: msm: Enable LCDB selectively in sdm855 platforms
  ARM: dts: msm: add gpio_key devices for buttons on sdmshrike MTP and CDP
  ARM: dts: msm: add PM855, PM855L, and PMK8002 PMIC devices for sdmshrike
  ARM: dts: msm: add SPMI PMIC arbiter device for sdmshrike
parents 8577c219 deacc23a

arch/arm64/boot/dts/qcom/pm855l.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ 
			reg = <0xec00 0x100>;

			interrupts = <0x5 0xec 0x1 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "sc-irq";



			qcom,pmic-revid = <&pm855l_revid>;

			status = "disabled";



			lcdb_ldo_vreg: ldo {

				label = "ldo";

arch/arm64/boot/dts/qcom/sdm855-cdp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -225,6 +225,10 @@ 
	status = "ok";

};



&pm855l_lcdb {

	status = "ok";

};



&pm855b_charger {

	qcom,batteryless-platform;

};

arch/arm64/boot/dts/qcom/sdm855-mtp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -211,6 +211,10 @@ 
	status = "ok";

};



&pm855l_lcdb {

	status = "ok";

};



&pm855b_fg {

	qcom,battery-data = <&mtp_batterydata>;

};

arch/arm64/boot/dts/qcom/sdmshrike-cdp.dtsi

+45 −0
Original line number Diff line number Diff line
@@ -10,6 +10,51 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>



#include "sdmshrike-pmic-overlay.dtsi"



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_home_default

			     &key_vol_up_default>;



		home {

			label = "home";

			gpios = <&pm855_1_gpios 1 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_HOME>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};



		vol_up {

			label = "volume_up";

			gpios = <&pm855_1_gpios 6 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};



&pm855l_wled {

	qcom,string-cfg= <7>;

	status = "ok";

};



&pm855l_lcdb {

	status = "ok";

};



&qupv3_se12_2uart {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sdmshrike-mtp.dtsi

+45 −0
Original line number Diff line number Diff line
@@ -10,6 +10,51 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>



#include "sdmshrike-pmic-overlay.dtsi"



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_home_default

			     &key_vol_up_default>;



		home {

			label = "home";

			gpios = <&pm855_1_gpios 1 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_HOME>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};



		vol_up {

			label = "volume_up";

			gpios = <&pm855_1_gpios 6 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};



&pm855l_wled {

	qcom,string-cfg= <7>;

	status = "ok";

};



&pm855l_lcdb {

	status = "ok";

};



&qupv3_se12_2uart {

	status = "ok";

};