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

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: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 575c809a c23960dd

+15
+5
drivers/memory/tegra/tegra124-emc.c
··· 1158 1158 emc->debugfs.max_rate = emc->timings[i].rate; 1159 1159 } 1160 1160 1161 + if (!emc->num_timings) { 1162 + emc->debugfs.min_rate = clk_get_rate(emc->clk); 1163 + emc->debugfs.max_rate = emc->debugfs.min_rate; 1164 + } 1165 + 1161 1166 err = clk_set_rate_range(emc->clk, emc->debugfs.min_rate, 1162 1167 emc->debugfs.max_rate); 1163 1168 if (err < 0) {
+5
drivers/memory/tegra/tegra20-emc.c
··· 628 628 emc->debugfs.max_rate = emc->timings[i].rate; 629 629 } 630 630 631 + if (!emc->num_timings) { 632 + emc->debugfs.min_rate = clk_get_rate(emc->clk); 633 + emc->debugfs.max_rate = emc->debugfs.min_rate; 634 + } 635 + 631 636 err = clk_set_rate_range(emc->clk, emc->debugfs.min_rate, 632 637 emc->debugfs.max_rate); 633 638 if (err < 0) {
+5
drivers/memory/tegra/tegra30-emc.c
··· 1256 1256 emc->debugfs.max_rate = emc->timings[i].rate; 1257 1257 } 1258 1258 1259 + if (!emc->num_timings) { 1260 + emc->debugfs.min_rate = clk_get_rate(emc->clk); 1261 + emc->debugfs.max_rate = emc->debugfs.min_rate; 1262 + } 1263 + 1259 1264 err = clk_set_rate_range(emc->clk, emc->debugfs.min_rate, 1260 1265 emc->debugfs.max_rate); 1261 1266 if (err < 0) {