Revert "add the feature of write-protect for sdcard"

This reverts commit 5d4081964ec7cc2288f75d3cf5949bd2daa2737e.

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index 6976859a210508e49bd4d7e8b2279db49744e6bb..7e8c3ce90ed8747dbd847c6b510a8924f63138f2 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -1869,12 +1869,6 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
 #endif
        .detect_irq = RK29_PIN2_PA2, // INVALID_GPIO
        .enable_sd_wakeup = 0,
-
-#if defined(CONFIG_SDMMC0_RK29_WRITE_PROTECT)
-    .write_prt = RK29_PIN6_PB0,//According to your own project to set the value of write-protect-pin.
-#else
-    .write_prt = INVALID_GPIO,
-#endif
 };
 #endif
 #ifdef CONFIG_SDMMC1_RK29
@@ -1918,13 +1912,6 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
 #if 0
         .detect_irq = RK29SDK_WIFI_SDIO_CARD_DETECT_N,
 #endif
-
-#if defined(CONFIG_SDMMC1_RK29_WRITE_PROTECT)
-    .write_prt = RK29_PIN6_PB0,//According to your own project to set the value of write-protect-pin.
-#else
-    .write_prt = INVALID_GPIO, 
-#endif    
-
 };
 #endif
 

diff --git a/arch/arm/mach-rk29/include/mach/board.h b/arch/arm/mach-rk29/include/mach/board.h
old mode 100755 (executable)
new mode 100644 (file)
index efd21ec..c97306d
--- a/arch/arm/mach-rk29/include/mach/board.h
+++ b/arch/arm/mach-rk29/include/mach/board.h
@@ -143,7 +143,6 @@ struct rk29_sdmmc_platform_data {
        int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
         int detect_irq;
                int enable_sd_wakeup;
-    int write_prt;     
 };
 struct rk29_i2c_platform_data {
        int     bus_num;        

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
old mode 100755 (executable)
new mode 100644 (file)
index 85df780..c5886cd
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -24,13 +24,6 @@ if SDMMC_RK29
                depends on ARCH_RK29 
                help
                        This supports the use of the SDMMC0 controller on Rk29 processors.
-                       
-       config SDMMC0_RK29_WRITE_PROTECT
-               bool "Write-protect for SDMMC0"
-               depends on SDMMC0_RK29
-               help
-                        You will add the feature of write-protect for sdmmc-card if you say Yes.
-                        Please note that this feature requires hardware support.
 #      config EMMC_RK29
 #              tristate "RK29 EMMC controller support(sdmmc)"
 #              default y
@@ -43,12 +36,6 @@ if SDMMC_RK29
                depends on ARCH_RK29
                help
                        This supports the use of the SDMMC1 controller on Rk29 processors.
-       config SDMMC1_RK29_WRITE_PROTECT
-               bool "Write-protect for SDMMC1"
-               depends on SDMMC1_RK29
-               help
-                        You will add the feature of write-protect for sdio-card if you say Yes.
-                        Please note that this feature requires hardware support.
 endif
 
 config MMC_ARMMMCI

diff --git a/drivers/mmc/host/rk29_sdmmc.c b/drivers/mmc/host/rk29_sdmmc.c
index ca13c9553815a3fbbd3d153743b50ff7fec6da9e..c9ed1c8522cb1b415e7c356cc678fb30b9296ca8 100755 (executable)
--- a/drivers/mmc/host/rk29_sdmmc.c
+++ b/drivers/mmc/host/rk29_sdmmc.c
@@ -61,7 +61,7 @@ int debug_level = 7;
 #define xbwprintk(n, arg...)
 #endif
 
-#define RK29_SDMMC_ERROR_FLAGS         (SDMMC_INT_FRUN | SDMMC_INT_HLE )
+#define RK29_SDMMC_ERROR_FLAGS         (SDMMC_INT_FRUN /*| SDMMC_INT_RTO*/ | SDMMC_INT_HLE )
 
 #define RK29_SDMMC_INTMASK_USEDMA   (SDMMC_INT_CMD_DONE | SDMMC_INT_DTO | RK29_SDMMC_ERROR_FLAGS | SDMMC_INT_CD)
 #define RK29_SDMMC_INTMASK_USEIO    (SDMMC_INT_CMD_DONE | SDMMC_INT_DTO | RK29_SDMMC_ERROR_FLAGS | SDMMC_INT_CD| SDMMC_INT_TXDR | SDMMC_INT_RXDR )
@@ -72,7 +72,7 @@ int debug_level = 7;
 #define RK29_SDMMC_WAIT_DTO_INTERNVAL   1500  //The time interval from the CMD_DONE_INT to DTO_INT
 #define RK29_SDMMC_REMOVAL_DELAY        2000  //The time interval from the CD_INT to detect_timer react.
 
-#define RK29_SDMMC_VERSION "Ver.2.08 The last modify date is 2011-09-21,modifyed by XBW." 
+#define RK29_SDMMC_VERSION "Ver.2.07 The last modify date is 2011-09-09,modifyed by XBW." 
 
 #define RK29_CTRL_SDMMC_ID   0  //mainly used by SDMMC
 #define RK29_CTRL_SDIO1_ID   1  //mainly used by sdio-wifi
@@ -197,16 +197,10 @@ struct rk29_sdmmc {
     unsigned int            oldstatus;
     unsigned int            complete_done;
     unsigned int            retryfunc;
-    
 #ifdef CONFIG_PM
     int gpio_irq;
        int gpio_det;
 #endif
-
-#if defined(CONFIG_SDMMC0_RK29_WRITE_PROTECT) || defined(CONFIG_SDMMC1_RK29_WRITE_PROTECT)
-    int write_protect;
-#endif
-
 };
 
 
@@ -2080,26 +2074,10 @@ out:
 
 static int rk29_sdmmc_get_ro(struct mmc_host *mmc)
 {
-    struct rk29_sdmmc *host = mmc_priv(mmc);
-    
-#if defined(CONFIG_SDMMC0_RK29_WRITE_PROTECT) || defined(CONFIG_SDMMC1_RK29_WRITE_PROTECT)
-    int ret;
-    
-       if(INVALID_GPIO == host->write_protect)
-           ret = 0;//no write-protect
-       else
-        ret = gpio_get_value(host->write_protect)?0:1;
-   
-    xbwprintk(7,"%s..%d.. write_prt_pin=%d, get_ro=%d ===xbw[%s]===\n",\
-        __FUNCTION__, __LINE__,host->write_protect, ret, host->dma_name);
-        
-    return ret;
-    
-#else
+       struct rk29_sdmmc *host = mmc_priv(mmc);
        u32 wrtprt = rk29_sdmmc_read(host->regs, SDMMC_WRTPRT);
-       
+
        return (wrtprt & SDMMC_WRITE_PROTECT)?1:0;
-#endif 
 }
 
 
@@ -3049,15 +3027,6 @@ static int rk29_sdmmc_probe(struct platform_device *pdev)
                host->dma_addr = regs->start + SDMMC_DATA;
        }
 
-#if defined(CONFIG_SDMMC0_RK29_WRITE_PROTECT) || defined(CONFIG_SDMMC1_RK29_WRITE_PROTECT)
-       host->write_protect = pdata->write_prt; 
-       if(INVALID_GPIO != host->write_protect)
-       {
-               gpio_direction_input(host->write_protect);          
-       }
-       
-#endif 
-
     rk29_sdmmc_hw_init(host);
 
     ret = request_irq(irq, rk29_sdmmc_interrupt, 0, dev_name(&pdev->dev), host);