diff options
| author | qctecmdr <qctecmdr@localhost> | 2021-03-04 02:10:46 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-03-04 02:10:46 -0800 |
| commit | 08d05657f8dc44bdfc79b134e027e5575ed186e4 (patch) | |
| tree | 1200a4b09131c53e33461733d217804a42f29d6b /qcom | |
| parent | 3cc446c5f27e08a81251f39129cdf16e3cf179e2 (diff) | |
| parent | 370a1053e8c14fdf7e3a6f1f24d81f940eeda270 (diff) | |
| download | devicetree-08d05657f8dc44bdfc79b134e027e5575ed186e4.tar.gz | |
Merge "ARM: dts: msm: Update interrupt property for msm8917"
Diffstat (limited to 'qcom')
| -rw-r--r-- | qcom/msm8917.dtsi | 7 | ||||
| -rw-r--r-- | qcom/msm8937.dtsi | 7 | ||||
| -rw-r--r-- | qcom/qm215-camera.dtsi | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/qcom/msm8917.dtsi b/qcom/msm8917.dtsi index 1d08fcce..b9fe945b 100644 --- a/qcom/msm8917.dtsi +++ b/qcom/msm8917.dtsi @@ -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>; diff --git a/qcom/msm8937.dtsi b/qcom/msm8937.dtsi index 376ba8b3..625f84dd 100644 --- a/qcom/msm8937.dtsi +++ b/qcom/msm8937.dtsi @@ -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>; diff --git a/qcom/qm215-camera.dtsi b/qcom/qm215-camera.dtsi index aad0017e..ad547156 100644 --- a/qcom/qm215-camera.dtsi +++ b/qcom/qm215-camera.dtsi @@ -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>; |