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

Commit 5b890427 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: enable RPM communication for msmcobalt"

parents a82d58c4 ace20aab

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

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

/* Copyright (c) 2015-2016, 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
@@ -205,6 +205,22 @@ 
		};

	};



	rpm-regulator-ldoa5 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <5>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l5 {

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

			regulator-name = "pmcobalt_l5";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa6 {

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

		qcom,resource-name = "ldoa";
@@ -221,6 +237,22 @@ 
		};

	};



	rpm-regulator-ldoa7 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <7>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l7 {

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

			regulator-name = "pmcobalt_l7";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa8 {

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

		qcom,resource-name = "ldoa";

arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi

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

/* Copyright (c) 2015-2016, 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
@@ -315,8 +315,8 @@ 
	rpm-regulator-ldoa18 {

		status = "okay";

		pmcobalt_l18: regulator-l18 {

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			regulator-min-microvolt = <2704000>;

			regulator-max-microvolt = <2704000>;

			status = "okay";

		};

	};
@@ -351,8 +351,8 @@ 
	rpm-regulator-ldoa22 {

		status = "okay";

		pmcobalt_l22: regulator-l22 {

			regulator-min-microvolt = <3312000>;

			regulator-max-microvolt = <3312000>;

			regulator-min-microvolt = <2864000>;

			regulator-max-microvolt = <2864000>;

			status = "okay";

		};

	};

arch/arm/boot/dts/qcom/msmcobalt-rumi.dts

+4 −0
Original line number Diff line number Diff line
@@ -66,3 +66,7 @@ 
&ssphy {

	compatible =  "usb-nop-xceiv";

};



&rpm_bus {

	rpm-standalone;

};

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -551,7 +551,6 @@ 
		compatible = "qcom,rpm-glink";

		qcom,glink-edge = "rpm";

		rpm-channel-name = "rpm_requests";

		rpm-standalone;

	};



	qcom,smdpkt {