Commit 80153d1b authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Eric Miao

[ARM] pxa/stargate2: Add board specific elements to the smc91x driver

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 4036e1de
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
defined(CONFIG_MACH_ZYLONITE) ||\ defined(CONFIG_MACH_ZYLONITE) ||\
defined(CONFIG_MACH_LITTLETON) ||\ defined(CONFIG_MACH_LITTLETON) ||\
defined(CONFIG_MACH_ZYLONITE2) ||\ defined(CONFIG_MACH_ZYLONITE2) ||\
defined(CONFIG_ARCH_VIPER) defined(CONFIG_ARCH_VIPER) ||\
defined(CONFIG_MACH_STARGATE2)
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -73,7 +74,7 @@ ...@@ -73,7 +74,7 @@
/* We actually can't write halfwords properly if not word aligned */ /* We actually can't write halfwords properly if not word aligned */
static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) 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; unsigned int v = val << 16;
v |= readl(ioaddr + (reg & ~2)) & 0xffff; v |= readl(ioaddr + (reg & ~2)) & 0xffff;
writel(v, ioaddr + (reg & ~2)); writel(v, ioaddr + (reg & ~2));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment