Commit 3dcbd36f authored Feb 28, 2020 by Thierry Reding

clk: tegra: Rename Tegra124 EMC clock source file



This code is only used on Tegra124, so rename it accordingly to make it
more consistent with other file names.

While at it, also get rid of the TEGRA_CLK_EMC Kconfig symbol that's
really just an alias for TEGRA124_EMC.

Signed-off-by: Thierry Reding <treding@nvidia.com>

parent 7967175a

drivers/clk/tegra/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		config TEGRA_CLK_EMC
		def_bool y
		depends on TEGRA124_EMC

		config CLK_TEGRA_BPMP
		def_bool y
		depends on TEGRA_BPMP

drivers/clk/tegra/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ obj-y += clk-tegra-audio.o
		obj-y += clk-tegra-periph.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_2x_SOC) += clk-tegra20-emc.o
		obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += clk-tegra30.o
		@@ -22,6 +21,7 @@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += clk-tegra20-emc.o
		obj-$(CONFIG_ARCH_TEGRA_114_SOC) += clk-tegra114.o
		obj-$(CONFIG_ARCH_TEGRA_124_SOC) += clk-tegra124.o
		obj-$(CONFIG_TEGRA_CLK_DFLL) += clk-tegra124-dfll-fcpu.o
		obj-$(CONFIG_TEGRA124_EMC) += clk-tegra124-emc.o
		obj-$(CONFIG_ARCH_TEGRA_132_SOC) += clk-tegra124.o
		obj-y += cvb.o
		obj-$(CONFIG_ARCH_TEGRA_210_SOC) += clk-tegra210.o

drivers/clk/tegra/clk-emc.c→drivers/clk/tegra/clk-tegra124-emc.c

+0 −0

File moved.

drivers/clk/tegra/clk.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -866,7 +866,7 @@ void tegra_super_clk_gen5_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
		#ifdef CONFIG_TEGRA124_EMC
		struct clk tegra_clk_register_emc(void __iomem base, struct device_node *np,
		spinlock_t *lock);
		#else