enable wait state pin for the CF slot on the RB153 board

SVN-Revision: 9709

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 102fa5615779cfadbedd48dc6e7eab26c9b7a1ac..3d2facfd1533c99d6fab1b3a07438760989ecdcd 100644 (file)
--- 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 a6cfdcbe098f644fd0f87de62ca2e52653e0e0e2..a9e6e6bdfb4dfd746b268dc0f59ac10420ae800e 100644 (file)
--- 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)