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

Commit 4fd9212c authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 4908/1: [AT91] RTT platform_device fix 



The RTT-as-RTC driver will search for the user-specified RTT
peripheral via ID number (0 .. 1).
Therefore if the processor only contains a single RTT peripheral, we
need to set its platform_device.id to "0" instead of "-1".
Also add the missing platform_device resource for the CAP9 processor.

Bug reported by Sedji Gaouaou.

Signed-off-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 565ac445

arch/arm/mach-at91/at91cap9_devices.c

+11 −2
Original line number Diff line number Diff line
@@ -540,10 +540,19 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) 
 *  RTT

 * -------------------------------------------------------------------- */



static struct resource rtt_resources[] = {

	{

		.start	= AT91_BASE_SYS + AT91_RTT,

		.end	= AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,

		.flags	= IORESOURCE_MEM,

	}

};



static struct platform_device at91cap9_rtt_device = {

	.name		= "at91_rtt",

	.id		= -1,

	.num_resources	= 0,

	.id		= 0,

	.resource	= rtt_resources,

	.num_resources	= ARRAY_SIZE(rtt_resources),

};



static void __init at91_add_device_rtt(void)

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static struct resource rtt_resources[] = { 


static struct platform_device at91sam9260_rtt_device = {

	.name		= "at91_rtt",

	.id		= -1,

	.id		= 0,

	.resource	= rtt_resources,

	.num_resources	= ARRAY_SIZE(rtt_resources),

};

arch/arm/mach-at91/at91sam9261_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static struct resource rtt_resources[] = { 


static struct platform_device at91sam9261_rtt_device = {

	.name		= "at91_rtt",

	.id		= -1,

	.id		= 0,

	.resource	= rtt_resources,

	.num_resources	= ARRAY_SIZE(rtt_resources),

};

arch/arm/mach-at91/at91sam9rl_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static struct resource rtt_resources[] = { 


static struct platform_device at91sam9rl_rtt_device = {

	.name		= "at91_rtt",

	.id		= -1,

	.id		= 0,

	.resource	= rtt_resources,

	.num_resources	= ARRAY_SIZE(rtt_resources),

};