sc8803g: modify for sc8803g

diff --git a/arch/arm/mach-rk30/board-rk30-phone-loquat.c b/arch/arm/mach-rk30/board-rk30-phone-loquat.c
index 4c497cb09913191527dd34d661c00b4b96fae62b..a0aa9c04586f1e84e875d33d174960d1b54c9ef7 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-phone-loquat.c
+++ b/arch/arm/mach-rk30/board-rk30-phone-loquat.c
@@ -745,8 +745,14 @@ static int sc8800_io_init(void)
        rk30_mux_api_set(GPIO2B5_LCDC1DATA13_SMCADDR17_HSADCDATA8_NAME, GPIO2B_GPIO2B5);
        rk30_mux_api_set(GPIO2A2_LCDCDATA2_SMCADDR6_NAME, GPIO2A_GPIO2A2);
 
+       rk30_mux_api_set(GPIO2C2_LCDC1DATA18_SMCBLSN1_HSADCDATA5_NAME, GPIO2C_GPIO2C2);//AP_ASK_BP_TEST1
+       gpio_request(RK30_PIN2_PC2, NULL);
+       gpio_direction_output(RK30_PIN2_PC2, 0);
+       gpio_request(RK30_PIN6_PB0, NULL);//AP_ON/OFF_BP
+       gpio_direction_output(RK30_PIN6_PB0, 0);
 
-       rk30_mux_api_set(GPIO2C3_LCDC1DATA19_SPI1CLK_HSADCDATA0_NAME, GPIO2C_SPI1_CLK);
+
+       rk30_mux_api_set(GPIO2C3_LCDC1DATA19_SPI1CLK_HSADCDATA0_NAME, GPIO2C_SPI1_CLK);//spi 1
        rk30_mux_api_set(GPIO2C4_LCDC1DATA20_SPI1CSN0_HSADCDATA1_NAME, GPIO2C_SPI1_CSN0);
        rk30_mux_api_set(GPIO2C5_LCDC1DATA21_SPI1TXD_HSADCDATA2_NAME, GPIO2C_SPI1_TXD);
        rk30_mux_api_set(GPIO2C6_LCDC1DATA22_SPI1RXD_HSADCDATA3_NAME, GPIO2C_SPI1_RXD);
@@ -782,7 +788,7 @@ static struct spi_board_info board_spi_devices[] = {
                        .modalias  = "sc8800",
                        .bus_num = 1,
                        .platform_data = &sc8800_plat_data,
-                       .max_speed_hz  = 12*1000*1000,
+                       .max_speed_hz  = 13*1000*1000,
                        .chip_select   = 0,             
                        .controller_data = &sc8800_spi_chip,
                },

diff --git a/drivers/misc/sc8800.c b/drivers/misc/sc8800.c
index 88199b8bf6f755b552dad5232816b7bd32161a79..4e5ede699ab0d12e70c6dc3197318feac092a362 100755 (executable)
--- a/drivers/misc/sc8800.c
+++ b/drivers/misc/sc8800.c
@@ -330,6 +330,7 @@ static int sc8800_tx(struct sc8800_data *sc8800)
                        ap_rts(sc8800,1);
                        #endif
                        sc8800_dbg(sc8800->dev, "ERR: %s write timeout ->bp not ready (bp_rdy = 1)\n", __func__);
+                       msleep(1);
                        kfree(buf);
                        mutex_unlock(&sc8800s_lock);
                        return -1;