Make Tegra memory drivers to use devm_tegra_core_dev_init_opp_table()
Subsystems (2)
cover Make Tegra memory drivers to use devm_tegra_core_dev_init_opp_table()
Tegra20/30 memory drivers could take advantage of the new helper which initializes OPP table right now [1]. Other memory drivers can't be switched to the new helper until core voltage scaling will be supported by the corresponding Tegra SoC generations, for now only Tegra20/30 SoCs support core voltage scaling in the upstream kernel.
Please note that [1] hasn't been reviewed and merged yet.
[1] https://lore.kernel.org/lkml/[email protected]/T/#m247b51a938244c500d70c38cdb9d44adb5f389a7
Dmitry Osipenko (2):
memory: tegra20-emc: Use devm_tegra_core_dev_init_opp_table()
memory: tegra30-emc: Use devm_tegra_core_dev_init_opp_table()
drivers/memory/tegra/tegra20-emc.c | 48 +++--------------------------- drivers/memory/tegra/tegra30-emc.c | 48 +++--------------------------- 2 files changed, 8 insertions(+), 88 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/2 memory: tegra20-emc: Use devm_tegra_core_dev_init_opp_table()
Use common devm_tegra_core_dev_init_opp_table() helper for the OPP table initialization.
--- drivers/memory/tegra/tegra20-emc.c | 48 +++--------------------------- 1 file changed, 4 insertions(+), 44 deletions(-)
drivers/memory/tegra/tegra20-emc.c +4 -44
@@ -908,49 +908,6 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)return err; } -static int tegra_emc_opp_table_init (struct tegra_emc *emc) -{ -u32 hw_version =BIT (tegra_sku_info.soc_process_id); -struct opp_table *hw_opp_table; -int 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); -return err; - } - - err =dev_pm_opp_of_add_table (emc->dev); -if (err) { -if (err == -ENODEV ) -dev_err (emc->dev,"OPP table not found, please update your device tree\n" ); -else -dev_err (emc->dev,"failed to add OPP table: %d\n" , err); - - goto put_hw_table; - } - -dev_info_once (emc->dev,"OPP HW ver. 0x%x, current clock rate %lu MHz\n" , - hw_version,clk_get_rate (emc->clk) /1000000 ); - -/* first dummy rate-set initializes voltage state */ - err =dev_pm_opp_set_rate (emc->dev,clk_get_rate (emc->clk)); -if (err) { -dev_err (emc->dev,"failed to initialize OPP clock: %d\n" , err); - goto remove_table; - } - -return 0 ; - -remove_table: -dev_pm_opp_of_remove_table (emc->dev); -put_hw_table: -dev_pm_opp_put_supported_hw (hw_opp_table); - -return err; -} -static void devm_tegra_emc_unset_callback (void *data) {tegra20_clk_set_emc_round_callback (NULL ,NULL );
@@ -1077,6 +1034,7 @@ static int tegra_emc_devfreq_init(struct tegra_emc *emc)static int tegra_emc_probe (struct platform_device *pdev) { +struct tegra_core_opp_params opp_params = {};struct device_node *np;struct tegra_emc *emc;int irq, err;
@@ -1122,7 +1080,9 @@ static int tegra_emc_probe(struct platform_device *pdev)if (err)return err; - err =tegra_emc_opp_table_init (emc); + opp_params.init_state = true; + + err =devm_tegra_core_dev_init_opp_table (&pdev->dev, &opp_params);if (err)return err;
Signature · 1 line
2.30.2
PATCH 2/2 memory: tegra30-emc: Use devm_tegra_core_dev_init_opp_table()
In reply to Dmitry OsipenkoUse common devm_tegra_core_dev_init_opp_table() helper for the OPP table initialization.
--- drivers/memory/tegra/tegra30-emc.c | 48 +++--------------------------- 1 file changed, 4 insertions(+), 44 deletions(-)
drivers/memory/tegra/tegra30-emc.c +4 -44
@@ -1480,49 +1480,6 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)return err; } -static int tegra_emc_opp_table_init (struct tegra_emc *emc) -{ -u32 hw_version =BIT (tegra_sku_info.soc_speedo_id); -struct opp_table *hw_opp_table; -int 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); -return err; - } - - err =dev_pm_opp_of_add_table (emc->dev); -if (err) { -if (err == -ENODEV ) -dev_err (emc->dev,"OPP table not found, please update your device tree\n" ); -else -dev_err (emc->dev,"failed to add OPP table: %d\n" , err); - - goto put_hw_table; - } - -dev_info_once (emc->dev,"OPP HW ver. 0x%x, current clock rate %lu MHz\n" , - hw_version,clk_get_rate (emc->clk) /1000000 ); - -/* first dummy rate-set initializes voltage state */ - err =dev_pm_opp_set_rate (emc->dev,clk_get_rate (emc->clk)); -if (err) { -dev_err (emc->dev,"failed to initialize OPP clock: %d\n" , err); - goto remove_table; - } - -return 0 ; - -remove_table: -dev_pm_opp_of_remove_table (emc->dev); -put_hw_table: -dev_pm_opp_put_supported_hw (hw_opp_table); - -return err; -} -static void devm_tegra_emc_unset_callback (void *data) {tegra20_clk_set_emc_round_callback (NULL ,NULL );
@@ -1568,6 +1525,7 @@ static int tegra_emc_init_clk(struct tegra_emc *emc)static int tegra_emc_probe (struct platform_device *pdev) { +struct tegra_core_opp_params opp_params = {};struct device_node *np;struct tegra_emc *emc;int err;
@@ -1617,7 +1575,9 @@ static int tegra_emc_probe(struct platform_device *pdev)if (err)return err; - err =tegra_emc_opp_table_init (emc); + opp_params.init_state = true; + + err =devm_tegra_core_dev_init_opp_table (&pdev->dev, &opp_params);if (err)return err;
Signature · 1 line
2.30.2