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

Commit dab7dfb6 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: kirkwood: Separate board-dt from common and pcie code. 



In order to be able to move DT support into mach-mvebu, the DT code
needs to be cleanly separated from common and pcie code. Import the
needed bits of these files into board-dt.c. The "common" code then
becomes purely legacy, supporting non-DT boards, so reflect this in
the Makefile targets.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 15a705ec

arch/arm/mach-kirkwood/Makefile

+1 −2
Original line number Diff line number Diff line 
obj-y				+= common.o pcie.o

obj-$(CONFIG_KIRKWOOD_LEGACY)	+= irq.o mpp.o

obj-$(CONFIG_KIRKWOOD_LEGACY)	+= irq.o mpp.o common.o pcie.o

obj-$(CONFIG_PM)		+= pm.o



obj-$(CONFIG_MACH_D2NET_V2)		+= d2net_v2-setup.o lacie_v2-common.o

arch/arm/mach-kirkwood/board-dt.c

+87 −1
Original line number Diff line number Diff line
@@ -21,11 +21,97 @@ 
#include <linux/irqchip.h>

#include <linux/kexec.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/bridge-regs.h>

#include <plat/common.h>

#include "common.h"

#include <plat/cache-feroceon-l2.h>

#include <plat/pcie.h>

#include "pm.h"



static struct map_desc kirkwood_io_desc[] __initdata = {

	{

		.virtual	= (unsigned long) KIRKWOOD_REGS_VIRT_BASE,

		.pfn		= __phys_to_pfn(KIRKWOOD_REGS_PHYS_BASE),

		.length		= KIRKWOOD_REGS_SIZE,

		.type		= MT_DEVICE,

	},

};



static void __init kirkwood_map_io(void)

{

	iotable_init(kirkwood_io_desc, ARRAY_SIZE(kirkwood_io_desc));

}



static void __init kirkwood_l2_init(void)

{

#ifdef CONFIG_CACHE_FEROCEON_L2

#ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH

	writel(readl(L2_CONFIG_REG) | L2_WRITETHROUGH, L2_CONFIG_REG);

	feroceon_l2_init(1);

#else

	writel(readl(L2_CONFIG_REG) & ~L2_WRITETHROUGH, L2_CONFIG_REG);

	feroceon_l2_init(0);

#endif

#endif

}



static struct resource kirkwood_cpufreq_resources[] = {

	[0] = {

		.start  = CPU_CONTROL_PHYS,

		.end    = CPU_CONTROL_PHYS + 3,

		.flags  = IORESOURCE_MEM,

	},

};



static struct platform_device kirkwood_cpufreq_device = {

	.name		= "kirkwood-cpufreq",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(kirkwood_cpufreq_resources),

	.resource	= kirkwood_cpufreq_resources,

};



static void __init kirkwood_cpufreq_init(void)

{

	platform_device_register(&kirkwood_cpufreq_device);

}



static struct resource kirkwood_cpuidle_resource[] = {

	{

		.flags	= IORESOURCE_MEM,

		.start	= DDR_OPERATION_BASE,

		.end	= DDR_OPERATION_BASE + 3,

	},

};



static struct platform_device kirkwood_cpuidle = {

	.name		= "kirkwood_cpuidle",

	.id		= -1,

	.resource	= kirkwood_cpuidle_resource,

	.num_resources	= 1,

};



static void __init kirkwood_cpuidle_init(void)

{

	platform_device_register(&kirkwood_cpuidle);

}



/* Temporary here since mach-mvebu has a function we can use */

static void kirkwood_restart(enum reboot_mode mode, const char *cmd)

{

	/*

	 * Enable soft reset to assert RSTOUTn.

	 */

	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);



	/*

	 * Assert soft reset.

	 */

	writel(SOFT_RESET, SYSTEM_SOFT_RESET);



	while (1)

		;

}



#define MV643XX_ETH_MAC_ADDR_LOW	0x0414

#define MV643XX_ETH_MAC_ADDR_HIGH	0x0418