diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-03-23 02:04:16 +0100 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-23 02:58:48 +0100 |
| commit | 626806d96fcfe355af5e1d299f651c774f68ead0 (patch) | |
| tree | 99f13e4dd8abaff90b380a041a0cbe8b6cc9e018 /arch/arm/mach-pxa/colibri-pxa300.c | |
| parent | [ARM] pxa: add colibri PXA300 defconfig (diff) | |
| download | linux-626806d96fcfe355af5e1d299f651c774f68ead0.tar.xz linux-626806d96fcfe355af5e1d299f651c774f68ead0.zip | |
[ARM] pxa: Fix Colibri AX88796 configuration
Broaden the AX88796 register mask to allow access to the reset register.
Remove unnecessary value definitions and the second resource block.
Diagnosed-by: Matthias Meier <matthias.j.meier@gmx.net>
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa300.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa300.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c index f1f24869c03d..a5c1f72d88c9 100644 --- a/arch/arm/mach-pxa/colibri-pxa300.c +++ b/arch/arm/mach-pxa/colibri-pxa300.c @@ -55,24 +55,16 @@ static mfp_cfg_t colibri_pxa300_pin_config[] __initdata = { */ static struct ax_plat_data colibri_asix_platdata = { .flags = AXFLG_MAC_FROMDEV, - .wordlength = 2, - .dcr_val = 0x01, - .rcr_val = 0x0e, - .gpoc_val = 0x19 + .wordlength = 2 }; static struct resource colibri_asix_resource[] = { [0] = { .start = PXA3xx_CS2_PHYS, - .end = PXA3xx_CS2_PHYS + (0x18 * 0x2) - 1, + .end = PXA3xx_CS2_PHYS + (0x20 * 2) - 1, .flags = IORESOURCE_MEM, }, [1] = { - .start = PXA3xx_CS2_PHYS + (1 << 11), - .end = PXA3xx_CS2_PHYS + (1 << 11) + 0x3fff, - .flags = IORESOURCE_MEM, - }, - [2] = { .start = COLIBRI_PXA300_ETH_IRQ, .end = COLIBRI_PXA300_ETH_IRQ, .flags = IORESOURCE_IRQ |