diff options
author | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 22:20:34 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 22:20:34 +0100 |
commit | 4d29b82686589fafd4cbdd2de5ae8b72fd5a3149 (patch) | |
tree | 9653aab4f4ec9f68b57372f8ef07a4e316b42784 /drivers/memory/tegra/tegra30-emc.c | |
parent | Merge tag 'memory-controller-drv-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers (diff) | |
parent | memory: tegra: Remove calls to dev_pm_opp_set_clkname() (diff) | |
download | linux-dev-4d29b82686589fafd4cbdd2de5ae8b72fd5a3149.tar.xz linux-dev-4d29b82686589fafd4cbdd2de5ae8b72fd5a3149.zip |
Merge tag 'memory-controller-drv-tegra-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers
Memory controller drivers for v5.12 - Tegra SoC
1. Make the tegra124-emc driver modular.
2. Add interconnect support to Tegra124 memory controller drivers.
3. Minor fixes.
* tag 'memory-controller-drv-tegra-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
memory: tegra: Remove calls to dev_pm_opp_set_clkname()
memory: tegra: Check whether reset is already asserted
memory: tegra124: Support interconnect framework
memory: tegra124-emc: Continue probing if timings are missing in device-tree
memory: tegra124-emc: Make driver modular
Link: https://lore.kernel.org/r/20210131180109.11510-2-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/memory/tegra/tegra30-emc.c')
-rw-r--r-- | drivers/memory/tegra/tegra30-emc.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c index 44ac155936aa..6985da0ffb35 100644 --- a/drivers/memory/tegra/tegra30-emc.c +++ b/drivers/memory/tegra/tegra30-emc.c @@ -1483,21 +1483,14 @@ err_msg: static int tegra_emc_opp_table_init(struct tegra_emc *emc) { u32 hw_version = BIT(tegra_sku_info.soc_speedo_id); - struct opp_table *clk_opp_table, *hw_opp_table; + struct opp_table *hw_opp_table; int err; - clk_opp_table = dev_pm_opp_set_clkname(emc->dev, NULL); - err = PTR_ERR_OR_ZERO(clk_opp_table); - if (err) { - dev_err(emc->dev, "failed to set OPP clk: %d\n", err); - return err; - } - hw_opp_table = dev_pm_opp_set_supported_hw(emc->dev, &hw_version, 1); err = PTR_ERR_OR_ZERO(hw_opp_table); if (err) { dev_err(emc->dev, "failed to set OPP supported HW: %d\n", err); - goto put_clk_table; + return err; } err = dev_pm_opp_of_add_table(emc->dev); @@ -1526,8 +1519,6 @@ remove_table: dev_pm_opp_of_remove_table(emc->dev); put_hw_table: dev_pm_opp_put_supported_hw(hw_opp_table); -put_clk_table: - dev_pm_opp_put_clkname(clk_opp_table); return err; } |