github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 15:12:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

soc/tegra: Changes for v6.7-rc1

Browse Source 
This contains a few minor cleanups for PMC and CBB.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmUpXboTHHRyZWRpbmdA
 bnZpZGlhLmNvbQAKCRDdI6zXfz6zodjZD/9e95B23hid+95CCg1fKhPNo0q056rS
 7qKuPQvNmb1ySR9T0bhwe7PghISD4DFB2KHu5Yp2CFtjP+IkSQuouByp7yaOyL+y
 2P+CuXp0IM6JpfnidvEzjzuVchOu+pN0xVzPcsmjjaWWz495N4v8b2Q0K/RcMu8p
 tQchqjarsgiHr6iuK61gf3EzGrxIuFjI2DomC6PmJJKwdqrAU9nwB6ReaZrtHpiM
 rnxrHVCd2MxlMu9VqiHFyCd3H6gwCQSNZm+04Rzikgm8g22YgPTfTBfDPyxtE7o0
 yZwrNreJunMiMfNQwVbKJnDdcVjvO9xBIzjPrKYx6SOjhTCnIROJsOqFtjhv1873
 nIFzP7iyiwClahHL2yReVPs2XDfVLsfxZjQ2GGuMOsAdsfIENCfVspk03FYRUAgj
 izaGx3iZKZrH+Ds0Kka3+rdM5lfXV1qARYvOyAfqSoP3r0G83uJItM/qVxC/rGSP
 KldNTKDgP1Txj9hx5Yd0opgb7mwaXMPDZA2hP5Tt+aRNJNOU7rXsjiR4uvZdhIru
 8ab0cHOblNpe8cmB8dFjJzpawE/2AzhjQMvixm2OpG8IQyDgXBDW0h85Ud4E4KNF
 c+7Iqo08FYR1l/3WQn5h+2QFX3yJ9KQPM8DiZ4FA+dUMif5reJ61cTW4Zaw8o8eS
 QW9166iQ8r5R8g==
 =08ua
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmUto7IACgkQYKtH/8kJ
 Uie2hg//XypJM5m6EuNNn9LhClz9NEVxN4QwG1vm1uFbAVbmirFO0Qnn88p9oqcE
 mA5DWjTQUu9ORK0a/n7x9MZ4pabtsM4Uq7OQAJnFQclaeyMwOba/C3001Bil6v+E
 rzV+N1oHxNIa3Rr+rgyIfvjZ8ZCT+g10net51Da227ZSf+1e0c3LiJpirVCh9+Xh
 pPOWyg8u0rJoVeT4ArnfL6yf7GG7yr6ssDtI+QF43iigr5K7dj2g6WMs/R/wLawk
 5FagRlIca4xQtRbIFYDLt0jToh7oSOipLNJRRHNrJeihdntVwrNMDe+uFpq1tRw4
 0BoYajiI8k5B9eHHii6X9luJpkqTtHkDNUpw69nXeyxuBueVhA712ONZLPxQGEO+
 itXfS32z4x41I+XIR4ctQQuW3PHU8ZDAArfJLR1L0WUFhXYafJlaztu+fX/sEq/9
 glZK8EXjLjy822uLZBdRrpsdFH0WbWCVdWsXl1XhFKUhMz0TqGJOz5i5sSS48Qje
 QTGxgmN0eM2S/iM+/hFnPgARR6lgblnPL7BUjVEcoj9FTa23kwZ9BNBJZ9MggyT6
 h03/7taIwTpZrAL3QVVqSkkVGcRU2K6JmrWp7488tDv22cpy+5IgPtkEWf1kURCq
 65TQMe3PeNabIrC6Mv54/rzWggV6UDYcQU5B8vIWcOs1yEMRtII=
 =SwSY
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-6.7-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/drivers

soc/tegra: Changes for v6.7-rc1

This contains a few minor cleanups for PMC and CBB.

* tag 'tegra-for-6.7-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: Drop the ->opp_to_performance_state() callback
  soc/tegra: cbb: tegra194-cbb: Convert to platform remove callback returning void

Link: https://lore.kernel.org/r/20231013153723.1729109-1-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-10-16 22:57:21 +02:00
commit 024d4292e4
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/soc/tegra/cbb/tegra194-cbb.c
View File

@ -2293,7 +2293,7 @@ static int tegra194_cbb_probe(struct platform_device *pdev)
return tegra_cbb_register(&cbb->base);
}
static int tegra194_cbb_remove(struct platform_device *pdev)
static void tegra194_cbb_remove(struct platform_device *pdev)
{
struct tegra194_cbb *cbb = platform_get_drvdata(pdev);
struct tegra_cbb *noc, *tmp;
@ -2311,8 +2311,6 @@ static int tegra194_cbb_remove(struct platform_device *pdev)
}
spin_unlock_irqrestore(&cbb_lock, flags);
return 0;
}
static int __maybe_unused tegra194_cbb_resume_noirq(struct device *dev)
@ -2332,7 +2330,7 @@ static const struct dev_pm_ops tegra194_cbb_pm = {
static struct platform_driver tegra194_cbb_driver = {
.probe = tegra194_cbb_probe,
.remove = tegra194_cbb_remove,
.remove_new = tegra194_cbb_remove,
.driver = {
.name = "tegra194-cbb",
.of_match_table = of_match_ptr(tegra194_cbb_match),

8
drivers/soc/tegra/pmc.c
View File

@ -1393,13 +1393,6 @@ tegra_pmc_core_pd_set_performance_state(struct generic_pm_domain *genpd,
return 0;
}
static unsigned int
tegra_pmc_core_pd_opp_to_performance_state(struct generic_pm_domain *genpd,
struct dev_pm_opp *opp)
{
return dev_pm_opp_get_level(opp);
}
static int tegra_pmc_core_pd_add(struct tegra_pmc *pmc, struct device_node *np)
{
struct generic_pm_domain *genpd;
@ -1412,7 +1405,6 @@ static int tegra_pmc_core_pd_add(struct tegra_pmc *pmc, struct device_node *np)
genpd->name = "core";
genpd->set_performance_state = tegra_pmc_core_pd_set_performance_state;
genpd->opp_to_performance_state = tegra_pmc_core_pd_opp_to_performance_state;
err = devm_pm_opp_set_regulators(pmc->dev, rname);
if (err)