Commit 4d7ee968 authored by David Lechner's avatar David Lechner Committed by Sekhar Nori
Browse files

ARM: davinci: remove CONFIG_DAVINCI_RESET_CLOCKS 



The common clock framework will take care of disabling unused clocks when
we switch from the legacy davinci clocks and having this enabled will
cause compile errors after we switch, so remove it now.

Signed-off-by: default avatarDavid Lechner <david@lechnology.com>
Reviewed-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent aa1da33c

arch/arm/mach-davinci/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -231,18 +231,6 @@ config DAVINCI_MUX_WARNINGS 
	  to change the pin multiplexing setup. When there are no warnings

	  printed, it's safe to deselect DAVINCI_MUX for your product.



config DAVINCI_RESET_CLOCKS

	bool "Reset unused clocks during boot"

	depends on ARCH_DAVINCI

	help

	  Say Y if you want to reset unused clocks during boot.

	  This option saves power, but assumes all drivers are

	  using the clock framework. Broken drivers that do not

	  yet use clock framework may not work with this option.

	  If you are booting from another operating system, you

	  probably do not want this option enabled until your

	  device drivers work properly.



endmenu



endif

arch/arm/mach-davinci/common.c

+0 −1
Original line number Diff line number Diff line
@@ -118,5 +118,4 @@ void __init davinci_common_init(const struct davinci_soc_info *soc_info) 
void __init davinci_init_late(void)

{

	davinci_cpufreq_init();

	davinci_clk_disable_unused();

}

arch/arm/mach-davinci/include/mach/common.h

+0 −6
Original line number Diff line number Diff line
@@ -83,12 +83,6 @@ extern void davinci_common_init(const struct davinci_soc_info *soc_info); 
extern void davinci_init_ide(void);

void davinci_init_late(void);



#ifdef CONFIG_DAVINCI_RESET_CLOCKS

int davinci_clk_disable_unused(void);

#else

static inline int davinci_clk_disable_unused(void) { return 0; }

#endif



#ifdef CONFIG_CPU_FREQ

int davinci_cpufreq_init(void);

#else