[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>

diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c
index f1f24869c03d376c0f119dc094dc9d8a482de14f..a5c1f72d88c97679098b2096f9bda81e4dc7f9a3 100644 (file)
--- 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