aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/colibri-pxa300.c
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-03-22 21:04:16 -0400
committerEric Miao <eric.miao@marvell.com>2009-03-22 21:58:48 -0400
commit626806d96fcfe355af5e1d299f651c774f68ead0 (patch)
tree99f13e4dd8abaff90b380a041a0cbe8b6cc9e018 /arch/arm/mach-pxa/colibri-pxa300.c
parent71d361551265d90c8ab1dcdb223a15568d0026b3 (diff)
[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.c12
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 = {
55 */ 55 */
56static struct ax_plat_data colibri_asix_platdata = { 56static struct ax_plat_data colibri_asix_platdata = {
57 .flags = AXFLG_MAC_FROMDEV, 57 .flags = AXFLG_MAC_FROMDEV,
58 .wordlength = 2, 58 .wordlength = 2
59 .dcr_val = 0x01,
60 .rcr_val = 0x0e,
61 .gpoc_val = 0x19
62}; 59};
63 60
64static struct resource colibri_asix_resource[] = { 61static struct resource colibri_asix_resource[] = {
65 [0] = { 62 [0] = {
66 .start = PXA3xx_CS2_PHYS, 63 .start = PXA3xx_CS2_PHYS,
67 .end = PXA3xx_CS2_PHYS + (0x18 * 0x2) - 1, 64 .end = PXA3xx_CS2_PHYS + (0x20 * 2) - 1,
68 .flags = IORESOURCE_MEM, 65 .flags = IORESOURCE_MEM,
69 }, 66 },
70 [1] = { 67 [1] = {
71 .start = PXA3xx_CS2_PHYS + (1 << 11),
72 .end = PXA3xx_CS2_PHYS + (1 << 11) + 0x3fff,
73 .flags = IORESOURCE_MEM,
74 },
75 [2] = {
76 .start = COLIBRI_PXA300_ETH_IRQ, 68 .start = COLIBRI_PXA300_ETH_IRQ,
77 .end = COLIBRI_PXA300_ETH_IRQ, 69 .end = COLIBRI_PXA300_ETH_IRQ,
78 .flags = IORESOURCE_IRQ 70 .flags = IORESOURCE_IRQ