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

Commit 6ce1285a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm8994: Rename plutonium to 8994"

parents 563bdf8a 4e29bc3f

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+4 −4
Original line number Diff line number Diff line
@@ -1105,15 +1105,15 @@ sound { 
	pinctrl-3 = <&pmx_pri_mi2s_sleep &pmx_quad_mi2s_sleep>;

};



* MSMPLUTONIUM ASoC Machine driver

* MSM8994 ASoC Machine driver



Required properties:

- compatible : "qcom,msmplutonium-audio-tomtom"

- compatible : "qcom,msm8994-audio-tomtom"

- qcom,model : The user-visible name of this sound card.



Example:



	sound {

		compatible = "qcom,msmplutonium-asoc-snd";

		qcom,model = "msmplutonium-tomtom-snd-card";

		compatible = "qcom,msm8994-asoc-snd";

		qcom,model = "msm8994-tomtom-snd-card";

	};

Documentation/devicetree/bindings/thermal/tsens.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required properties: 
	       should be "qcom,msm8x26-tsens" for 8x26 TSENS driver.

	       should be "qcom,fsm9900-tsens" for 9900 TSENS driver.

	       should be "qcom,mdm9630-tsens" for 9630 TSENS driver.

	       should be "qcom,msmplutonium-tsens" for Plutonium TSENS driver.

	       should be "qcom,msm8994-tsens" for 8994 TSENS driver.

	       The compatible property is used to identify the respective fusemap to use

	       for the corresponding SoC.

- reg : offset and length of the TSENS registers.

arch/arm/boot/dts/qcom/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ dtb-$(CONFIG_ARCH_APQ8084) += apq8084-v1.0-old-pwr-grid-liquid.dtb \ 
	apq8084-v1.1-old-pwr-grid-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-sbc.dtb

dtb-$(CONFIG_ARCH_MSMPLUTONIUM) += msmplutonium-sim.dtb

dtb-$(CONFIG_ARCH_MSMPLUTONIUM) += msmplutonium-rumi.dtb

dtb-$(CONFIG_ARCH_MSM8994) += msm8994-sim.dtb

dtb-$(CONFIG_ARCH_MSM8994) += msm8994-rumi.dtb



DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

ifneq ($(DTB_NAMES),)

arch/arm/boot/dts/qcom/msm-pmplutonium-rpm-regulator.dtsi→arch/arm/boot/dts/qcom/msm-pm8994-rpm-regulator.dtsi

+40 −40
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


		regulator-s1 {

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

			regulator-name = "pmplutonium_s1";

			regulator-name = "pm8994_s1";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -37,7 +37,7 @@ 


		regulator-s2 {

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

			regulator-name = "pmplutonium_s2";

			regulator-name = "pm8994_s2";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -53,7 +53,7 @@ 


		regulator-s3 {

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

			regulator-name = "pmplutonium_s3";

			regulator-name = "pm8994_s3";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -69,7 +69,7 @@ 


		regulator-s4 {

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

			regulator-name = "pmplutonium_s4";

			regulator-name = "pm8994_s4";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -85,7 +85,7 @@ 


		regulator-s5 {

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

			regulator-name = "pmplutonium_s5";

			regulator-name = "pm8994_s5";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -101,7 +101,7 @@ 


		regulator-s7 {

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

			regulator-name = "pmplutonium_s7";

			regulator-name = "pm8994_s7";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -117,7 +117,7 @@ 


		regulator-l1 {

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

			regulator-name = "pmplutonium_l1";

			regulator-name = "pm8994_l1";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -133,7 +133,7 @@ 


		regulator-l2 {

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

			regulator-name = "pmplutonium_l2";

			regulator-name = "pm8994_l2";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -149,7 +149,7 @@ 


		regulator-l3 {

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

			regulator-name = "pmplutonium_l3";

			regulator-name = "pm8994_l3";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -165,7 +165,7 @@ 


		regulator-l4 {

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

			regulator-name = "pmplutonium_l4";

			regulator-name = "pm8994_l4";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -181,7 +181,7 @@ 


		regulator-l6 {

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

			regulator-name = "pmplutonium_l6";

			regulator-name = "pm8994_l6";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -197,7 +197,7 @@ 


		regulator-l8 {

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

			regulator-name = "pmplutonium_l8";

			regulator-name = "pm8994_l8";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -213,7 +213,7 @@ 


		regulator-l9 {

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

			regulator-name = "pmplutonium_l9";

			regulator-name = "pm8994_l9";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -229,7 +229,7 @@ 


		regulator-l10 {

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

			regulator-name = "pmplutonium_l10";

			regulator-name = "pm8994_l10";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -245,7 +245,7 @@ 


		regulator-l11 {

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

			regulator-name = "pmplutonium_l11";

			regulator-name = "pm8994_l11";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -261,7 +261,7 @@ 


		regulator-l12 {

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

			regulator-name = "pmplutonium_l12";

			regulator-name = "pm8994_l12";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -277,7 +277,7 @@ 


		regulator-l13 {

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

			regulator-name = "pmplutonium_l13";

			regulator-name = "pm8994_l13";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -293,7 +293,7 @@ 


		regulator-l14 {

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

			regulator-name = "pmplutonium_l14";

			regulator-name = "pm8994_l14";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -309,7 +309,7 @@ 


		regulator-l15 {

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

			regulator-name = "pmplutonium_l15";

			regulator-name = "pm8994_l15";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -325,7 +325,7 @@ 


		regulator-l16 {

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

			regulator-name = "pmplutonium_l16";

			regulator-name = "pm8994_l16";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -341,7 +341,7 @@ 


		regulator-l17 {

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

			regulator-name = "pmplutonium_l17";

			regulator-name = "pm8994_l17";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -357,7 +357,7 @@ 


		regulator-l18 {

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

			regulator-name = "pmplutonium_l18";

			regulator-name = "pm8994_l18";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -373,7 +373,7 @@ 


		regulator-l19 {

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

			regulator-name = "pmplutonium_l19";

			regulator-name = "pm8994_l19";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -389,7 +389,7 @@ 


		regulator-l20 {

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

			regulator-name = "pmplutonium_l20";

			regulator-name = "pm8994_l20";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -405,7 +405,7 @@ 


		regulator-l21 {

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

			regulator-name = "pmplutonium_l21";

			regulator-name = "pm8994_l21";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -421,7 +421,7 @@ 


		regulator-l22 {

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

			regulator-name = "pmplutonium_l22";

			regulator-name = "pm8994_l22";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -437,7 +437,7 @@ 


		regulator-l23 {

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

			regulator-name = "pmplutonium_l23";

			regulator-name = "pm8994_l23";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -453,7 +453,7 @@ 


		regulator-l24 {

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

			regulator-name = "pmplutonium_l24";

			regulator-name = "pm8994_l24";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -469,7 +469,7 @@ 


		regulator-l25 {

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

			regulator-name = "pmplutonium_l25";

			regulator-name = "pm8994_l25";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -485,7 +485,7 @@ 


		regulator-l26 {

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

			regulator-name = "pmplutonium_l26";

			regulator-name = "pm8994_l26";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -501,7 +501,7 @@ 


		regulator-l27 {

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

			regulator-name = "pmplutonium_l27";

			regulator-name = "pm8994_l27";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -517,7 +517,7 @@ 


		regulator-l28 {

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

			regulator-name = "pmplutonium_l28";

			regulator-name = "pm8994_l28";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -533,7 +533,7 @@ 


		regulator-l29 {

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

			regulator-name = "pmplutonium_l29";

			regulator-name = "pm8994_l29";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -549,7 +549,7 @@ 


		regulator-l30 {

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

			regulator-name = "pmplutonium_l30";

			regulator-name = "pm8994_l30";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -565,7 +565,7 @@ 


		regulator-l31 {

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

			regulator-name = "pmplutonium_l31";

			regulator-name = "pm8994_l31";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -581,7 +581,7 @@ 


		regulator-l32 {

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

			regulator-name = "pmplutonium_l32";

			regulator-name = "pm8994_l32";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -596,7 +596,7 @@ 


		regulator-lvs1 {

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

			regulator-name = "pmplutonium_lvs1";

			regulator-name = "pm8994_lvs1";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -611,7 +611,7 @@ 


		regulator-lvs2 {

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

			regulator-name = "pmplutonium_lvs2";

			regulator-name = "pm8994_lvs2";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -627,7 +627,7 @@ 


		regulator-s1 {

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

			regulator-name = "pmiplutonium_s1";

			regulator-name = "pmi8994_s1";

			qcom,set = <3>;

			status = "disabled";

		};
@@ -643,7 +643,7 @@ 


		regulator-s2 {

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

			regulator-name = "pmiplutonium_s2";

			regulator-name = "pmi8994_s2";

			qcom,set = <3>;

			status = "disabled";

		};

arch/arm/boot/dts/qcom/msm-pmplutonium.dtsi→arch/arm/boot/dts/qcom/msm-pm8994.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -11,25 +11,25 @@ 
 */



&spmi_bus {

	qcom,pmplutonium@0 {

	qcom,pm8994@0 {

		spmi-slave-container;

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0x0>;



		pmplutonium_revid: qcom,revid@100 {

		pm8994_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";

			reg = <0x100 0x100>;

		};



		pmplutonium_gpios: gpios {

		pm8994_gpios: gpios {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pmplutonium-gpio";

			label = "pm8994-gpio";



			gpio@c000 {

				reg = <0xc000 0x100>;
@@ -142,14 +142,14 @@ 
			};

		};



		pmplutonium_mpps: mpps {

		pm8994_mpps: mpps {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pmplutonium-mpp";

			label = "pm8994-mpp";



			mpp@a000 {

				reg = <0xa000 0x100>;
@@ -192,7 +192,7 @@ 
			};

		};



		pmplutonium_vadc: vadc@3100 {

		pm8994_vadc: vadc@3100 {

			compatible = "qcom,qpnp-vadc";

			reg = <0x3100 0x100>;

			#address-cells = <1>;
@@ -237,7 +237,7 @@ 
			};

		};



		pmplutonium_adc_tm: vadc@3400 {

		pm8994_adc_tm: vadc@3400 {

			compatible = "qcom,qpnp-adc-tm";

			reg = <0x3400 0x100>;

			#address-cells = <1>;
@@ -250,11 +250,11 @@ 
						"low-thr-en-set";

			qcom,adc-bit-resolution = <15>;

			qcom,adc-vdd-reference = <1800>;

			qcom,adc_tm-vadc = <&pmplutonium_vadc>;

			qcom,adc_tm-vadc = <&pm8994_vadc>;

		};

	};



	qcom,pmplutonium@1 {

	qcom,pm8994@1 {

		spmi-slave-container;

		#address-cells = <1>;

		#size-cells = <1>;