aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9rl_devices.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2011-04-10 02:10:05 -0400
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2011-05-25 11:04:33 -0400
commit2b348e2f82f532e3aff8e0ce9293033b3294c1e0 (patch)
tree771e08a36011c6010962de74bc54b7299466a588 /arch/arm/mach-at91/at91sam9rl_devices.c
parentdd41d3216b05200cf01381927804a35315352a35 (diff)
atmel_serial: keep the platform_device unchanged
specify the port num via platform_data this will allow to match the clock with the plaform_dev staticaly Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Alan Cox <alan@linux.intel.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Patrice Vilchez <patrice.vilchez@atmel.com> Cc: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> Cc: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9rl_devices.c')
-rw-r--r--arch/arm/mach-at91/at91sam9rl_devices.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index c49262bddd85..d194b085848e 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -1141,6 +1141,7 @@ struct platform_device *atmel_default_console_device; /* the serial console devi
1141void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) 1141void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
1142{ 1142{
1143 struct platform_device *pdev; 1143 struct platform_device *pdev;
1144 struct atmel_uart_data *pdata;
1144 1145
1145 switch (id) { 1146 switch (id) {
1146 case 0: /* DBGU */ 1147 case 0: /* DBGU */
@@ -1171,7 +1172,8 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
1171 default: 1172 default:
1172 return; 1173 return;
1173 } 1174 }
1174 pdev->id = portnr; /* update to mapped ID */ 1175 pdata = pdev->dev.platform_data;
1176 pdata->num = portnr; /* update to mapped ID */
1175 1177
1176 if (portnr < ATMEL_MAX_UART) 1178 if (portnr < ATMEL_MAX_UART)
1177 at91_uarts[portnr] = pdev; 1179 at91_uarts[portnr] = pdev;