Skip to content

Commit

Permalink
[ARM] pxa: make lubbock to use new smc91x platform data
Browse files Browse the repository at this point in the history
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Eric Miao authored and Russell King committed Jul 12, 2008
1 parent 52256c0 commit 3aed74c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
8 changes: 8 additions & 0 deletions arch/arm/mach-pxa/lubbock.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <linux/interrupt.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/smc91x.h>

#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
Expand Down Expand Up @@ -284,11 +285,18 @@ static struct resource smc91x_resources[] = {
},
};

static struct smc91x_platdata lubbock_smc91x_info = {
.flags = SMC91X_USE_16BIT | SMC91X_NOWAIT | SMC91X_IO_SHIFT_2,
};

static struct platform_device smc91x_device = {
.name = "smc91x",
.id = -1,
.num_resources = ARRAY_SIZE(smc91x_resources),
.resource = smc91x_resources,
.dev = {
.platform_data = &lubbock_smc91x_info,
},
};

static struct resource flash_resources[] = {
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/smc91x.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
#define SMC_CAN_USE_32BIT 0
#define SMC_NOWAIT 1

/* The first two address lines aren't connected... */
#define SMC_IO_SHIFT 2
#define SMC_IO_SHIFT (lp->io_shift)

#define SMC_inw(a, r) readw((a) + (r))
#define SMC_outw(v, a, r) writew(v, (a) + (r))
Expand Down

0 comments on commit 3aed74c

Please sign in to comment.