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>

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 0b474a04730fe4d2c588cb1a3a1818dbff61f995..4942b282de67a30f4a08049669662ce041dad623 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -151,3 +151,4 @@ source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/mvebu/Kconfig"
 
 source "drivers/clk/samsung/Kconfig"
+source "drivers/clk/tegra/Kconfig"

diff --git a/drivers/clk/tegra/Kconfig b/drivers/clk/tegra/Kconfig
new file mode 100644 (file)
index 0000000..1ba30d1
--- /dev/null
+++ b/drivers/clk/tegra/Kconfig
@@ -0,0 +1,3 @@
+config TEGRA_CLK_EMC
+       def_bool y
+       depends on TEGRA124_EMC

diff --git a/drivers/clk/tegra/Makefile b/drivers/clk/tegra/Makefile
index 18c28d1ae400de3d765cdae8f5da4b6c3bc62164..dbc9360e551cae919154bd10d09d39ae59bfcec8 100644 (file)
--- a/drivers/clk/tegra/Makefile
+++ b/drivers/clk/tegra/Makefile
@@ -14,5 +14,6 @@ obj-y                                 += clk-tegra-super-gen4.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
+obj-$(CONFIG_TEGRA_CLK_EMC)            += clk-emc.o

diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h
index 097f972e346cb2f05816d1f4e2e668aad1f2db78..751a9796635418e8cde45bc058a17c777a7cea94 100644 (file)
--- a/drivers/clk/tegra/clk.h
+++ b/drivers/clk/tegra/clk.h
@@ -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_emc_init(struct device_node *np, void __iomem *clk_regs,
                           spinlock_t *lock);
+#else
+static inline struct clk *tegra_emc_init(struct device_node *np,
+                                        void __iomem *clk_regs,
+                                        spinlock_t *lock)
+{
+       return NULL;
+}
+#endif
 
 void tegra114_clock_tune_cpu_trimmers_high(void);
 void tegra114_clock_tune_cpu_trimmers_low(void);

diff --git a/drivers/memory/tegra/Kconfig b/drivers/memory/tegra/Kconfig
index bd78f1fd6e9db9a87b04643d74fde968b2e9cd66..6d74e499e18dde35f7881bacfba302864afde6b6 100644 (file)
--- a/drivers/memory/tegra/Kconfig
+++ b/drivers/memory/tegra/Kconfig
@@ -7,7 +7,7 @@ config TEGRA_MC
          NVIDIA Tegra SoCs.
 
 config TEGRA124_EMC
-       bool "Tegra124 External Memory Controller driver"
+       bool "NVIDIA Tegra124 External Memory Controller driver"
        default y
        depends on TEGRA_MC && ARCH_TEGRA_124_SOC
        help
@@ -15,4 +15,3 @@ config TEGRA124_EMC
          Tegra124 chips. The EMC controls the external DRAM on the board.
          This driver is required to change memory timings / clock rate for
          external memory.
-