Commit 575c809a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.7-memory' of... 

Merge tag 'tegra-for-5.7-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

memory: tegra: Changes for v5.7-rc1

These patches contain fixes for EMC scaling debugfs support on Tegra20,
Tegra30 and Tegra124.

* tag 'tegra-for-5.7-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  memory: tegra: Correct debugfs clk rate-range on Tegra124
  memory: tegra: Correct debugfs clk rate-range on Tegra30
  memory: tegra: Correct debugfs clk rate-range on Tegra20

Link: https://lore.kernel.org/r/20200313165848.2915133-4-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c23960dd 141267bf

drivers/memory/tegra/tegra124-emc.c

+5 −0
Original line number Diff line number Diff line
@@ -1158,6 +1158,11 @@ static void emc_debugfs_init(struct device *dev, struct tegra_emc *emc) 
			emc->debugfs.max_rate = emc->timings[i].rate;

	}



	if (!emc->num_timings) {

		emc->debugfs.min_rate = clk_get_rate(emc->clk);

		emc->debugfs.max_rate = emc->debugfs.min_rate;

	}



	err = clk_set_rate_range(emc->clk, emc->debugfs.min_rate,

				 emc->debugfs.max_rate);

	if (err < 0) {

drivers/memory/tegra/tegra20-emc.c

+5 −0
Original line number Diff line number Diff line
@@ -628,6 +628,11 @@ static void tegra_emc_debugfs_init(struct tegra_emc *emc) 
			emc->debugfs.max_rate = emc->timings[i].rate;

	}



	if (!emc->num_timings) {

		emc->debugfs.min_rate = clk_get_rate(emc->clk);

		emc->debugfs.max_rate = emc->debugfs.min_rate;

	}



	err = clk_set_rate_range(emc->clk, emc->debugfs.min_rate,

				 emc->debugfs.max_rate);

	if (err < 0) {

drivers/memory/tegra/tegra30-emc.c

+5 −0
Original line number Diff line number Diff line
@@ -1256,6 +1256,11 @@ static void tegra_emc_debugfs_init(struct tegra_emc *emc) 
			emc->debugfs.max_rate = emc->timings[i].rate;

	}



	if (!emc->num_timings) {

		emc->debugfs.min_rate = clk_get_rate(emc->clk);

		emc->debugfs.max_rate = emc->debugfs.min_rate;

	}



	err = clk_set_rate_range(emc->clk, emc->debugfs.min_rate,

				 emc->debugfs.max_rate);

	if (err < 0) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE