off debug input key printk and sdmmc debug

diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig
index cead87abf140f4970c9d21bf9a7ae5c7cc4055e8..ce584fd427712f47227d77b591922951998b1184 100755 (executable)
--- a/arch/arm/configs/rk29_sdk_defconfig
+++ b/arch/arm/configs/rk29_sdk_defconfig
@@ -990,7 +990,7 @@ CONFIG_SND_SOC_WM8900=y
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
-CONFIG_MMC_DEBUG=y
+# CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 CONFIG_MMC_EMBEDDED_SDIO=y
 # CONFIG_MMC_PARANOID_SD_INIT is not set

diff --git a/arch/arm/mach-rk29/devices.c b/arch/arm/mach-rk29/devices.c
index 9ee56019f2b7b558d8f9896e08317bb9c18d718e..a4d50aa90f81473ae5c59723b905cd356771fe40 100755 (executable)
--- a/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@ -308,9 +308,6 @@ struct platform_device rk29_device_uart0 = {
        .id     = 0,
        .num_resources  = ARRAY_SIZE(resources_uart0),
        .resource       = resources_uart0,
-       .dev = {
-               .platform_data = &rk2818_serial0_platdata,
-       },
 };
 #endif
 #ifdef CONFIG_UART1_RK29

diff --git a/drivers/input/keyboard/rk29_keys.c b/drivers/input/keyboard/rk29_keys.c
index 37f0bb805a2a7fcb1821352bbc1525617640ab22..bbf83ebf4cfbe45ab1e6620ffdfa7bade8e0cc4f 100755 (executable)
--- a/drivers/input/keyboard/rk29_keys.c
+++ b/drivers/input/keyboard/rk29_keys.c
@@ -32,7 +32,7 @@
 #define INVALID_ADVALUE                                10
 
 
-#if 1
+#if 0
 #define key_dbg(bdata, format, arg...)         \
        dev_printk(KERN_INFO , &bdata->input->dev , format , ## arg)
 #else

diff --git a/drivers/mmc/host/rk29_sdmmc.c b/drivers/mmc/host/rk29_sdmmc.c
index 09ee6933d246e72e75b985f314308fe246bc3015..ed962d8c131796a514a1ad6df759dd2654892a78 100755 (executable)
--- a/drivers/mmc/host/rk29_sdmmc.c
+++ b/drivers/mmc/host/rk29_sdmmc.c
@@ -733,6 +733,7 @@ static void rk29_sdmmc_request_end(struct rk29_sdmmc *host, struct mmc_request *
                         /* wait till resets clear */
                        while (rk29_sdmmc_read(host->regs, SDMMC_CTRL) & ( SDMMC_CTRL_FIFO_RESET));
                        local_irq_restore(flags);
+                       time_out2--;
                        if(!time_out2)
                                break;
                }