Skip to content

Commit

Permalink
clk: tegra: EMC clock driver depends on EMC driver
Browse files Browse the repository at this point in the history
The EMC clock driver uses symbols exported by the EMC driver, so it
needs the corresponding dependency to avoid build breakage.

Signed-off-by: Thierry Reding <treding@nvidia.com>
  • Loading branch information
Thierry Reding committed May 13, 2015
1 parent 890d6a5 commit 31b52ba
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 1 deletion.
1 change: 1 addition & 0 deletions drivers/clk/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,4 @@ source "drivers/clk/bcm/Kconfig"
source "drivers/clk/mvebu/Kconfig"

source "drivers/clk/samsung/Kconfig"
source "drivers/clk/tegra/Kconfig"
3 changes: 3 additions & 0 deletions drivers/clk/tegra/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
config TEGRA_CLK_EMC
def_bool y
depends on TEGRA124_EMC
3 changes: 2 additions & 1 deletion drivers/clk/tegra/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ obj-y += clk-tegra-periph.o
obj-y += clk-tegra-pmc.o
obj-y += clk-tegra-fixed.o
obj-y += clk-tegra-super-gen4.o
obj-$(CONFIG_TEGRA_CLK_EMC) += clk-emc.o
obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += clk-tegra20.o
obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += clk-tegra30.o
obj-$(CONFIG_ARCH_TEGRA_114_SOC) += clk-tegra114.o
obj-$(CONFIG_ARCH_TEGRA_124_SOC) += clk-tegra124.o clk-emc.o
obj-$(CONFIG_ARCH_TEGRA_124_SOC) += clk-tegra124.o
obj-$(CONFIG_ARCH_TEGRA_132_SOC) += clk-tegra124.o
9 changes: 9 additions & 0 deletions drivers/clk/tegra/clk.h
Original file line number Diff line number Diff line change
Expand Up @@ -623,8 +623,17 @@ void tegra_super_clk_gen4_init(void __iomem *clk_base,
void __iomem *pmc_base, struct tegra_clk *tegra_clks,
struct tegra_clk_pll_params *pll_params);

#ifdef CONFIG_TEGRA_CLK_EMC
struct clk *tegra_clk_register_emc(void __iomem *base, struct device_node *np,
spinlock_t *lock);
#else
static inline struct clk *tegra_clk_register_emc(void __iomem *base,
struct device_node *np,
spinlock_t *lock)
{
return NULL;
}
#endif

void tegra114_clock_tune_cpu_trimmers_high(void);
void tegra114_clock_tune_cpu_trimmers_low(void);
Expand Down

0 comments on commit 31b52ba

Please sign in to comment.