diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/clock.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c index dec8937821bf..89a33790f602 100644 --- a/arch/arm/mach-tegra/clock.c +++ b/arch/arm/mach-tegra/clock.c @@ -34,6 +34,12 @@ #include "clock.h" #include "dvfs.h" +#ifdef CONFIG_ARCH_TEGRA_2x_SOC +#define DISABLE_BOOT_CLOCKS 1 +#else +#define DISABLE_BOOT_CLOCKS 0 /* !!!FIXME!!! DISABLED FOR EMMC ON CARDHU */ +#endif + /* * Locking: * @@ -579,6 +585,7 @@ __setup("tegra_keep_boot_clocks", tegra_keep_boot_clocks_setup); */ static int __init tegra_init_disable_boot_clocks(void) { +#if DISABLE_BOOT_CLOCKS unsigned long flags; struct clk *c; @@ -604,6 +611,7 @@ static int __init tegra_init_disable_boot_clocks(void) } mutex_unlock(&clock_list_lock); +#endif return 0; } late_initcall(tegra_init_disable_boot_clocks); diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index e72dad8ac422..e83823a5d3bf 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -97,7 +97,7 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = { { "sdmmc1", "pll_p", 48000000, false}, { "sdmmc2", "pll_p", 48000000, false}, { "sdmmc3", "pll_p", 48000000, false}, - { "sdmmc4", "pll_p", 48000000, false}, + { "sdmmc4", "clk_m", 12000000, true}, { NULL, NULL, 0, 0}, }; |