kernel: bump 4.14 to 4.14.50 for 18.06

[openwrt/openwrt.git] / target / linux / oxnas / files / arch / arm / mach-oxnas / mach-ox820.c

diff --git a/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c b/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
index 718bad7194aa3822ee147523557bdf232eee5f63..31b7c90582345134ec7abe4006e5603fb1a95ddd 100644 (file)
--- a/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
+++ b/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
@@ -73,7 +73,7 @@ static void __init ox820_dt_init(void)
 static void __init ox820_timer_init(void)
 {
        of_clk_init(NULL);
-       clocksource_of_init();
+       clocksource_probe();
 }
 
 void ox820_init_early(void)
@@ -147,12 +147,12 @@ void ox820_assert_system_reset(enum reboot_mode mode, const char *cmd)
        writel(0, SYS_CTRL_ALTERNATIVE_SEL);
        writel(0, SYS_CTRL_PULLUP_SEL);
 
-       writel(0, SYS_CTRL_SECONDARY_SEL);
-       writel(0, SYS_CTRL_TERTIARY_SEL);
-       writel(0, SYS_CTRL_QUATERNARY_SEL);
-       writel(0, SYS_CTRL_DEBUG_SEL);
-       writel(0, SYS_CTRL_ALTERNATIVE_SEL);
-       writel(0, SYS_CTRL_PULLUP_SEL);
+       writel(0, SEC_CTRL_SECONDARY_SEL);
+       writel(0, SEC_CTRL_TERTIARY_SEL);
+       writel(0, SEC_CTRL_QUATERNARY_SEL);
+       writel(0, SEC_CTRL_DEBUG_SEL);
+       writel(0, SEC_CTRL_ALTERNATIVE_SEL);
+       writel(0, SEC_CTRL_PULLUP_SEL);
 
        /* No need to save any state, as the ROM loader can determine whether
         * reset is due to power cycling or programatic action, just hit the