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

Commit 0530af5a 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 LCDB and REVID device for pm855L"

parents 2c30fa38 cfea6211

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

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

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

 * Copyright (c) 2017-2018, 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
@@ -21,6 +21,11 @@ 
		#address-cells = <2>;

		#size-cells = <0>;



		pm855l_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";

			reg = <0x100 0x100>;

		};



		pm855l_tz: qcom,temp-alarm@2400 {

			compatible = "qcom,spmi-temp-alarm";

			reg = <0x2400 0x100>;
@@ -35,6 +40,31 @@ 
		reg = <0x5 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pm855l_lcdb: qcom,lcdb@ec00 {

			compatible = "qcom,qpnp-lcdb-regulator";

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0xec00 0x100>;

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

			interrupt-names = "sc-irq";



			qcom,pmic-revid = <&pm855l_revid>;



			lcdb_ldo_vreg: ldo {

				label = "ldo";

				regulator-name = "lcdb_ldo";

				regulator-min-microvolt = <4000000>;

				regulator-max-microvolt = <6000000>;

			};



			lcdb_ncp_vreg: ncp {

				label = "ncp";

				regulator-name = "lcdb_ncp";

				regulator-min-microvolt = <4000000>;

				regulator-max-microvolt = <6000000>;

			};

		};

	};

};

arch/arm64/configs/sdm855-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ CONFIG_THERMAL_TSENS=y 
CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y

CONFIG_MEDIA_SUPPORT=y
@@ -352,6 +353,7 @@ CONFIG_STAGING=y 
CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QPNP_REVID=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_IPA3=y

arch/arm64/configs/sdm855_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ CONFIG_THERMAL_TSENS=y 
CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y

CONFIG_MEDIA_SUPPORT=y
@@ -363,6 +364,7 @@ CONFIG_STAGING=y 
CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QPNP_REVID=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_IPA3=y