Skip to content

Commit 5d83a2b

Browse files
committed
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'
2 parents 45a3e24 + a83bfdc commit 5d83a2b

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

drivers/devfreq/exynos-bus.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,7 @@ static struct platform_driver exynos_bus_platdrv = {
518518
};
519519
module_platform_driver(exynos_bus_platdrv);
520520

521+
MODULE_SOFTDEP("pre: exynos_ppmu");
521522
MODULE_DESCRIPTION("Generic Exynos Bus frequency driver");
522523
MODULE_AUTHOR("Chanwoo Choi <cw00.choi@samsung.com>");
523524
MODULE_LICENSE("GPL v2");

drivers/devfreq/mtk-cci-devfreq.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static int mtk_ccifreq_target(struct device *dev, unsigned long *freq,
127127
u32 flags)
128128
{
129129
struct mtk_ccifreq_drv *drv = dev_get_drvdata(dev);
130-
struct clk *cci_pll = clk_get_parent(drv->cci_clk);
130+
struct clk *cci_pll;
131131
struct dev_pm_opp *opp;
132132
unsigned long opp_rate;
133133
int voltage, pre_voltage, inter_voltage, target_voltage, ret;
@@ -139,6 +139,7 @@ static int mtk_ccifreq_target(struct device *dev, unsigned long *freq,
139139
return 0;
140140

141141
inter_voltage = drv->inter_voltage;
142+
cci_pll = clk_get_parent(drv->cci_clk);
142143

143144
opp_rate = *freq;
144145
opp = devfreq_recommended_opp(dev, &opp_rate, 1);

include/linux/devfreq.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ struct devfreq_dev_profile {
108108
unsigned long initial_freq;
109109
unsigned int polling_ms;
110110
enum devfreq_timer timer;
111-
bool is_cooling_device;
112111

113112
int (*target)(struct device *dev, unsigned long *freq, u32 flags);
114113
int (*get_dev_status)(struct device *dev,
@@ -118,6 +117,8 @@ struct devfreq_dev_profile {
118117

119118
unsigned long *freq_table;
120119
unsigned int max_state;
120+
121+
bool is_cooling_device;
121122
};
122123

123124
/**

0 commit comments

Comments
 (0)