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

Commit f5b81250 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add MPM interrupt controller for scuba"

parents 62745e05 9b54f794

bindings/interrupt-controller/qcom,mpm.txt

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Properties: 
		"qcom,mpm-gic-qcs405"

		"qcom,mpm-gic-trinket"

		"qcom,mpm-gic-bengal"

		"qcom,mpm-gic-scuba"



- interrupts:

	Usage: required

qcom/scuba-pinctrl.dtsi

+45 −0
Original line number Diff line number Diff line
@@ -7,6 +7,51 @@ 
		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

		wakeup-parent = <&wakegpio>;

		irqdomain-map = <0 0 &wakegpio 84 0>,

				<3 0 &wakegpio 75 0>,

				<4 0 &wakegpio 16 0>,

				<6 0 &wakegpio 59 0>,

				<8 0 &wakegpio 63 0>,

				<11 0 &wakegpio 17 0>,

				<13 0 &wakegpio 18 0>,

				<14 0 &wakegpio 51 0>,

				<17 0 &wakegpio 20 0>,

				<18 0 &wakegpio 52 0>,

				<19 0 &wakegpio 53 0>,

				<24 0 &wakegpio 6 0>,

				<25 0 &wakegpio 71 0>,

				<27 0 &wakegpio 73 0>,

				<28 0 &wakegpio 41 0>,

				<31 0 &wakegpio 27 0>,

				<32 0 &wakegpio 54 0>,

				<33 0 &wakegpio 55 0>,

				<34 0 &wakegpio 56 0>,

				<35 0 &wakegpio 57 0>,

				<36 0 &wakegpio 58 0>,

				<39 0 &wakegpio 28 0>,

				<46 0 &wakegpio 29 0>,

				<62 0 &wakegpio 60 0>,

				<63 0 &wakegpio 61 0>,

				<64 0 &wakegpio 62 0>,

				<69 0 &wakegpio 33 0>,

				<70 0 &wakegpio 34 0>,

				<72 0 &wakegpio 72 0>,

				<75 0 &wakegpio 35 0>,

				<79 0 &wakegpio 36 0>,

				<80 0 &wakegpio 21 0>,

				<81 0 &wakegpio 38 0>,

				<86 0 &wakegpio 19 0>,

				<87 0 &wakegpio 42 0>,

				<88 0 &wakegpio 43 0>,

				<89 0 &wakegpio 45 0>,

				<91 0 &wakegpio 74 0>,

				<94 0 &wakegpio 47 0>,

				<95 0 &wakegpio 48 0>,

				<96 0 &wakegpio 49 0>,

				<97 0 &wakegpio 50 0>;

		irqdomain-map-pass-thru = <0 0xff>;

		irqdomain-map-mask = <0xff 0>;



		qupv3_se4_2uart_pins: qupv3_se4_2uart_pins {

			qupv3_se4_2uart_active: qupv3_se4_2uart_active {

qcom/scuba.dtsi

+22 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
	model = "Qualcomm Technologies, Inc. SCUBA";

	compatible = "qcom,scuba";

	qcom,msm-id = <441 0x10000>;

	interrupt-parent = <&intc>;

	interrupt-parent = <&wakegic>;



	#address-cells = <2>;

	#size-cells = <2>;
@@ -283,6 +283,7 @@ 
		compatible = "arm,gic-v3";

		#interrupt-cells = <3>;

		interrupt-controller;

		interrupt-parent = <&intc>;

		#redistributor-regions = <1>;

		redistributor-stride = <0x0 0x20000>;

		reg = <0xf200000 0x10000>,     /* GICD */
@@ -290,6 +291,26 @@ 
		interrupts = <1 9 4>;

	};



	wakegic: wake-gic {

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

		interrupts-extended = <&wakegic GIC_SPI 197

						IRQ_TYPE_EDGE_RISING>;

		reg = <0x45f01b8 0x1000>,

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

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

		qcom,num-mpm-irqs = <96>;

		interrupt-controller;

		interrupt-parent = <&intc>;

		#interrupt-cells = <3>;

	};



	wakegpio: wake-gpio {

		compatible = "qcom,mpm-gpio";

		interrupt-controller;

		interrupt-parent = <&intc>;

		#interrupt-cells = <2>;

	};



	jtag_mm0: jtagmm@9040000 {

		compatible = "qcom,jtagv8-mm";

		reg = <0x9040000 0x1000>;