From 0ac1d90519c6dbf22e19be6857da88f2d15ac270 Mon Sep 17 00:00:00 2001 From: lhh Date: Wed, 15 Dec 2010 17:21:07 +0800 Subject: [PATCH] off debug input key printk and sdmmc debug --- arch/arm/configs/rk29_sdk_defconfig | 2 +- arch/arm/mach-rk29/devices.c | 3 --- drivers/input/keyboard/rk29_keys.c | 2 +- drivers/mmc/host/rk29_sdmmc.c | 1 + 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig index cead87abf140..ce584fd42771 100755 --- 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 9ee56019f2b7..a4d50aa90f81 100755 --- 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 37f0bb805a2a..bbf83ebf4cfb 100755 --- 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 09ee6933d246..ed962d8c1317 100755 --- 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; } -- 2.34.1