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

Commit 2a7e2612 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Specify AMOLED regulator device for PM6150"

parents 722436a8 2614a256

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

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

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

 * Copyright (c) 2017-2019, 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
@@ -390,6 +390,38 @@ 
				linux,default-trigger = "timer";

			};

		};



		pm6150a_amoled: qcom,amoled {

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

			status = "disabled";



			oledb_vreg: oledb@e000 {

				reg = <0xe000 0x100>;

				reg-names = "oledb_base";

				regulator-name = "oledb";

				regulator-min-microvolt = <4925000>;

				regulator-max-microvolt = <8100000>;

				qcom,swire-control;

			};



			ab_vreg: ab@de00 {

				reg = <0xde00 0x100>;

				reg-names = "ab_base";

				regulator-name = "ab";

				regulator-min-microvolt = <4600000>;

				regulator-max-microvolt = <6100000>;

				qcom,swire-control;

			};



			ibb_vreg: ibb@dc00 {

				reg = <0xdc00 0x100>;

				reg-names = "ibb_base";

				regulator-name = "ibb";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <5400000>;

				qcom,swire-control;

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdmmagpie-idp.dtsi

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

};



&pm6150a_amoled {

	status = "ok";

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v3";

arch/arm64/boot/dts/qcom/sdmmagpie-qrd.dtsi

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

/* Copyright (c) 2018-2019, 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
@@ -120,6 +120,10 @@ 
	status = "ok";

};



&pm6150a_amoled {

	status = "ok";

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v3";

arch/arm64/configs/vendor/sdmsteppe-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ CONFIG_MFD_I2C_PMIC=y 
CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_QPNP_AMOLED=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_REFGEN=y

CONFIG_REGULATOR_RPMH=y

arch/arm64/configs/vendor/sdmsteppe_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ CONFIG_MFD_I2C_PMIC=y 
CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_QPNP_AMOLED=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_REFGEN=y

CONFIG_REGULATOR_RPMH=y