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

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

Merge "ARM: dts: msm: Update correct irq for mpm wake-gic for trinket"

parents bf1dc778 a822bc8e

arch/arm64/boot/dts/qcom/trinket.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ 


	wakegic: wake-gic {

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

		interrupts-extended = <&wakegic GIC_SPI 171

		interrupts-extended = <&wakegic GIC_SPI 197

						IRQ_TYPE_EDGE_RISING>;

		reg = <0x45f01b8 0x1000>,

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

arch/arm64/configs/vendor/trinket-perf_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -543,8 +543,6 @@ CONFIG_QCOM_RUN_QUEUE_STATS=y 
CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMD_RPM=y

CONFIG_MSM_SPM=y

CONFIG_MSM_L2_SPM=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

arch/arm64/configs/vendor/trinket_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -566,8 +566,6 @@ CONFIG_QCOM_RUN_QUEUE_STATS=y 
CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMD_RPM=y

CONFIG_MSM_SPM=y

CONFIG_MSM_L2_SPM=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y