Commit aebd774d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'berlin-soc-for-4.4-1' of...

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
parents dc7a4996 e1a3e724
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -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