diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2007-12-11 17:59:42 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2007-12-11 17:59:42 +0000 |
| commit | 7e6956ad88d17f90f2550ab61abdbe4a6c6466d6 (patch) | |
| tree | be785c7460fb267b39f6ad669e963a67bea470ee | |
| parent | 5273e5143dd880f187683ea7207181cca4c85e0b (diff) | |
| download | master-187ad058-7e6956ad88d17f90f2550ab61abdbe4a6c6466d6.tar.gz master-187ad058-7e6956ad88d17f90f2550ab61abdbe4a6c6466d6.tar.bz2 master-187ad058-7e6956ad88d17f90f2550ab61abdbe4a6c6466d6.zip | |
[adm5120] enable wait state pin for the CF slot on the RB153 board
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9709 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c | 4 | ||||
| -rw-r--r-- | target/linux/adm5120/files/arch/mips/adm5120/gpio.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c index 102fa56157..3d2facfd15 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c @@ -242,8 +242,10 @@ static void __init rb1xx_flash_setup(void) static void __init rb153_cf_setup(void) { - /* enable CSX1:INTX1 on GPIO 3:4 for the CF slot */ + /* enable CSX1:INTX1 on GPIO[3:4] for the CF slot */ adm5120_gpio_csx1_enable(); + /* enable the wait state pin GPIO[0] for external I/O control */ + adm5120_gpio_ew_enable(); gpio_request(RB153_GPIO_CF_RDY, "cf-ready"); gpio_direction_input(RB153_GPIO_CF_RDY); diff --git a/target/linux/adm5120/files/arch/mips/adm5120/gpio.c b/target/linux/adm5120/files/arch/mips/adm5120/gpio.c index a6cfdcbe09..a9e6e6bdfb 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/gpio.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/gpio.c @@ -370,6 +370,8 @@ void __init adm5120_gpio_ew_enable(void) t = SW_READ_REG(GPIO_CONF2); t |= GPIO_CONF2_EW; SW_WRITE_REG(GPIO_CONF2, t); + + adm5120_gpio_map[ADM5120_GPIO_PIN0].flags &= ~GPIO_FLAG_VALID; } void __init adm5120_gpio_init(void) |