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

Commit fcfdc67f authored by Marc Zyngier's avatar Marc Zyngier Committed by Eric Miao
Browse files

[ARM] pxa/zeus: Add support for onboard max6369 watchdog 



Signed-off-by: default avatarMarc Zyngier <maz@misterjones.org>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 90ac0dfd

arch/arm/mach-pxa/include/mach/zeus.h

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 
#define ZEUS_CPLD_VERSION	(ZEUS_CPLD + 0x0000)

#define ZEUS_CPLD_ISA_IRQ	(ZEUS_CPLD + 0x1000)

#define ZEUS_CPLD_CONTROL	(ZEUS_CPLD + 0x2000)

#define ZEUS_CPLD_EXTWDOG	(ZEUS_CPLD + 0x3000)



/* CPLD register bits */

#define ZEUS_CPLD_CONTROL_CF_RST        0x01

arch/arm/mach-pxa/zeus.c

+14 −6
Original line number Diff line number Diff line
@@ -457,6 +457,19 @@ static struct platform_device zeus_pcmcia_device = { 
	},

};



static struct resource zeus_max6369_resource = {

	.start		= ZEUS_CPLD_EXTWDOG_PHYS,

	.end		= ZEUS_CPLD_EXTWDOG_PHYS,

	.flags		= IORESOURCE_MEM,

};



struct platform_device zeus_max6369_device = {

	.name		= "max6369_wdt",

	.id		= -1,

	.resource	= &zeus_max6369_resource,

	.num_resources	= 1,

};



static struct platform_device *zeus_devices[] __initdata = {

	&zeus_serial_device,

	&zeus_mtd_devices[0],
@@ -466,6 +479,7 @@ static struct platform_device *zeus_devices[] __initdata = { 
	&pxa2xx_spi_ssp3_device,

	&zeus_leds_device,

	&zeus_pcmcia_device,

	&zeus_max6369_device,

};



/* AC'97 */
@@ -818,12 +832,6 @@ static struct map_desc zeus_io_desc[] __initdata = { 
		.length  = 0x1000,

		.type    = MT_DEVICE,

	},

	{

		.virtual = ZEUS_CPLD_EXTWDOG,

		.pfn     = __phys_to_pfn(ZEUS_CPLD_EXTWDOG_PHYS),

		.length  = 0x1000,

		.type    = MT_DEVICE,

	},

	{

		.virtual = ZEUS_PC104IO,

		.pfn     = __phys_to_pfn(ZEUS_PC104IO_PHYS),