Skip to content

Commit 702f21d

Browse files
committed
Merge tag 'devfreq-next-for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux
Pull devfreq updates for 5.17-rc1 from Chanwoo Choi: "1. Add new DRAM controller driver for sunXi SoCs - Add DRAM frequency controller devfreq driver for Allwinner sunXi SoCs in order to support dynamic frequency scaling of DRAM frequency. It calculates the supported frequency list from source clock in the range of full speed to quarter speed instead of devicetree. - Add COMMON_CLK dependency to fix build error 2. Reduce log severity for informative message about frequency transition failures" * tag 'devfreq-next-for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux: PM / devfreq: Reduce log severity for informative message PM / devfreq: sun8i: addd COMMON_CLK dependency PM / devfreq: Add a driver for the sun8i/sun50i MBUS
2 parents fc74e0a + 4667431 commit 702f21d

File tree

4 files changed

+523
-2
lines changed

4 files changed

+523
-2
lines changed

drivers/devfreq/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,15 @@ config ARM_RK3399_DMC_DEVFREQ
132132
It sets the frequency for the memory controller and reads the usage counts
133133
from hardware.
134134

135+
config ARM_SUN8I_A33_MBUS_DEVFREQ
136+
tristate "sun8i/sun50i MBUS DEVFREQ Driver"
137+
depends on ARCH_SUNXI || COMPILE_TEST
138+
depends on COMMON_CLK
139+
select DEVFREQ_GOV_SIMPLE_ONDEMAND
140+
help
141+
This adds the DEVFREQ driver for the MBUS controller in some
142+
Allwinner sun8i (A33 through H3) and sun50i (A64 and H5) SoCs.
143+
135144
source "drivers/devfreq/event/Kconfig"
136145

137146
endif # PM_DEVFREQ

drivers/devfreq/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ obj-$(CONFIG_ARM_EXYNOS_BUS_DEVFREQ) += exynos-bus.o
1212
obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ) += imx-bus.o
1313
obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ) += imx8m-ddrc.o
1414
obj-$(CONFIG_ARM_RK3399_DMC_DEVFREQ) += rk3399_dmc.o
15+
obj-$(CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ) += sun8i-a33-mbus.o
1516
obj-$(CONFIG_ARM_TEGRA_DEVFREQ) += tegra30-devfreq.o
1617

1718
# DEVFREQ Event Drivers

drivers/devfreq/devfreq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ static int devfreq_set_target(struct devfreq *devfreq, unsigned long new_freq,
382382
devfreq_notify_transition(devfreq, &freqs, DEVFREQ_POSTCHANGE);
383383

384384
if (devfreq_update_status(devfreq, new_freq))
385-
dev_err(&devfreq->dev,
386-
"Couldn't update frequency transition information.\n");
385+
dev_warn(&devfreq->dev,
386+
"Couldn't update frequency transition information.\n");
387387

388388
devfreq->previous_freq = new_freq;
389389

0 commit comments

Comments
 (0)