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

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

Merge "ARM: dts: msm: Add support for MPM wakeup capability for audio interrupt for SDM660/630"

parents 1c7cda65 87fc186a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 */
+1 −1
Original line number Diff line number Diff line
@@ -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 */