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

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

Merge "msm: watchdog-v2: move watchdog driver to driver/soc/qcom"

parents 0791dcb3 e5006cba

arch/arm/mach-msm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -1088,14 +1088,6 @@ config MSM_BUS_RPM_MULTI_TIER_ENABLED 
	bool "RPM Multi-tiering Configuration"

	depends on MSM_BUS_SCALING



config MSM_WATCHDOG_V2

	bool "MSM Watchdog Support"

	help

		This enables the watchdog module. It causes kernel panic if the

		watchdog times out. It allows for detection of cpu hangs and

		deadlocks. It does not run during the bootup process, so it will

		not catch any early lockups.



config MSM_DLOAD_MODE

	bool "Enable download mode on crashes"

	default n

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ obj-$(CONFIG_ARCH_FSM9900) += board-fsm9900.o board-fsm9900-gpiomux.o 
obj-$(CONFIG_ARCH_FSM9900) += clock-fsm9900.o

obj-$(CONFIG_ARCH_FSM9900) += clock-krait-8974.o

obj-$(CONFIG_ARCH_FSM9900) += rfic-fsm9900.o bbif-fsm9900.o

obj-$(CONFIG_MSM_WATCHDOG_V2) += msm_watchdog_v2.o

obj-$(CONFIG_QPNP_BMS) += bms-batterydata.o bms-batterydata-desay.o

obj-$(CONFIG_QPNP_BMS) += bms-batterydata-oem.o bms-batterydata-qrd-4v35-2000mah.o bms-batterydata-qrd-4v2-1300mah.o

obj-$(CONFIG_ARCH_APQ8084) += board-8084.o board-8084-gpiomux.o

drivers/soc/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -94,6 +94,14 @@ config MSM_MEMORY_DUMP 
	  of deadlocks or cpu hangs these dump regions are captured to

	  give a snapshot of the system at the time of the crash.



config MSM_WATCHDOG_V2

	bool "MSM Watchdog Support"

	help

	  This enables the watchdog module. It causes kernel panic if the

	  watchdog times out. It allows for detection of cpu hangs and

	  deadlocks. It does not run during the bootup process, so it will

	  not catch any early lockups.



source "drivers/soc/qcom/memshare/Kconfig"



endif # ARCH_MSM

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,5 +13,6 @@ obj-$(CONFIG_MSM_SCM) += scm.o 


obj-$(CONFIG_MSM_SMEM) += smem.o smem_debug.o

obj-$(CONFIG_MSM_SMEM_LOGGING) += smem_log.o

obj-$(CONFIG_MSM_WATCHDOG_V2) += watchdog_v2.o

obj-$(CONFIG_MEM_SHARE_QMI_SERVICE)		+= memshare/

obj-y		+= socinfo.o

arch/arm/mach-msm/msm_watchdog_v2.c→drivers/soc/qcom/watchdog_v2.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static void dump_pdata(struct msm_watchdog_data *pdata) 
	dev_dbg(pdata->dev, "wdog bark_time %d", pdata->bark_time);

	dev_dbg(pdata->dev, "wdog pet_time %d", pdata->pet_time);

	dev_dbg(pdata->dev, "wdog perform ipi ping %d", pdata->do_ipi_ping);

	dev_dbg(pdata->dev, "wdog base address is 0x%x\n", (unsigned int)

	dev_dbg(pdata->dev, "wdog base address is 0x%lx\n", (unsigned long)

								pdata->base);

}