diff options
| -rw-r--r-- | arch/arm/mach-ux500/clock-db8500.c | 20 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/uncompress.h | 1 |
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/mach-ux500/clock-db8500.c b/arch/arm/mach-ux500/clock-db8500.c index 19a549fbcc6..9d9481b7a12 100644 --- a/arch/arm/mach-ux500/clock-db8500.c +++ b/arch/arm/mach-ux500/clock-db8500.c @@ -1230,8 +1230,7 @@ static int __init init_clock_states(void) clk_enable(&p6_pclk1); clk_enable(&p6_pclk2); clk_enable(&p6_pclk3); - if (cpu_is_u8500() && !ux500_is_svp()) - clk_enable(&p6_rng_clk); + clk_enable(&p6_rng_clk); /* * Disable clocks that are on at boot, but should be off. */ @@ -1270,23 +1269,6 @@ late_initcall(init_clock_states); int __init db8500_clk_init(void) { - if (ux500_is_svp()) { - sysclk_ops.enable = NULL; - sysclk_ops.disable = NULL; - prcmu_clk_ops.enable = NULL; - prcmu_clk_ops.disable = NULL; - prcmu_opp100_clk_ops.enable = NULL; - prcmu_opp100_clk_ops.disable = NULL; - prcc_pclk_ops.enable = NULL; - prcc_pclk_ops.disable = NULL; - prcc_kclk_ops.enable = NULL; - prcc_kclk_ops.disable = NULL; - clkout0_ops.enable = NULL; - clkout0_ops.disable = NULL; - clkout1_ops.enable = NULL; - clkout1_ops.disable = NULL; - } - clks_register(u8500_v2_sysclks, ARRAY_SIZE(u8500_v2_sysclks)); clks_register(u8500_clocks, diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h index a81385e6e78..894f7d23f06 100644 --- a/arch/arm/mach-ux500/include/mach/uncompress.h +++ b/arch/arm/mach-ux500/include/mach/uncompress.h @@ -52,7 +52,6 @@ static inline void arch_decomp_setup(void) { /* Check in run time if we run on an U8500 or U5500 */ if (machine_is_u8500() || - machine_is_svp8500v2() || machine_is_hrefv60() || machine_is_snowball()) ux500_uart_base = U8500_UART2_BASE; |