github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Update devfreq next for v6.5

Browse Source 
Detailed description for this pull request:
 1. Reorder fieldls in 'struct devfreq_dev_status' in order to shrinks the size
 of 'struct devfreqw_dev_status' without any behavior changes.
 
 2. Add exynos-ppmu.c driver as a soft module dependency in order to prevent
 the freeze issue between exynos-bus.c devfreq driver and exynos-ppmu.c devfreq
 event driver.
 
 3. Fix variable deferencing before NULL check on mtk-cci-devfreq.c
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEsSpuqBtbWtRe4rLGnM3fLN7rz1MFAmSQWaYACgkQnM3fLN7r
 z1PFRhAAgtoZl4vn+PWJv5Zjsh0xOu73VANGQgOLFlheVJ8ggnuRjHKB76aqBe/O
 mmfsGoVaL+6nu+eleF2sgCiiQtAKKyRPKZhpTE5ywDHTDd+azZ2zsRf6oTwyXnkS
 zfhfEyPw/wIgCSyPk9keL61OFKIfEMNCWH0yZPFJCYi1F/1K8jGMo+SHVnmXl2+P
 rWQUoXAvdYgI0yAQpPj3zrWIyzVTwuFaDr2ueCnjgCh0DWI8LCyb/mpfQ9sr2Dzr
 QTrsRv3mJBk5BjMbzxrci8eLembe+fkfBBMk+pVNyEokVQ62cIydBBaqLmL8pfAK
 6S3d1ThgxC0KfpvYfaEsd/8N0fwWbeGDZjcSha9Sv77+h+bSAQbvKKSPL61/2CjK
 roI8zmXl2UB/paJUwWLKZ7nVMOkLfL/hJRArWHo3B5mgevHRQ/1jJzoYOj4WaULk
 pTrOszretEzBAbi9q5naXFau8EV+CMFajcewlpOCMSjBm8u/wYsqQ8TcazyFckuk
 OYFxI/4+9DFIlc0JlK03wIkLpS71/gZUEQNYyFotbhAt73J/8aMsrse35XCgOFmT
 FMBBuT5IL3WllpF+z7+76ZzvX4ppGGlQBcfXMMr6xRu56UTJal0un1dvunSxbeXI
 79Uc9Y48ruO5LKBq7H3LCSq/5DgDdtLnSUtigEGSwhHxXnOKPNs=
 =m2qJ
 -----END PGP SIGNATURE-----

Merge tag 'devfreq-next-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux

Merge devfreq updates for v6.5 from Chanwoo Choi:

"1. Reorder fieldls in 'struct devfreq_dev_status' in order to shrink
    the size of 'struct devfreqw_dev_status' without any behavior
    changes.

 2. Add exynos-ppmu.c driver as a soft module dependency in order to
    prevent the freeze issue between exynos-bus.c devfreq driver and
    exynos-ppmu.c devfreq event driver.

 3. Fix variable deferencing before NULL check on mtk-cci-devfreq.c"

* tag 'devfreq-next-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux:
  PM / devfreq: mtk-cci: Fix variable deferencing before NULL check
  PM / devfreq: exynos: add Exynos PPMU as a soft module dependency
  PM / devfreq: Reorder fields in 'struct devfreq_dev_status'
This commit is contained in:
Rafael J. Wysocki 2023-06-20 11:27:44 +02:00
commit 5d83a2b18b
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/devfreq/exynos-bus.c
View File

@ -518,6 +518,7 @@ static struct platform_driver exynos_bus_platdrv = {
};
module_platform_driver(exynos_bus_platdrv);
MODULE_SOFTDEP("pre: exynos_ppmu");
MODULE_DESCRIPTION("Generic Exynos Bus frequency driver");
MODULE_AUTHOR("Chanwoo Choi <cw00.choi@samsung.com>");
MODULE_LICENSE("GPL v2");

3
drivers/devfreq/mtk-cci-devfreq.c
View File

@ -127,7 +127,7 @@ static int mtk_ccifreq_target(struct device *dev, unsigned long *freq,
u32 flags)
{
struct mtk_ccifreq_drv *drv = dev_get_drvdata(dev);
struct clk *cci_pll = clk_get_parent(drv->cci_clk);
struct clk *cci_pll;
struct dev_pm_opp *opp;
unsigned long opp_rate;
int voltage, pre_voltage, inter_voltage, target_voltage, ret;
@ -139,6 +139,7 @@ static int mtk_ccifreq_target(struct device *dev, unsigned long *freq,
return 0;
inter_voltage = drv->inter_voltage;
cci_pll = clk_get_parent(drv->cci_clk);
opp_rate = *freq;
opp = devfreq_recommended_opp(dev, &opp_rate, 1);

3
include/linux/devfreq.h
View File

@ -108,7 +108,6 @@ struct devfreq_dev_profile {
unsigned long initial_freq;
unsigned int polling_ms;
enum devfreq_timer timer;
bool is_cooling_device;
int (*target)(struct device *dev, unsigned long *freq, u32 flags);
int (*get_dev_status)(struct device *dev,
@ -118,6 +117,8 @@ struct devfreq_dev_profile {
unsigned long *freq_table;
unsigned int max_state;
bool is_cooling_device;
};
/**