From 8d3e94e2e942ac7dac0154c93695ad68f2c619c9 Mon Sep 17 00:00:00 2001 From: xbw Date: Thu, 6 Mar 2014 17:26:40 +0800 Subject: [PATCH] SDMMC: complete submission rk_sdmmc debug function --- drivers/mmc/host/dw_mmc-rockchip.c | 2 -- drivers/mmc/host/rk_sdmmc.c | 1 + drivers/mmc/host/rk_sdmmc_of.c | 20 ++++++++++---------- drivers/mmc/host/rk_sdmmc_of.h | 6 +++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index 279778712053..e75585baa010 100755 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -24,8 +24,6 @@ #include "dw_mmc-pltfm.h" #include "rk_sdmmc_of.h" -//u32 mmc_debug_level = MMC_DBG_ALL; - #define NUM_PINS(x) (x + 2) diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c index e7f00a7493d2..f2e826235e4c 100755 --- a/drivers/mmc/host/rk_sdmmc.c +++ b/drivers/mmc/host/rk_sdmmc.c @@ -41,6 +41,7 @@ #include #include "rk_sdmmc.h" +#include "rk_sdmmc_of.h" /* Common flag combinations */ #define DW_MCI_DATA_ERROR_FLAGS (SDMMC_INT_DRTO | SDMMC_INT_DCRC | \ diff --git a/drivers/mmc/host/rk_sdmmc_of.c b/drivers/mmc/host/rk_sdmmc_of.c index 778a50995220..747e9c040661 100755 --- a/drivers/mmc/host/rk_sdmmc_of.c +++ b/drivers/mmc/host/rk_sdmmc_of.c @@ -6,17 +6,17 @@ u32 mmc_debug_level; static void rockchip_mmc_of_dump(struct rk_sdmmc_of *rk_mmc_property) { - -printk("%d..%s: ===test ==\n", __LINE__, __FUNCTION__); - MMC_DBG_BOOT_FUNC("=========rockchip mmc dts dump info start== 2014-03-05 16:08 ======\n"); - MMC_DBG_BOOT_FUNC("mmc,caps: 0x%x\n",rk_mmc_property->mmc_caps); - MMC_DBG_BOOT_FUNC("mmc,ocr: 0x%x\n",rk_mmc_property->mmc_ocr); - MMC_DBG_BOOT_FUNC("mmc,int: 0x%x\n",rk_mmc_property->mmc_int_type); - MMC_DBG_BOOT_FUNC("mmc,emmc_is_selected: 0x%x\n",rk_mmc_property->emmc_is_selected); - MMC_DBG_BOOT_FUNC("mmc,use_dma: %d %d\n",rk_mmc_property->mmc_dma_is_used[0], + mmc_debug_level = MMC_DBG_ALL;//set the value refer to file rk_sdmmc_of.h + + MMC_DBG_BOOT_FUNC("=========rockchip mmc dts dump info start== 2014-03-05 16:08 ======"); + MMC_DBG_BOOT_FUNC("mmc,caps: 0x%x",rk_mmc_property->mmc_caps); + MMC_DBG_BOOT_FUNC("mmc,ocr: 0x%x",rk_mmc_property->mmc_ocr); + MMC_DBG_BOOT_FUNC("mmc,int: 0x%x",rk_mmc_property->mmc_int_type); + MMC_DBG_BOOT_FUNC("mmc,emmc_is_selected: 0x%x",rk_mmc_property->emmc_is_selected); + MMC_DBG_BOOT_FUNC("mmc,use_dma: %d %d",rk_mmc_property->mmc_dma_is_used[0], rk_mmc_property->mmc_dma_is_used[1]); - MMC_DBG_BOOT_FUNC("mmc,dma_ch: %d\n",rk_mmc_property->mmc_dma_chn); - MMC_DBG_BOOT_FUNC("=========rockchip mmc dts dump info end================\n"); + MMC_DBG_BOOT_FUNC("mmc,dma_ch: %d",rk_mmc_property->mmc_dma_chn); + MMC_DBG_BOOT_FUNC("=========rockchip mmc dts dump info end================"); } diff --git a/drivers/mmc/host/rk_sdmmc_of.h b/drivers/mmc/host/rk_sdmmc_of.h index b9f4f01fd3be..eddf28b82b0a 100755 --- a/drivers/mmc/host/rk_sdmmc_of.h +++ b/drivers/mmc/host/rk_sdmmc_of.h @@ -19,10 +19,10 @@ enum MMC_DBG_MASK{ MMC_DBG_INFO = BIT(3), MMC_DBG_CMD = BIT(4), MMC_DBG_DBG = BIT(5), - MMC_DBG_ALL = ~0, + MMC_DBG_ALL = 0xFF, }; -//extern u32 mmc_debug_level = MMC_DBG_ALL; +extern u32 mmc_debug_level; #define MMC_DBG_BOOT_FUNC(fmt, arg...) \ if(mmc_debug_level >= MMC_DBG_BOOT){ printk(DRIVER_PREFIX "BOOT " fmt "\n", ##arg);} @@ -33,7 +33,7 @@ enum MMC_DBG_MASK{ #define MMC_DBG_INFO_FUNC(fmt, arg...) \ if(mmc_debug_level >= MMC_DBG_INFO){ printk(DRIVER_PREFIX fmt "\n", ##arg);} #define MMC_DBG_CMD_FUNC(fmt, arg...) \ - if(mmc_debug_level >= MMC_DBG_CMD){ printk(DRIVER_PREFIX "CMD" fmt "\n", ##arg);} + if(mmc_debug_level >= MMC_DBG_CMD){ printk(DRIVER_PREFIX "CMD " fmt "\n", ##arg);} -- 2.34.1