watchdog: tegra: remove CONFIG_TEGRA_USE_SECURE_KERNEL usage

CONFIG_TEGRA_USE_SECURE_KERNEL will be deprecated moving forward.
Since we are using TLK as the secure firmware it makes more sense
to use Trusted Little Kernel driver's config instead.

Bug 1475528

Change-Id: I16e5cf4dbff8ef91524c8ff3c6d28a2589f91435
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/377618

1 files changed, 20 insertions, 20 deletions

diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c
index 9cfe5a2780d4..285c4ac92b0a 100644
--- a/drivers/watchdog/tegra_wdt.c
+++ b/drivers/watchdog/tegra_wdt.c
@@ -3,7 +3,7 @@
  *
  * watchdog driver for NVIDIA tegra internal watchdog
  *
- * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2012-2014, NVIDIA CORPORATION. All rights reserved.
  *
  * based on drivers/watchdog/softdog.c and drivers/watchdog/omap_wdt.c
  *
@@ -69,7 +69,7 @@ struct tegra_wdt {
 	int			tmrsrc;
 	int			timeout;
 	int			status;
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	struct resource		*res_avp_src;
 	void __iomem		*wdt_avp_source;
@@ -155,7 +155,7 @@ struct tegra_wdt *tegra_wdt[MAX_NR_CPU_WDT];
 static inline void tegra_wdt_ping(struct tegra_wdt *wdt)
 {
 	writel(WDT_CMD_START_COUNTER, wdt->wdt_source + WDT_CMD);
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	/* Comment out to test FIQ debugger */
 	if (!watchdog_get_lockup_state())
@@ -204,7 +204,7 @@ static void tegra_wdt_enable(struct tegra_wdt *wdt)
 	writel(val, wdt->wdt_source + WDT_CFG);
 	writel(WDT_CMD_START_COUNTER, wdt->wdt_source + WDT_CMD);
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	val = wdt->tmrsrc | (WDT_CFG_PERIOD << 1) | /*WDT_CFG_INT_EN |*/
 		/*WDT_CFG_SYS_RST_EN |*/ WDT_CFG_PMC2CAR_RST_EN;
@@ -219,7 +219,7 @@ static void tegra_wdt_disable(struct tegra_wdt *wdt)
 	writel(WDT_UNLOCK_PATTERN, wdt->wdt_source + WDT_UNLOCK);
 	writel(WDT_CMD_DISABLE_COUNTER, wdt->wdt_source + WDT_CMD);
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	writel(WDT_UNLOCK_PATTERN, wdt->wdt_avp_source + WDT_UNLOCK);
 	writel(WDT_CMD_DISABLE_COUNTER, wdt->wdt_avp_source + WDT_CMD);
@@ -244,7 +244,7 @@ static irqreturn_t tegra_wdt_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 static irqreturn_t tegra_wdt_avp_interrupt(int irq, void *dev_id)
 {
@@ -429,7 +429,7 @@ static const struct file_operations tegra_wdt_fops = {
 static int tegra_wdt_probe(struct platform_device *pdev)
 {
 	struct resource *res_src, *res_wdt, *res_irq, *res_pmc;
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	struct resource *res_avp_src, *res_avp_irq;
 #endif
@@ -447,13 +447,13 @@ static int tegra_wdt_probe(struct platform_device *pdev)
 	res_pmc = platform_get_resource(pdev, IORESOURCE_MEM, 2);
 	res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	res_avp_src = platform_get_resource(pdev, IORESOURCE_MEM, 4);
 	res_avp_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
 #endif
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	if (!res_src || !res_wdt || !res_avp_src || (!pdev->id && !res_irq) ||
 	    !res_pmc) {
@@ -512,14 +512,14 @@ static int tegra_wdt_probe(struct platform_device *pdev)
 	res_pmc = request_mem_region(res_pmc->start, resource_size(res_pmc),
 				     pdev->name);
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	res_avp_src = request_mem_region(res_avp_src->start,
 					 resource_size(res_avp_src),
 					 pdev->name);
 #endif
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	if (!res_src || !res_wdt || !res_avp_src || !res_pmc) {
 #else
@@ -534,7 +534,7 @@ static int tegra_wdt_probe(struct platform_device *pdev)
 	wdt->wdt_timer = ioremap(res_wdt->start, resource_size(res_wdt));
 	wdt->pmc_base = ioremap(res_pmc->start, resource_size(res_pmc));
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	wdt->wdt_avp_source = ioremap(res_avp_src->start,
 				      resource_size(res_avp_src));
@@ -542,7 +542,7 @@ static int tegra_wdt_probe(struct platform_device *pdev)
 	/* tmrsrc will be used to set WDT_CFG */
 	wdt->tmrsrc = (TMR_SRC_START + pdev->id) % 10;
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	if (!wdt->wdt_source || !wdt->wdt_timer || !wdt->wdt_avp_source ||
 	    !wdt->pmc_base) {
@@ -587,7 +587,7 @@ static int tegra_wdt_probe(struct platform_device *pdev)
 			goto fail;
 		}
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 		ret = request_irq(res_avp_irq->start, tegra_wdt_avp_interrupt,
 				IRQF_DISABLED, "avp_wdt", wdt);
@@ -602,7 +602,7 @@ static int tegra_wdt_probe(struct platform_device *pdev)
 
 	wdt->res_src = res_src;
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	wdt->res_avp_src = res_avp_src;
 #endif
@@ -638,7 +638,7 @@ static int tegra_wdt_probe(struct platform_device *pdev)
 		val |= WDT_CFG_INT_EN;
 		writel(val, wdt->wdt_source + WDT_CFG);
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 		val = readl(wdt->wdt_avp_source + WDT_CFG);
 		val |= WDT_CFG_INT_EN;
@@ -673,7 +673,7 @@ fail:
 	if (res_pmc)
 		release_mem_region(res_pmc->start, resource_size(res_pmc));
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	if (wdt->wdt_avp_source)
 		iounmap(wdt->wdt_avp_source);
@@ -697,7 +697,7 @@ static int tegra_wdt_remove(struct platform_device *pdev)
 		free_irq(wdt->irq, wdt);
 	iounmap(wdt->wdt_source);
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	iounmap(wdt->wdt_avp_source);
 #endif
@@ -708,7 +708,7 @@ static int tegra_wdt_remove(struct platform_device *pdev)
 		iounmap(wdt->pmc_base);
 	release_mem_region(wdt->res_src->start, resource_size(wdt->res_src));
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 	release_mem_region(wdt->res_avp_src->start,
 			   resource_size(wdt->res_avp_src));
@@ -749,7 +749,7 @@ static int tegra_wdt_resume(struct platform_device *pdev)
 		val |= WDT_CFG_INT_EN;
 		writel(val, wdt->wdt_source + WDT_CFG);
 
-#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
+#if defined(CONFIG_TRUSTED_LITTLE_KERNEL) && \
 	defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
 		val = readl(wdt->wdt_avp_source + WDT_CFG);
 		val |= WDT_CFG_INT_EN;