Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9576d3e6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v3.18-rockchip-cpufreqdev-v2' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 0df1f248 3eb79a5a

arch/arm/mach-rockchip/rockchip.c

+7 −0
Original line number Diff line number Diff line
@@ -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