diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 22:06:45 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 22:06:45 +0200 |
commit | aebd774de939c853122829c29c4cfe79f8b440ac (patch) | |
tree | b392c409f7c654a2ddfff9c3d7f438c64df690a8 | |
parent | dc7a4996741249209d3b0fc200545de877e1fe37 (diff) | |
parent | e1a3e724a25761a2b2e9e0e059e33afac6409a76 (diff) | |
download | op-kernel-dev-aebd774de939c853122829c29c4cfe79f8b440ac.zip op-kernel-dev-aebd774de939c853122829c29c4cfe79f8b440ac.tar.gz |
Merge tag 'berlin-soc-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc
Merge "Marvell SoC for 4.4 take 1" from Sebastian Hesselbarth:
- register cpufreq-dt device
* tag 'berlin-soc-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: berlin: register cpufreq-dt
-rw-r--r-- | arch/arm/mach-berlin/berlin.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-berlin/berlin.c b/arch/arm/mach-berlin/berlin.c index ac181c6..25d7387 100644 --- a/arch/arm/mach-berlin/berlin.c +++ b/arch/arm/mach-berlin/berlin.c @@ -18,6 +18,11 @@ #include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> +static void __init berlin_init_late(void) +{ + platform_device_register_simple("cpufreq-dt", -1, NULL, 0); +} + static const char * const berlin_dt_compat[] = { "marvell,berlin", NULL, @@ -25,6 +30,7 @@ static const char * const berlin_dt_compat[] = { DT_MACHINE_START(BERLIN_DT, "Marvell Berlin") .dt_compat = berlin_dt_compat, + .init_late = berlin_init_late, /* * with DT probing for L2CCs, berlin_init_machine can be removed. * Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc |