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

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

Merge "ARM: dts: msm: Update interrupt property for msm8917"

parents 3cc446c5 370a1053

qcom/msm8917.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ 


	cpu-pmu {

		compatible = "arm,armv8-pmuv3";

		interrupts = <1 7 0xff00>;

		interrupts = <1 7 IRQ_TYPE_LEVEL_HIGH>;

	};



	slim_msm: slim@c140000 {
@@ -942,7 +942,7 @@ 
			<0x200a000 0x2100>;

		reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";

		interrupt-names = "periph_irq";

		interrupts = <GIC_SPI 190 IRQ_TYPE_NONE>;

		interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;

		qcom,ee = <0>;

		qcom,channel = <0>;

		#address-cells = <1>;
@@ -1863,7 +1863,8 @@ 
			    "wlan_tx_status", "alarms_txctl",

			    "alarms_tactl", "pronto_mcu_base";



		interrupts = <0 145 0 0 146 0>;

		interrupts = <0 145 IRQ_TYPE_EDGE_RISING>,

				<0 146 IRQ_TYPE_EDGE_RISING>;

		interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";



		qcom,pronto-vddmx-supply = <&pm8937_l3_level_ao>;

qcom/msm8937.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ 


	cpu-pmu {

		compatible = "arm,armv8-pmuv3";

		interrupts = <1 7 0xff00>;

		interrupts = <1 7 IRQ_TYPE_LEVEL_HIGH>;

	};



	qcom,sps {
@@ -1152,7 +1152,7 @@ 
			<0x200a000 0x2100>;

		reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";

		interrupt-names = "periph_irq";

		interrupts = <GIC_SPI 190 IRQ_TYPE_NONE>;

		interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;

		qcom,ee = <0>;

		qcom,channel = <0>;

		#address-cells = <1>;
@@ -2091,7 +2091,8 @@ 
			    "wlan_tx_status", "alarms_txctl",

			    "alarms_tactl", "pronto_mcu_base";



		interrupts = <0 145 0 0 146 0>;

		interrupts = <0 145 IRQ_TYPE_EDGE_RISING>,

				<0 146 IRQ_TYPE_EDGE_RISING>;

		interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";



		qcom,pronto-vddmx-supply = <&pm8937_l3_level_ao>;

qcom/qm215-camera.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
		reg = <0x1b34000 0x1000>,

			<0x1b00030 0x4>;

		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 78 0>;

		interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "csiphy";

		clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,

			<&gcc GCC_CAMSS_ISPIF_AHB_CLK>,
@@ -38,7 +38,7 @@ 
		reg = <0x1b35000 0x1000>,

			<0x1b00038 0x4>;

		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 79 0>;

		interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "csiphy";

		clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,

			<&gcc GCC_CAMSS_ISPIF_AHB_CLK>,
@@ -60,7 +60,7 @@ 
		compatible = "qcom,csid-v3.4.3", "qcom,csid";

		reg = <0x1b30000 0x400>;

		reg-names = "csid";

		interrupts = <0 51 0>;

		interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1088000>;

		qcom,mipi-csi-vdd-supply = <&pm8916_l2>;