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

Commit 1a8cc339 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: Fix the address/size values for PMI8950/PMI632"

parents ac76b601 d77f8f65

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

+2 −2
Original line number Diff line number Diff line
@@ -1391,8 +1391,8 @@ 
		interrupts = <GIC_SPI 190 IRQ_TYPE_NONE>;

		qcom,ee = <0>;

		qcom,channel = <0>;

		#address-cells = <2>;

		#size-cells = <0>;

		#address-cells = <1>;

		#size-cells = <1>;

		interrupt-controller;

		#interrupt-cells = <4>;

		cell-index = <0>;

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

+4 −3
Original line number Diff line number Diff line
@@ -106,15 +106,16 @@ 
			interrupts = <0x0 0xc0 0 IRQ_TYPE_NONE>,

				<0x0 0xc1 0 IRQ_TYPE_NONE>,

				<0x0 0xc3 0 IRQ_TYPE_NONE>,

				<0x0 0xc4 0 IRQ_TYPE_NONE>,

				<0x0 0xc6 0 IRQ_TYPE_NONE>,

				<0x0 0xc7 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm8953_gpio1", "pm8953_gpio2",

					"pm8953_gpio4", "pm8953_gpio7",

					"pm8953_gpio8";

					"pm8953_gpio4", "pm8953_gpio5",

					"pm8953_gpio7", "pm8953_gpio8";



			gpio-controller;

			#gpio-cells = <2>;

			qcom,gpios-disallowed = <3 5 6>;

			qcom,gpios-disallowed = <3 6>;

		};



		pm8953_vadc: vadc@3100 {

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

+4 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
	qcom,pmi632@2 {

		compatible = "qcom,spmi-pmic";

		reg = <0x2 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;

		#address-cells = <1>;

		#size-cells = <1>;



		pmi632_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";
@@ -432,8 +432,8 @@ 
	pmi632_3: qcom,pmi632@3 {

		compatible ="qcom,spmi-pmic";

		reg = <0x3 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;

		#address-cells = <1>;

		#size-cells = <1>;



		pmi632_vib: qcom,vibrator@5700 {

			compatible = "qcom,qpnp-vibrator-ldo";

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

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
	qcom,pmi8950@2 {

		compatible ="qcom,spmi-pmic";

		reg = <0x2 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;

		#address-cells = <1>;

		#size-cells = <1>;



		pmi8950_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";