Commit 641f4d56 authored by Haojian Zhuang's avatar Haojian Zhuang
Browse files

ARM: mmp: support pxa910 with device tree 



Suppot gpio/irq/timer in mmp-dt driver. Support PXA910 also in mmp-dt
driver.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent a56f9162

arch/arm/mach-mmp/mmp-dt.c

+40 −10
Original line number Diff line number Diff line
@@ -14,14 +14,19 @@ 
#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <mach/irqs.h>



#include "common.h"



extern struct sys_timer pxa168_timer;

extern void __init icu_init_irq(void);

extern void __init mmp_dt_irq_init(void);

extern void __init mmp_dt_init_timer(void);



static const struct of_dev_auxdata mmp_auxdata_lookup[] __initconst = {

static struct sys_timer mmp_dt_timer = {

	.init	= mmp_dt_init_timer,

};



static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = {

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4026000, "pxa2xx-uart.2", NULL),
@@ -32,22 +37,47 @@ static const struct of_dev_auxdata mmp_auxdata_lookup[] __initconst = { 
	{}

};



static void __init mmp_dt_init(void)

static const struct of_dev_auxdata pxa910_auxdata_lookup[] __initconst = {

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	{}

};



static void __init pxa168_dt_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table,

			     pxa168_auxdata_lookup, NULL);

}



static void __init pxa910_dt_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table,

			     mmp_auxdata_lookup, NULL);

			     pxa910_auxdata_lookup, NULL);

}



static const char *pxa168_dt_board_compat[] __initdata = {

static const char *mmp_dt_board_compat[] __initdata = {

	"mrvl,pxa168-aspenite",

	"mrvl,pxa910-dkb",

	NULL,

};



DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)")

	.map_io		= mmp_map_io,

	.init_irq	= icu_init_irq,

	.timer		= &pxa168_timer,

	.init_machine	= mmp_dt_init,

	.dt_compat	= pxa168_dt_board_compat,

	.init_irq	= mmp_dt_irq_init,

	.timer		= &mmp_dt_timer,

	.init_machine	= pxa168_dt_init,

	.dt_compat	= mmp_dt_board_compat,

MACHINE_END



DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)")

	.map_io		= mmp_map_io,

	.init_irq	= mmp_dt_irq_init,

	.timer		= &mmp_dt_timer,

	.init_machine	= pxa910_dt_init,

	.dt_compat	= mmp_dt_board_compat,

MACHINE_END