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

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

Merge changes Idf17998a,I57656152,I4edd234f into msm-4.14 

* changes:
  defconfig: Enable WATCHDOG config for sdmshrike
  ARM: dts: msm: Add watchdog dt node for sdmshrike
  defconfig: Enable PIL driver on sdmshrike target
parents 1c2e1097 560b3c70

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

+11 −0
Original line number Diff line number Diff line
@@ -908,6 +908,17 @@ 
		qcom,smem-states = <&adsp_smp2p_out 0>;

		qcom,smem-state-names = "qcom,force-stop";

	};



	wdog: qcom,wdt@17c10000 {

		compatible = "qcom,msm-watchdog";

		reg = <0x17c10000 0x1000>;

		reg-names = "wdt-base";

		interrupts = <0 0 0>, <0 1 0>;

		qcom,bark-time = <11000>;

		qcom,pet-time = <9360>;

		qcom,ipi-ping;

		qcom,wakeup-enable;

	};

};



&emac_gdsc {

arch/arm64/configs/sdmshrike-perf_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -367,8 +367,13 @@ CONFIG_QCOM_SDMSHRIKE_LLCC=y 
CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QCOM_SMP2P=y

CONFIG_QCOM_SMSM=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_BUS_CONFIG_RPMH=y

CONFIG_QCOM_COMMAND_DB=y

arch/arm64/configs/sdmshrike_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -380,8 +380,14 @@ CONFIG_QCOM_SDMSHRIKE_LLCC=y 
CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QCOM_WDOG_IPI_ENABLE=y

CONFIG_QCOM_SMP2P=y

CONFIG_QCOM_SMSM=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_BUS_CONFIG_RPMH=y

CONFIG_QCOM_COMMAND_DB=y
@@ -443,6 +449,7 @@ CONFIG_SCHEDSTATS=y 
CONFIG_SCHED_STACK_END_CHECK=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_SPINLOCK_PANIC_ON_BUG=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_LIST=y