Commit 31b52ba4 authored by Thierry Reding's avatar Thierry Reding
Browse files

clk: tegra: EMC clock driver depends on EMC driver 



The EMC clock driver uses symbols exported by the EMC driver, so it
needs the corresponding dependency to avoid build breakage.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 890d6a54

drivers/clk/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -158,3 +158,4 @@ source "drivers/clk/bcm/Kconfig" 
source "drivers/clk/mvebu/Kconfig"



source "drivers/clk/samsung/Kconfig"

source "drivers/clk/tegra/Kconfig"

drivers/clk/tegra/Kconfig

0 → 100644
+3 −0
Original line number Diff line number Diff line 
config TEGRA_CLK_EMC

	def_bool y

	depends on TEGRA124_EMC

drivers/clk/tegra/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/clk/tegra/clk.h

+9 −0
Original line number Diff line number Diff line
@@ -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);