OF-related update for FEC and SCC MAC's
Subsystems (3)
PATCH 1/1 OF-related update for FEC and SCC MAC's
Updated direct resource pass with ioremap call, make it grant proper IRQ mapping, stuff incompatible with the new approach were respectively put under #ifndef CONFIG_PPC_MERGE.
---
drivers/net/fs_enet/mac-fec.c | 13 +++++++++---- drivers/net/fs_enet/mac-scc.c | 6 ++++-- drivers/net/phy/fixed.c | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-)
drivers/net/fs_enet/mac-fec.c +9 -4
@@ -104,9 +104,9 @@ static int do_pd_setup(struct fs_enet_pr fep->interrupt =platform_get_irq_byname (pdev,"interrupt" );if (fep->interrupt <0 )return -EINVAL ; - + r =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"regs" ); - fep->fec.fecp =(void *)r->start; + fep->fec.fecp = (void *)ioremap (r->start, r->end - r->start +1 );if (fep->fec.fecp ==NULL )return -EINVAL ;
@@ -319,11 +319,14 @@ #endif* Clear any outstanding interrupt. */ FW (fecp, ievent,0xffc0 ); +#ifndef CONFIG_PPC_MERGE FW (fecp, ivec, (fep->interrupt /2 ) <<29 ); - +#else +FW (fecp, ivec, (irq_map[fep->interrupt].hwirq /2 ) <<29 ); +#endif /* -* adjust to speed (only for DUET & RMII) +* adjust to speed (only for DUET & RMII) */ #ifdef CONFIG_DUET if (fpi->use_rmii) {
@@ -418,6 +421,7 @@ static void stop(struct net_device *dev)static void pre_request_irq (struct net_device *dev,int irq) { +#ifndef CONFIG_PPC_MERGE immap_t *immap = fs_enet_immap;u32 siel;
@@ -431,6 +435,7 @@ static void pre_request_irq(struct net_d siel &= ~(0x80000000 >> (irq & ~1 )); out_be32(&immap->im_siu_conf.sc_siel, siel); } +#endif }static void post_free_irq (struct net_device *dev,int irq)
drivers/net/fs_enet/mac-scc.c +4 -2
@@ -121,13 +121,13 @@ static int do_pd_setup(struct fs_enet_prreturn -EINVAL ; r =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"regs" ); - fep->scc.sccp = (void *)r->start; + fep->scc.sccp = (void *)ioremap (r->start, r->end - r->start +1 );if (fep->scc.sccp ==NULL )return -EINVAL ; r =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"pram" ); - fep->scc.ep = (void *)r->start; + fep->scc.ep = (void *)ioremap (r->start, r->end - r->start +1 );if (fep->scc.ep ==NULL )return -EINVAL ;
@@ -397,6 +397,7 @@ static void stop(struct net_device *dev)static void pre_request_irq (struct net_device *dev,int irq) { +#ifndef CONFIG_PPC_MERGE immap_t *immap = fs_enet_immap;u32 siel;
@@ -410,6 +411,7 @@ static void pre_request_irq(struct net_d siel &= ~(0x80000000 >> (irq & ~1 )); out_be32(&immap->im_siu_conf.sc_siel, siel); } +#endif }static void post_free_irq (struct net_device *dev,int irq)
drivers/net/phy/fixed.c +1 -1
@@ -349,7 +349,7 @@ #ifdef CONFIG_FIXED_MII_100_FDXfixed_mdio_register_device (0 ,100 ,1 );#endif -#ifdef CONFIX_FIXED_MII_10_FDX +#ifdef CONFIG_FIXED_MII_10_FDX fixed_mdio_register_device (0 ,10 ,1 );#endif return 0 ;
Quoted 4 lines · On Mon, 11 Dec 2006 21:00:49 +0300 Vitaly Bordug <[email protected]> wrote:
Updated direct resource pass with ioremap call, make it grant proper IRQ mapping, stuff incompatible with the new approach were respectively put under #ifndef
CONFIG_PPC_MERGE.
Hrm, Signed-off-by: missed, I'll resend, sorry about that.
Signature · 2 lines
Sincerely, Vitaly