Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / arch / mips / ralink / rt288x.c

diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c
index 285796e6d75c2207f3fa45bb48d09622afaada6c..60e44cc8d2c922d21ab8aa8abac095aca207e340 100644 (file)
--- a/arch/mips/ralink/rt288x.c
+++ b/arch/mips/ralink/rt288x.c
@@ -12,7 +12,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/module.h>
 
 #include <asm/mipsregs.h>
 #include <asm/mach-ralink/ralink_regs.h>
@@ -40,16 +39,6 @@ static struct rt2880_pmx_group rt2880_pinmux_data_act[] = {
        { 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;
@@ -75,6 +64,7 @@ void __init ralink_clk_init(void)
        ralink_clk_add("300100.timer", cpu_rate / 2);
        ralink_clk_add("300120.watchdog", cpu_rate / 2);
        ralink_clk_add("300500.uart", cpu_rate / 2);
+       ralink_clk_add("300900.i2c", cpu_rate / 2);
        ralink_clk_add("300c00.uartlite", cpu_rate / 2);
        ralink_clk_add("400000.ethernet", cpu_rate / 2);
        ralink_clk_add("480000.wmac", wmac_rate);