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/at91sam9263_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/at91sam9263_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index fb5c23af101..47a9f965bbb 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c | |||
| @@ -1370,6 +1370,7 @@ struct platform_device *atmel_default_console_device; /* the serial console devi | |||
| 1370 | void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) | 1370 | void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) |
| 1371 | { | 1371 | { |
| 1372 | struct platform_device *pdev; | 1372 | struct platform_device *pdev; |
| 1373 | struct atmel_uart_data *pdata; | ||
| 1373 | 1374 | ||
| 1374 | switch (id) { | 1375 | switch (id) { |
| 1375 | case 0: /* DBGU */ | 1376 | case 0: /* DBGU */ |
| @@ -1395,7 +1396,8 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) | |||
| 1395 | default: | 1396 | default: |
| 1396 | return; | 1397 | return; |
| 1397 | } | 1398 | } |
| 1398 | pdev->id = portnr; /* update to mapped ID */ | 1399 | pdata = pdev->dev.platform_data; |
| 1400 | pdata->num = portnr; /* update to mapped ID */ | ||
| 1399 | 1401 | ||
| 1400 | if (portnr < ATMEL_MAX_UART) | 1402 | if (portnr < ATMEL_MAX_UART) |
| 1401 | at91_uarts[portnr] = pdev; | 1403 | at91_uarts[portnr] = pdev; |
