diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-04 10:05:30 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-04 10:05:29 -0700 |
| commit | a6e752c97fa01822b85f63d90fe46333122d2b50 (patch) | |
| tree | a26a6e9e7a4338395e292c096b516e2d4a00e7af /arch | |
| parent | 1c7cda658f36a7ab67763259827b3a85a365187f (diff) | |
| parent | 87fc186a6bfde69e4394edcea3396d63766d2032 (diff) | |
Merge "ARM: dts: msm: Add support for MPM wakeup capability for audio interrupt for SDM660/630"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm630-pm.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-pm.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm630-pm.dtsi b/arch/arm/boot/dts/qcom/sdm630-pm.dtsi index b8272b29aa89..f39f8b880690 100644 --- a/arch/arm/boot/dts/qcom/sdm630-pm.dtsi +++ b/arch/arm/boot/dts/qcom/sdm630-pm.dtsi @@ -343,6 +343,7 @@ <0x02 216>, /* tsens1_tsens_upper_lower_int */ <0x31 212>, /* usb30_power_event_irq */ <0x34 275>, /* qmp_usb3_lfps_rxterm_irq_cx */ + <0x3d 209>, /* lpi_dir_conn_irq_apps[1] */ <0x4f 379>, /* qusb2phy_intr */ <0x57 358>, /* ee0_apps_hlos_spmi_periph_irq */ <0x5b 519>, /* lpass_pmu_tmr_timeout_irq_cx */ @@ -480,7 +481,6 @@ <0xff 206>, /* rpm_ipc[22] */ <0xff 207>, /* rpm_ipc[23] */ <0xff 208>, /* lpi_dir_conn_irq_apps[0] */ - <0xff 209>, /* lpi_dir_conn_irq_apps[1] */ <0xff 210>, /* lpi_dir_conn_irq_apps[2] */ <0xff 213>, /* secure_wdog_bark_irq */ <0xff 214>, /* tsens1_tsens_max_min_int */ diff --git a/arch/arm/boot/dts/qcom/sdm660-pm.dtsi b/arch/arm/boot/dts/qcom/sdm660-pm.dtsi index cdf1e47665fb..679a1b89b2f8 100644 --- a/arch/arm/boot/dts/qcom/sdm660-pm.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-pm.dtsi @@ -341,6 +341,7 @@ qcom,gic-map = <0x02 216>, /* tsens1_tsens_upper_lower_int */ <0x34 275>, /* qmp_usb3_lfps_rxterm_irq_cx */ + <0x3d 209>, /* lpi_dir_conn_irq_apps[1] */ <0x4f 379>, /* qusb2phy_intr for Dm */ <0x50 380>, /* qusb2phy_intr for Dm for secondary PHY */ <0x51 379>, /* qusb2phy_intr for Dp */ @@ -484,7 +485,6 @@ <0xff 206>, /* rpm_ipc[22] */ <0xff 207>, /* rpm_ipc[23] */ <0xff 208>, /* lpi_dir_conn_irq_apps[0] */ - <0xff 209>, /* lpi_dir_conn_irq_apps[1] */ <0xff 210>, /* lpi_dir_conn_irq_apps[2] */ <0xff 212>, /* usb30s_power_event_irq */ <0xff 213>, /* secure_wdog_bark_irq */ |