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

Commit 5fcd294d authored by Kevin Hilman's avatar Kevin Hilman
Browse files

davinci: remove watchdog from soc_info 



watchdog info is not needed in soc_info, platform_device can
be used directly in core code.

Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 1d3bba61

arch/arm/mach-davinci/devices.c

+2 −5
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config) 


static struct resource wdt_resources[] = {

	{

		.start	= DAVINCI_WDOG_BASE,

		.end	= DAVINCI_WDOG_BASE + SZ_1K - 1,

		.flags	= IORESOURCE_MEM,

	},

};
@@ -229,11 +231,6 @@ struct platform_device davinci_wdt_device = { 


static void davinci_init_wdt(void)

{

	struct davinci_soc_info *soc_info = &davinci_soc_info;



	wdt_resources[0].start = (resource_size_t)soc_info->wdt_base;

	wdt_resources[0].end = (resource_size_t)soc_info->wdt_base + SZ_1K - 1;



	platform_device_register(&davinci_wdt_device);

}

arch/arm/mach-davinci/dm355.c

+0 −1
Original line number Diff line number Diff line
@@ -727,7 +727,6 @@ static struct davinci_soc_info davinci_soc_info_dm355 = { 
	.intc_irq_prios		= dm355_default_priorities,

	.intc_irq_num		= DAVINCI_N_AINTC_IRQ,

	.timer_info		= &dm355_timer_info,

	.wdt_base		= IO_ADDRESS(DAVINCI_WDOG_BASE),

	.gpio_base		= IO_ADDRESS(DAVINCI_GPIO_BASE),

	.gpio_num		= 104,

	.gpio_irq		= IRQ_DM355_GPIOBNK0,

arch/arm/mach-davinci/dm644x.c

+0 −1
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ static struct davinci_soc_info davinci_soc_info_dm644x = { 
	.intc_irq_prios 	= dm644x_default_priorities,

	.intc_irq_num		= DAVINCI_N_AINTC_IRQ,

	.timer_info		= &dm644x_timer_info,

	.wdt_base		= IO_ADDRESS(DAVINCI_WDOG_BASE),

	.gpio_base		= IO_ADDRESS(DAVINCI_GPIO_BASE),

	.gpio_num		= 71,

	.gpio_irq		= IRQ_GPIOBNK0,

arch/arm/mach-davinci/dm646x.c

+0 −1
Original line number Diff line number Diff line
@@ -691,7 +691,6 @@ static struct davinci_soc_info davinci_soc_info_dm646x = { 
	.intc_irq_prios		= dm646x_default_priorities,

	.intc_irq_num		= DAVINCI_N_AINTC_IRQ,

	.timer_info		= &dm646x_timer_info,

	.wdt_base		= IO_ADDRESS(DAVINCI_WDOG_BASE),

	.gpio_base		= IO_ADDRESS(DAVINCI_GPIO_BASE),

	.gpio_num		= 43, /* Only 33 usable */

	.gpio_irq		= IRQ_DM646X_GPIOBNK0,

arch/arm/mach-davinci/include/mach/common.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct davinci_soc_info { 
	u8				*intc_irq_prios;

	unsigned long			intc_irq_num;

	struct davinci_timer_info	*timer_info;

	void __iomem			*wdt_base;

	void __iomem			*gpio_base;

	unsigned			gpio_num;

	unsigned			gpio_irq;