Skip to content

Commit

Permalink
[ARM] 4908/1: [AT91] RTT platform_device fix
Browse files Browse the repository at this point in the history
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: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Andrew Victor authored and Russell King committed Apr 4, 2008
1 parent 565ac44 commit 4fd9212
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
13 changes: 11 additions & 2 deletions arch/arm/mach-at91/at91cap9_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-at91/at91sam9260_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-at91/at91sam9261_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-at91/at91sam9rl_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
Expand Down

0 comments on commit 4fd9212

Please sign in to comment.