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

Commit 5d489766 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Haojian Zhuang
Browse files

ARM: mmp: append OF support on pxa168 



Enable PXA168 and aspenite support.

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

arch/arm/mach-mmp/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,16 @@ if ARCH_MMP 


menu "Marvell PXA168/910/MMP2 Implmentations"



config MACH_MMP_DT

	bool "Support MMP2 platforms from device tree"

	select CPU_PXA168

	select CPU_PXA910

	select USE_OF

	help

	  Include support for Marvell MMP2 based platforms using

	  the device tree. Needn't select any other machine while

	  MACH_MMP_DT is enabled.



config MACH_ASPENITE

	bool "Marvell's PXA168 Aspenite Development Board"

	select CPU_PXA168

arch/arm/mach-mmp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,5 +18,6 @@ obj-$(CONFIG_MACH_TTC_DKB) += ttc_dkb.o 
obj-$(CONFIG_MACH_BROWNSTONE)	+= brownstone.o

obj-$(CONFIG_MACH_FLINT)	+= flint.o

obj-$(CONFIG_MACH_MARVELL_JASPER) += jasper.o

obj-$(CONFIG_MACH_MMP_DT)	+= mmp-dt.o

obj-$(CONFIG_MACH_TETON_BGA)	+= teton_bga.o

obj-$(CONFIG_MACH_GPLUGD)	+= gplugd.o

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

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/*

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

 *

 *  Copyright (C) 2012 Marvell Technology Group Ltd.

 *  Author: Haojian Zhuang <haojian.zhuang@marvell.com>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License version 2 as

 *  publishhed by the Free Software Foundation.

 */



#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <mach/irqs.h>



#include "common.h"



extern struct sys_timer pxa168_timer;

extern void __init icu_init_irq(void);



static const struct of_dev_auxdata mmp_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),

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

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "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 int __init mmp_intc_add_irq_domain(struct device_node *np,

					   struct device_node *parent)

{

	irq_domain_add_simple(np, 0);

	return 0;

}



static int __init mmp_gpio_add_irq_domain(struct device_node *np,

					   struct device_node *parent)

{

	irq_domain_add_simple(np, IRQ_GPIO_START);

	return 0;

}



static const struct of_device_id mmp_irq_match[] __initconst = {

	{ .compatible = "mrvl,mmp-intc", .data = mmp_intc_add_irq_domain, },

	{ .compatible = "mrvl,mmp-gpio", .data = mmp_gpio_add_irq_domain, },

	{}

};



static void __init mmp_dt_init(void)

{



	of_irq_init(mmp_irq_match);



	of_platform_populate(NULL, of_default_bus_match_table,

			     mmp_auxdata_lookup, NULL);

}



static const char *pxa168_dt_board_compat[] __initdata = {

	"mrvl,pxa168-aspenite",

	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,

MACHINE_END