aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorVitaly Bordug <vbordug@ru.mvista.com>2006-09-21 14:38:05 -0400
committerVitaly Bordug <vbordug@ru.mvista.com>2006-09-21 14:38:05 -0400
commitd3465c921f79cfef0a4a8ceeeef9a3721bbbb57d (patch)
tree73d602a02efd3f358990dcfa9231131e69318d3b /drivers
parentfc8e50e349aa722d9f97ed9ba30e324ede8fa408 (diff)
POWERPC: overhaul with cpm2_map mechanism
Incorporating the new way of cpm2 immr access, introduced in the previous patch, into CPM2 peripheral devices (fs_enet and cpm_uart). Both ppc and powerpc approved working( real actions taken in powerpc only, ppc just has a wrapper to keep init stuff consistent). Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/fs_enet/fs_enet-main.c2
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_core.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index df62506a1787..f358ee61d9b9 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -971,7 +971,7 @@ static struct net_device *fs_init_instance(struct device *dev,
971 dev_set_drvdata(dev, ndev); 971 dev_set_drvdata(dev, ndev);
972 fep->fpi = fpi; 972 fep->fpi = fpi;
973 if (fpi->init_ioports) 973 if (fpi->init_ioports)
974 fpi->init_ioports(); 974 fpi->init_ioports((struct fs_platform_info *)fpi);
975 975
976#ifdef CONFIG_FS_ENET_HAS_FEC 976#ifdef CONFIG_FS_ENET_HAS_FEC
977 if (fs_get_fec_index(fpi->fs_no) >= 0) 977 if (fs_get_fec_index(fpi->fs_no) >= 0)
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index dfa06b644957..24613a68f5cc 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1180,7 +1180,7 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
1180 pdata = pdev->dev.platform_data; 1180 pdata = pdev->dev.platform_data;
1181 if (pdata) 1181 if (pdata)
1182 if (pdata->init_ioports) 1182 if (pdata->init_ioports)
1183 pdata->init_ioports(); 1183 pdata->init_ioports(pdata);
1184 1184
1185 cpm_uart_drv_get_platform_data(pdev, 1); 1185 cpm_uart_drv_get_platform_data(pdev, 1);
1186 } 1186 }
@@ -1269,7 +1269,7 @@ static int cpm_uart_drv_probe(struct device *dev)
1269 return ret; 1269 return ret;
1270 1270
1271 if (pdata->init_ioports) 1271 if (pdata->init_ioports)
1272 pdata->init_ioports(); 1272 pdata->init_ioports(pdata);
1273 1273
1274 ret = uart_add_one_port(&cpm_reg, &cpm_uart_ports[pdata->fs_no].port); 1274 ret = uart_add_one_port(&cpm_reg, &cpm_uart_ports[pdata->fs_no].port);
1275 1275