Commit b802bd8c authored by Marc Singer's avatar Marc Singer Committed by Russell King

[ARM PATCH] 1916/1: lh7a40x #5 (1/1) revision B support

Patch from Marc Singer

Small change to support revision B Card Engines.
parent 4bb48aad
...@@ -116,7 +116,12 @@ extern void lpd7a400_map_io (void); ...@@ -116,7 +116,12 @@ extern void lpd7a400_map_io (void);
static void __init lpd7a40x_init (void) static void __init lpd7a40x_init (void)
{ {
CPLD_CONTROL = 0x0; /* Enable LAN (Disable LCD) */ CPLD_CONTROL |= (1<<6); /* Mask USB1 connection IRQ */
CPLD_CONTROL &= ~(0
| (1<<1) /* Disable LCD */
| (1<<0) /* Enable WLAN */
);
platform_add_devices (lpd7a40x_devs, ARRAY_SIZE (lpd7a40x_devs)); platform_add_devices (lpd7a40x_devs, ARRAY_SIZE (lpd7a40x_devs));
} }
...@@ -191,7 +196,7 @@ void __init lh7a40x_init_board_irq (void) ...@@ -191,7 +196,7 @@ void __init lh7a40x_init_board_irq (void)
int pinCPLD = (cpld_version == 0x28) ? 7 : 3; int pinCPLD = (cpld_version == 0x28) ? 7 : 3;
#if defined CONFIG_MACH_LPD7A404 #if defined CONFIG_MACH_LPD7A404
cpld_version = 0x34; /* Override, for now */ cpld_version = 0x34; /* Coerce LPD7A404 to RevB */
#endif #endif
/* First, configure user controlled GPIOF interrupts */ /* First, configure user controlled GPIOF interrupts */
...@@ -204,7 +209,7 @@ void __init lh7a40x_init_board_irq (void) ...@@ -204,7 +209,7 @@ void __init lh7a40x_init_board_irq (void)
/* Then, configure CPLD interrupt */ /* Then, configure CPLD interrupt */
CPLD_INTERRUPTS = 0x0c; /* Disable all CPLD interrupts */ CPLD_INTERRUPTS = 0x9c; /* Disable all CPLD interrupts */
GPIO_PFDD &= ~(1 << pinCPLD); /* Make input */ GPIO_PFDD &= ~(1 << pinCPLD); /* Make input */
GPIO_INTTYPE1 |= (1 << pinCPLD); /* Edge triggered */ GPIO_INTTYPE1 |= (1 << pinCPLD); /* Edge triggered */
GPIO_INTTYPE2 &= ~(1 << pinCPLD); /* Active low */ GPIO_INTTYPE2 &= ~(1 << pinCPLD); /* Active low */
......
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