tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Thierry Reding <treding@nvidia.com>

Thierry Reding 31b52ba4 890d6a54

+15 -1
+1
drivers/clk/Kconfig
··· 158 158 source "drivers/clk/mvebu/Kconfig" 159 159 160 160 source "drivers/clk/samsung/Kconfig" 161 + source "drivers/clk/tegra/Kconfig"
+3
drivers/clk/tegra/Kconfig
··· 1 + config TEGRA_CLK_EMC 2 + def_bool y 3 + depends on TEGRA124_EMC
+2 -1
drivers/clk/tegra/Makefile
··· 11 11 obj-y += clk-tegra-pmc.o 12 12 obj-y += clk-tegra-fixed.o 13 13 obj-y += clk-tegra-super-gen4.o 14 + obj-$(CONFIG_TEGRA_CLK_EMC) += clk-emc.o 14 15 obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += clk-tegra20.o 15 16 obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += clk-tegra30.o 16 17 obj-$(CONFIG_ARCH_TEGRA_114_SOC) += clk-tegra114.o 17 - obj-$(CONFIG_ARCH_TEGRA_124_SOC) += clk-tegra124.o clk-emc.o 18 + obj-$(CONFIG_ARCH_TEGRA_124_SOC) += clk-tegra124.o 18 19 obj-$(CONFIG_ARCH_TEGRA_132_SOC) += clk-tegra124.o
+9
drivers/clk/tegra/clk.h
··· 623 623 void __iomem *pmc_base, struct tegra_clk *tegra_clks, 624 624 struct tegra_clk_pll_params *pll_params); 625 625 626 + #ifdef CONFIG_TEGRA_CLK_EMC 626 627 struct clk *tegra_clk_register_emc(void __iomem *base, struct device_node *np, 627 628 spinlock_t *lock); 629 + #else 630 + static inline struct clk *tegra_clk_register_emc(void __iomem *base, 631 + struct device_node *np, 632 + spinlock_t *lock) 633 + { 634 + return NULL; 635 + } 636 + #endif 628 637 629 638 void tegra114_clock_tune_cpu_trimmers_high(void); 630 639 void tegra114_clock_tune_cpu_trimmers_low(void);