diff options
author | Vitaly Bordug <vbordug@ru.mvista.com> | 2006-05-24 13:40:18 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-26 08:38:56 -0400 |
commit | 8e30a9a299ca30b6c4072c2182238d5f5dd1590d (patch) | |
tree | 4054dd52f383838c8c2f7d47e33493968c59d16b /arch/ppc/platforms | |
parent | 6d923f98fe0f31c174ace92f8b680d0d153663aa (diff) |
[PATCH] ppc32 CPM_UART: various fixes for pq2 uart users
This fixes various odd things that missed update together with cpm_uart
platform_device move. Unified resources names, restructurisation, etc.
Also, addressed issue with recent phys/virt translation rework. Being
cache-coherent, CPM2's do alloc_bootmem() for the console stuff, and it was
used to treat console buffer descriptor mapping 1:1 (as in CPM1 case),
which is definitely wrong.
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/platforms')
-rw-r--r-- | arch/ppc/platforms/mpc8272ads_setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc/platforms/mpc8272ads_setup.c b/arch/ppc/platforms/mpc8272ads_setup.c index e62b75707f7a..abb7154de2c7 100644 --- a/arch/ppc/platforms/mpc8272ads_setup.c +++ b/arch/ppc/platforms/mpc8272ads_setup.c | |||
@@ -279,11 +279,11 @@ static int mpc8272ads_platform_notify(struct device *dev) | |||
279 | static const struct platform_notify_dev_map dev_map[] = { | 279 | static const struct platform_notify_dev_map dev_map[] = { |
280 | { | 280 | { |
281 | .bus_id = "fsl-cpm-fcc", | 281 | .bus_id = "fsl-cpm-fcc", |
282 | .rtn = mpc8272ads_fixup_enet_pdata | 282 | .rtn = mpc8272ads_fixup_enet_pdata, |
283 | }, | 283 | }, |
284 | { | 284 | { |
285 | .bus_id = "fsl-cpm-scc:uart", | 285 | .bus_id = "fsl-cpm-scc:uart", |
286 | .rtn = mpc | 286 | .rtn = mpc8272ads_fixup_uart_pdata, |
287 | }, | 287 | }, |
288 | { | 288 | { |
289 | .bus_id = NULL | 289 | .bus_id = NULL |
@@ -335,15 +335,15 @@ struct platform_device* early_uart_get_pdev(int index) | |||
335 | struct platform_device* pdev = NULL; | 335 | struct platform_device* pdev = NULL; |
336 | if(index) { /*assume SCC4 here*/ | 336 | if(index) { /*assume SCC4 here*/ |
337 | pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC4]; | 337 | pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC4]; |
338 | pinfo = &mpc8272<F12>_uart_pdata[1]; | 338 | pinfo = &mpc8272_uart_pdata[fsid_scc4_uart]; |
339 | } else { /*over SCC1*/ | 339 | } else { /*over SCC1*/ |
340 | pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC1]; | 340 | pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC1]; |
341 | pinfo = &mpc8272_uart_pdata[0]; | 341 | pinfo = &mpc8272_uart_pdata[fsid_scc1_uart]; |
342 | } | 342 | } |
343 | 343 | ||
344 | pinfo->uart_clk = bd->bi_intfreq; | 344 | pinfo->uart_clk = bd->bi_intfreq; |
345 | pdev->dev.platform_data = pinfo; | 345 | pdev->dev.platform_data = pinfo; |
346 | ppc_sys_fixup_mem_resource(pdev, IMAP_ADDR); | 346 | ppc_sys_fixup_mem_resource(pdev, CPM_MAP_ADDR); |
347 | return NULL; | 347 | return NULL; |
348 | } | 348 | } |
349 | 349 | ||