diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-04-10 02:10:05 -0400 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-05-25 11:04:33 -0400 |
commit | 2b348e2f82f532e3aff8e0ce9293033b3294c1e0 (patch) | |
tree | 771e08a36011c6010962de74bc54b7299466a588 /arch/arm/mach-at91/at91sam9260_devices.c | |
parent | dd41d3216b05200cf01381927804a35315352a35 (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/at91sam9260_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 07eb7b07e442..6f8ec8d16d5a 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c | |||
@@ -1139,6 +1139,7 @@ struct platform_device *atmel_default_console_device; /* the serial console devi | |||
1139 | void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) | 1139 | void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) |
1140 | { | 1140 | { |
1141 | struct platform_device *pdev; | 1141 | struct platform_device *pdev; |
1142 | struct atmel_uart_data *pdata; | ||
1142 | 1143 | ||
1143 | switch (id) { | 1144 | switch (id) { |
1144 | case 0: /* DBGU */ | 1145 | case 0: /* DBGU */ |
@@ -1179,7 +1180,8 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) | |||
1179 | default: | 1180 | default: |
1180 | return; | 1181 | return; |
1181 | } | 1182 | } |
1182 | pdev->id = portnr; /* update to mapped ID */ | 1183 | pdata = pdev->dev.platform_data; |
1184 | pdata->num = portnr; /* update to mapped ID */ | ||
1183 | 1185 | ||
1184 | if (portnr < ATMEL_MAX_UART) | 1186 | if (portnr < ATMEL_MAX_UART) |
1185 | at91_uarts[portnr] = pdev; | 1187 | at91_uarts[portnr] = pdev; |