Skip to contentSkip to conversation

Patch "MIPS: ralink: Remove unused rt*_wdt_reset functions" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 15, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: ralink: Remove unused rt*_wdt_reset functions

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-ralink-remove-unused-rt-_wdt_reset-functions.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 886f9c69fc68f56ddea34d3de51ac1fc2ac8dfbc Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Tue, 17 Jan 2017 16:18:43 +0100
Subject: MIPS: ralink: Remove unused rt*_wdt_reset functions

From: Arnd Bergmann <[email protected]>

commit 886f9c69fc68f56ddea34d3de51ac1fc2ac8dfbc upstream.

All pointers to these functions were removed, so now they produce warnings:

arch/mips/ralink/rt305x.c:92:13: error: 'rt305x_wdt_reset' defined but not used [-Werror=unused-function]

This removes the functions. If we need them again, the patch can be reverted later.

Fixes f576fb6a0700 ("MIPS: ralink: cleanup the soc specific pinmux data")
Cc John Crispin <[email protected]>
Cc Colin Ian King <[email protected]>

Patchwork: https://patchwork.linux-mips.org/patch/15044/

---
 arch/mips/ralink/rt288x.c |   10 ----------
 arch/mips/ralink/rt305x.c |   11 -----------
 arch/mips/ralink/rt3883.c |   10 ----------
 3 files changed, 31 deletions(-)
arch/mips/ralink/rt288x.c +0 -10
@@ -40,16 +40,6 @@ static struct rt2880_pmx_group rt2880_pi
 	{ 0 }
 };
 
-static void rt288x_wdt_reset(void)
-{
-	u32 t;
-
-	/* enable WDT reset output on pin SRAM_CS_N */
-	t = rt_sysc_r32(SYSC_REG_CLKCFG);
-	t |= CLKCFG_SRAM_CS_N_WDT;
-	rt_sysc_w32(t, SYSC_REG_CLKCFG);
-}
-
 void __init ralink_clk_init(void)
 {
 	unsigned long cpu_rate, wmac_rate = 40000000;
arch/mips/ralink/rt305x.c +0 -11
@@ -89,17 +89,6 @@ static struct rt2880_pmx_group rt5350_pi
 	{ 0 }
 };
 
-static void rt305x_wdt_reset(void)
-{
-	u32 t;
-
-	/* enable WDT reset output on pin SRAM_CS_N */
-	t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG);
-	t |= RT305X_SYSCFG_SRAM_CS0_MODE_WDT <<
-		RT305X_SYSCFG_SRAM_CS0_MODE_SHIFT;
-	rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
-}
-
 static unsigned long rt5350_get_mem_size(void)
 {
 	void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
arch/mips/ralink/rt3883.c +0 -10
@@ -63,16 +63,6 @@ static struct rt2880_pmx_group rt3883_pi
 	{ 0 }
 };
 
-static void rt3883_wdt_reset(void)
-{
-	u32 t;
-
-	/* enable WDT reset output on GPIO 2 */
-	t = rt_sysc_r32(RT3883_SYSC_REG_SYSCFG1);
-	t |= RT3883_SYSCFG1_GPIO2_AS_WDT_OUT;
-	rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1);
-}
-
 void __init ralink_clk_init(void)
 {
 	unsigned long cpu_rate, sys_rate;

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/mips-ip27-disable-qlge-driver-in-defconfig.patch queue-4.10/mips-update-ip27_defconfig-for-scsi_dh-change.patch queue-4.10/mtd-pmcmsp-use-kstrndup-instead-of-kmalloc-strncpy.patch queue-4.10/mips-vdso-avoid-duplicate-cac_base-definition.patch queue-4.10/mips-ip22-fix-ip28-build-for-modern-gcc.patch queue-4.10/mips-update-lemote2f_defconfig-for-cpu_freq_stat-change.patch queue-4.10/crypto-improve-gcc-optimization-flags-for-serpent-and-wp512.patch queue-4.10/mips-ralink-remove-unused-rt-_wdt_reset-functions.patch queue-4.10/mips-ralink-remove-unused-timer-functions.patch queue-4.10/mips-update-defconfigs-for-nf_ct_proto_dccp-udplite-change.patch