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

Commit 7f3da7e4 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 kona platforms"

parents 54b39457 ff62c904

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

+5 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */
@@ -10,3 +10,7 @@ 
&qupv3_se12_2uart {

	status = "disabled";

};



&pm8150a_amoled {

	status = "ok";

};

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

+5 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */
@@ -10,3 +10,7 @@ 
&qupv3_se12_2uart {

	status = "disabled";

};



&pm8150a_amoled {

	status = "ok";

};

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

+5 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */



#include "kona-pmic-overlay.dtsi"
@@ -8,3 +8,7 @@ 
&qupv3_se12_2uart {

	status = "disabled";

};



&pm8150a_amoled {

	status = "ok";

};

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

+35 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

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

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



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

#include <dt-bindings/interrupt-controller/irq.h>
@@ -326,6 +326,40 @@ 
				linux,default-trigger = "timer";

			};

		};



		pm8150a_amoled: qcom,amoled {

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

			#address-cells = <1>;

			#size-cells = <1>;

			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/configs/vendor/kona-perf_defconfig

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

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_QPNP_AMOLED=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_STUB=y

CONFIG_MEDIA_SUPPORT=y