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

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

Merge "defconfig: Enable MPM support for msm8909"

parents 2e5193b0 b367d5a1

Documentation/devicetree/bindings/interrupt-controller/qti,mpm.txt

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ Properties: 
Example:



wakegic: wake-gic@7781b8 {

	compatible = "qcom,mpm-gic", "qcom,mpm-gic-msm8953", "qcom,mpm-gic-msm8937";

	compatible = "qcom,mpm-gic", "qcom,mpm-gic-msm8953", "qcom,mpm-gic-msm8937", "qcom,mpm-gic-msm8909";

	interrupts = <GIC_SPI 171 IRQ_TYPE_EDGE_RISING>;

	reg = <0x601d4 0x1000>,

	    <0xb011008 0x4>;  /* MSM_APCS_GCC_BASE 4K */
@@ -85,7 +85,7 @@ properties: 
Example:



wakegpio: wake-gpio {

	compatible = "qcom,mpm-gpio", "qcom,mpm-gpio-msm8953", "qcom,mpm-gpio-msm8937";

	compatible = "qcom,mpm-gpio", "qcom,mpm-gpio-msm8953", "qcom,mpm-gpio-msm8937","qcom,mpm-gpio-msm8909";

	interrupt-controller;

	interrupt-parent = <&tlmm>;

	#interrupt-cells = <2>;

arch/arm/configs/msm8909w-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ CONFIG_QCOM_SPMI_IADC=y 
CONFIG_QCOM_SPMI_VADC=y

CONFIG_QCOM_RRADC=y

CONFIG_PWM=y

CONFIG_QTI_MPM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_SENSORS_SSC=y

arch/arm/configs/msm8909w_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ CONFIG_QCOM_SPMI_IADC=y 
CONFIG_QCOM_SPMI_VADC=y

CONFIG_QCOM_RRADC=y

CONFIG_PWM=y

CONFIG_QTI_MPM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_SENSORS_SSC=y

arch/arm64/boot/dts/qcom/msm8909-pinctrl.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 
		compatible = "qcom,msm8909-pinctrl";

		reg = <0x1000000 0x300000>;

		interrupts = <0 208 0>;

		interrupts-extended = <&wakegic GIC_SPI 208 IRQ_TYPE_NONE>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		interrupt-parent = <&wakegpio>;

		#interrupt-cells = <2>;



		/* sensors */

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

+20 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
			<258 0>,

			<265 0>,

			<275 0>;

	interrupt-parent = <&intc>;

	interrupt-parent = <&wakegic>;



	aliases {

		/* smdtty devices */
@@ -251,11 +251,30 @@ 
	intc: interrupt-controller@b000000 {

		compatible = "qcom,msm-qgic2";

		interrupt-controller;

		interrupt-parent = <&intc>;

		#interrupt-cells = <3>;

		reg = <0x0b000000 0x1000>,

		<0x0b002000 0x1000>;

	};



	wakegic: wake-gic@601d0 {

		compatible = "qcom,mpm-gic-msm8909", "qcom,mpm-gic";

		interrupts = <GIC_SPI 171 IRQ_TYPE_EDGE_RISING>;

		reg = <0x601d0 0x1000>,

			<0xb011008 0x4>;  /* MSM_APCS_GCC_BASE 4K */

		reg-names = "vmpm", "ipc";

		interrupt-controller;

		interrupt-parent = <&intc>;

		#interrupt-cells = <3>;

	};



	wakegpio: wake-gpio {

		compatible = "qcom,mpm-gpio-msm8909", "qcom,mpm-gpio";

		interrupt-controller;

		interrupt-parent = <&intc>;

		#interrupt-cells = <2>;

	};



	restart@4ab000 {

		compatible = "qcom,pshold";

		reg =	<0x4ab000 0x4>,