git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
mpc8272ads_setup.c
diff --git
a/arch/ppc/platforms/mpc8272ads_setup.c
b/arch/ppc/platforms/mpc8272ads_setup.c
index
2a35fe2
..
0bc0676
100644
(file)
--- a/
arch/ppc/platforms/mpc8272ads_setup.c
+++ b/
arch/ppc/platforms/mpc8272ads_setup.c
@@
-1,5
+1,5
@@
/*
/*
- * arch/ppc/platforms/
82xx/pq2ads_pd
.c
+ * arch/ppc/platforms/
mpc8272ads_setup
.c
*
* MPC82xx Board-specific PlatformDevice descriptions
*
*
* MPC82xx Board-specific PlatformDevice descriptions
*
@@
-103,7
+103,7
@@
static struct fs_platform_info mpc82xx_enet_pdata[] = {
},
};
},
};
-static void init_fcc1_ioports(
void
)
+static void init_fcc1_ioports(
struct fs_platform_info*
)
{
struct io_port *io;
u32 tempval;
{
struct io_port *io;
u32 tempval;
@@
-144,7
+144,7
@@
static void init_fcc1_ioports(void)
iounmap(immap);
}
iounmap(immap);
}
-static void init_fcc2_ioports(
void
)
+static void init_fcc2_ioports(
struct fs_platform_info*
)
{
cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
u32 *bcsr = ioremap(BCSR_ADDR+12, sizeof(u32));
{
cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
u32 *bcsr = ioremap(BCSR_ADDR+12, sizeof(u32));
@@
-196,7
+196,7
@@
static void __init mpc8272ads_fixup_enet_pdata(struct platform_device *pdev,
bd_t* bi = (void*)__res;
int fs_no = fsid_fcc1+pdev->id-1;
bd_t* bi = (void*)__res;
int fs_no = fsid_fcc1+pdev->id-1;
- if(fs_no > ARRAY_SIZE(mpc82xx_enet_pdata)) {
+ if(fs_no >
=
ARRAY_SIZE(mpc82xx_enet_pdata)) {
return;
}
return;
}
@@
-222,14
+222,14
@@
static void mpc8272ads_fixup_uart_pdata(struct platform_device *pdev,
int id = fs_uart_id_scc2fsid(idx);
/* no need to alter anything if console */
int id = fs_uart_id_scc2fsid(idx);
/* no need to alter anything if console */
- if ((id <
=
num) && (!pdev->dev.platform_data)) {
+ if ((id < num) && (!pdev->dev.platform_data)) {
pinfo = &mpc8272_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo;
}
}
pinfo = &mpc8272_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo;
}
}
-static void init_scc1_uart_ioports(
void
)
+static void init_scc1_uart_ioports(
struct fs_uart_platform_info*
)
{
cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
{
cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
@@
-246,7
+246,7
@@
static void init_scc1_uart_ioports(void)
iounmap(immap);
}
iounmap(immap);
}
-static void init_scc4_uart_ioports(
void
)
+static void init_scc4_uart_ioports(
struct fs_uart_platform_info*
)
{
cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
{
cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
@@
-266,10
+266,10
@@
static void __init mpc8272ads_fixup_mdio_pdata(struct platform_device *pdev,
int idx)
{
m82xx_mii_bb_pdata.irq[0] = PHY_INTERRUPT;
int idx)
{
m82xx_mii_bb_pdata.irq[0] = PHY_INTERRUPT;
- m82xx_mii_bb_pdata.irq[1] =
-1
;
- m82xx_mii_bb_pdata.irq[2] =
-1
;
+ m82xx_mii_bb_pdata.irq[1] =
PHY_POLL
;
+ m82xx_mii_bb_pdata.irq[2] =
PHY_POLL
;
m82xx_mii_bb_pdata.irq[3] = PHY_INTERRUPT;
m82xx_mii_bb_pdata.irq[3] = PHY_INTERRUPT;
- m82xx_mii_bb_pdata.irq[31] =
-1
;
+ m82xx_mii_bb_pdata.irq[31] =
PHY_POLL
;
m82xx_mii_bb_pdata.mdio_dat.offset =
m82xx_mii_bb_pdata.mdio_dat.offset =