diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-03 20:49:01 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-03 20:49:01 -0800 |
| commit | 9576d3e622f325e617b272172dd68e329e742f77 (patch) | |
| tree | efb27fc93d756d17c76f12eccb617149e80d7105 /arch/arm/mach-rockchip | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| parent | 3eb79a5a9d46b32f63f6b9cd86f9b2bba43e127a (diff) | |
| download | linux-9576d3e622f325e617b272172dd68e329e742f77.tar.bz2 | |
Merge tag 'v3.18-rockchip-cpufreqdev-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Merge "ARM: rockchip: cpufreq-cpu0 device" from Heiko Stubner:
Add cpufreq-dt platform device for cpu frequency scaling.
* tag 'v3.18-rockchip-cpufreqdev-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: honor renaming of cpufreq-cpu0 to cpufreq-dt
ARM: rockchip: add a cpufreq-cpu0 device
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-rockchip')
| -rw-r--r-- | arch/arm/mach-rockchip/rockchip.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c index 8ab9e0e7ff04..d226b71d21d5 100644 --- a/arch/arm/mach-rockchip/rockchip.c +++ b/arch/arm/mach-rockchip/rockchip.c @@ -24,6 +24,12 @@ #include <asm/hardware/cache-l2x0.h> #include "core.h" +static void __init rockchip_dt_init(void) +{ + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + platform_device_register_simple("cpufreq-dt", 0, NULL, 0); +} + static const char * const rockchip_board_dt_compat[] = { "rockchip,rk2928", "rockchip,rk3066a", @@ -37,4 +43,5 @@ DT_MACHINE_START(ROCKCHIP_DT, "Rockchip Cortex-A9 (Device Tree)") .l2c_aux_val = 0, .l2c_aux_mask = ~0, .dt_compat = rockchip_board_dt_compat, + .init_machine = rockchip_dt_init, MACHINE_END |