Skip to content

Commit

Permalink
Merge tag 'devfreq-next-for-5.17' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/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
  • Loading branch information
Rafael J. Wysocki committed Dec 27, 2021
2 parents fc74e0a + 4667431 commit 702f21d
Show file tree
Hide file tree
Showing 4 changed files with 523 additions and 2 deletions.
9 changes: 9 additions & 0 deletions drivers/devfreq/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,15 @@ config ARM_RK3399_DMC_DEVFREQ
It sets the frequency for the memory controller and reads the usage counts
from hardware.

config ARM_SUN8I_A33_MBUS_DEVFREQ
tristate "sun8i/sun50i MBUS DEVFREQ Driver"
depends on ARCH_SUNXI || COMPILE_TEST
depends on COMMON_CLK
select DEVFREQ_GOV_SIMPLE_ONDEMAND
help
This adds the DEVFREQ driver for the MBUS controller in some
Allwinner sun8i (A33 through H3) and sun50i (A64 and H5) SoCs.

source "drivers/devfreq/event/Kconfig"

endif # PM_DEVFREQ
1 change: 1 addition & 0 deletions drivers/devfreq/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ obj-$(CONFIG_ARM_EXYNOS_BUS_DEVFREQ) += exynos-bus.o
obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ) += imx-bus.o
obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ) += imx8m-ddrc.o
obj-$(CONFIG_ARM_RK3399_DMC_DEVFREQ) += rk3399_dmc.o
obj-$(CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ) += sun8i-a33-mbus.o
obj-$(CONFIG_ARM_TEGRA_DEVFREQ) += tegra30-devfreq.o

# DEVFREQ Event Drivers
Expand Down
4 changes: 2 additions & 2 deletions drivers/devfreq/devfreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,8 @@ static int devfreq_set_target(struct devfreq *devfreq, unsigned long new_freq,
devfreq_notify_transition(devfreq, &freqs, DEVFREQ_POSTCHANGE);

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

devfreq->previous_freq = new_freq;

Expand Down
Loading

0 comments on commit 702f21d

Please sign in to comment.