Skip to content

Commit

Permalink
[ARM] pxa/stargate2: Add board specific elements to the smc91x driver
Browse files Browse the repository at this point in the history
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
  • Loading branch information
Jonathan Cameron authored and Eric Miao committed Jun 5, 2009
1 parent 4036e1d commit 80153d1
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/net/smc91x.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
defined(CONFIG_MACH_ZYLONITE) ||\
defined(CONFIG_MACH_LITTLETON) ||\
defined(CONFIG_MACH_ZYLONITE2) ||\
defined(CONFIG_ARCH_VIPER)
defined(CONFIG_ARCH_VIPER) ||\
defined(CONFIG_MACH_STARGATE2)

#include <asm/mach-types.h>

Expand Down Expand Up @@ -73,7 +74,7 @@
/* We actually can't write halfwords properly if not word aligned */
static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)
{
if (machine_is_mainstone() && reg & 2) {
if ((machine_is_mainstone() || machine_is_stargate2()) && reg & 2) {
unsigned int v = val << 16;
v |= readl(ioaddr + (reg & ~2)) & 0xffff;
writel(v, ioaddr + (reg & ~2));
Expand Down

0 comments on commit 80153d1

Please sign in to comment.