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

Commit e58fd61c 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: Change the resource name for LPI CX/MX regulators"

parents 77fadbc4 cfdf1187

arch/arm/boot/dts/qcom/msm-pm660l-rpm-regulator.dtsi

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

/* Copyright (c) 2016-2017, 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
@@ -193,7 +193,7 @@ 


	rpm-regulator-ldob9 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "rwsc";

		qcom,resource-name = "rwlc";

		qcom,resource-id = <0>;

		qcom,regulator-type = <0>;

		status = "disabled";
@@ -208,7 +208,7 @@ 


	rpm-regulator-ldob10 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "rwsm";

		qcom,resource-name = "rwlm";

		qcom,resource-id = <0>;

		qcom,regulator-type = <0>;

		status = "disabled";

arch/arm/boot/dts/qcom/msm8998-interposer-pm660.dtsi

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

/* Copyright (c) 2016-2017, 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
@@ -245,3 +245,13 @@ 
	/delete-node/cpr4-ctrl@05061000;

	/delete-node/regulator@01fcf004;

};



&rpm_bus {

	rpm-regulator-ldob9 {

		qcom,resource-name = "rwsc";

	};



	rpm-regulator-ldob10 {

		qcom,resource-name = "rwsm";

	};

};