A22:delete preempt_disable operation of SPI bus

diff --git a/arch/arm/configs/rk29_a22_defconfig b/arch/arm/configs/rk29_a22_defconfig
old mode 100755 (executable)
new mode 100644 (file)
index e50c6ad..29881ce
--- a/arch/arm/configs/rk29_a22_defconfig
+++ b/arch/arm/configs/rk29_a22_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.27
-# Fri Jul  1 14:29:35 2011
+# Sat Jul  2 02:51:53 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -998,9 +998,7 @@ CONFIG_SPI_MASTER=y
 CONFIG_SPIM_RK29=y
 CONFIG_SPIM0_RK29=y
 CONFIG_SPIM1_RK29=y
-CONFIG_LCD_USE_SPIM_CONTROL=y
-CONFIG_LCD_USE_SPI0=y
-# CONFIG_LCD_USE_SPI1 is not set
+# CONFIG_LCD_USE_SPIM_CONTROL is not set
 
 #
 # SPI Protocol Masters
@@ -1413,6 +1411,7 @@ CONFIG_DWC_OTG_DEVICE_ONLY=y
 # CONFIG_DWC_OTG_BOTH_HOST_SLAVE is not set
 CONFIG_DWC_CONN_EN=y
 # CONFIG_DWC_OTG_DEBUG is not set
+# CONFIG_DWC_REMOTE_WAKEUP is not set
 CONFIG_DWC_OTG=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set

diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c
index 455836f61f870a8c774530b1d8114af76e5d8eca..d9ffd811e4e9cd12027e3b4bc4088784b353c9c1 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-a22.c
+++ b/arch/arm/mach-rk29/board-rk29-a22.c
@@ -180,17 +180,11 @@ struct rk29_nand_platform_data rk29_nand_data = {
  * author: zyw@rock-chips.com
  *****************************************************************************************/
 //#ifdef  CONFIG_LCD_TD043MGEA1
-#ifdef CONFIG_LCD_USE_SPI0
+
 #define LCD_TXD_PIN          RK29_PIN2_PC2
 #define LCD_CLK_PIN          RK29_PIN2_PC0
 #define LCD_CS_PIN           RK29_PIN1_PA4
-#endif
 
-#ifdef CONFIG_LCD_USE_SPI1
-#define LCD_TXD_PIN          RK29_PIN2_PC6
-#define LCD_CLK_PIN          RK29_PIN2_PC4
-#define LCD_CS_PIN           RK29_PIN2_PC5
-#endif
 /*****************************************************************************************
 * frame buffer  devices
 * author: zyw@rock-chips.com
@@ -214,19 +208,11 @@ static int rk29_lcd_io_init(void)
        ret = gpio_request(LCD_CLK_PIN, NULL);
        ret = gpio_request(LCD_CS_PIN, NULL);
        
-#ifdef CONFIG_LCD_USE_SPI0
+
        //rk29_mux_api_set(GPIO2C7_SPI1RXD_NAME,GPIO2H_GPIO2C7);
        rk29_mux_api_set(GPIO2C2_SPI0TXD_NAME,GPIO2H_GPIO2C2);
        rk29_mux_api_set(GPIO1A4_EMMCWRITEPRT_SPI0CS1_NAME,GPIO1L_GPIO1A4);
        rk29_mux_api_set(GPIO2C0_SPI0CLK_NAME,GPIO2H_GPIO2C0);
-#endif
-
-#ifdef CONFIG_LCD_USE_SPI1
-       //rk29_mux_api_set(GPIO2C7_SPI1RXD_NAME,GPIO2H_GPIO2C7);
-       rk29_mux_api_set(GPIO2C6_SPI1TXD_NAME,GPIO2H_GPIO2C6);
-       rk29_mux_api_set(GPIO2C5_SPI1CSN0_NAME,GPIO2H_GPIO2C5);
-       rk29_mux_api_set(GPIO2C4_SPI1CLK_NAME,GPIO2H_GPIO2C4);
-#endif
 
        return ret;
 }
@@ -240,18 +226,9 @@ static int rk29_lcd_io_deinit(void)
        gpio_free(LCD_TXD_PIN);
        //gpio_free(LCD_RXD_PIN);
 
-#ifdef CONFIG_LCD_USE_SPI0
        rk29_mux_api_set(GPIO2C2_SPI0TXD_NAME,GPIO2H_SPI0_TXD);
        rk29_mux_api_set(GPIO1A4_EMMCWRITEPRT_SPI0CS1_NAME,GPIO1L_SPI0_CSN1);
        rk29_mux_api_set(GPIO2C0_SPI0CLK_NAME,GPIO2H_SPI0_CLK);
-#endif
-
-#ifdef CONFIG_LCD_USE_SPI1
-       //rk29_mux_api_set(GPIO2C7_SPI1RXD_NAME,GPIO2H_SPI1_RXD);
-       rk29_mux_api_set(GPIO2C6_SPI1TXD_NAME,GPIO2H_SPI1_TXD);
-       rk29_mux_api_set(GPIO2C5_SPI1CSN0_NAME,GPIO2H_SPI1_CSN0);
-       rk29_mux_api_set(GPIO2C4_SPI1CLK_NAME,GPIO2H_SPI1_CLK);
-#endif
 
        return ret;
 }

diff --git a/drivers/video/display/screen/lcd_nt35510.c b/drivers/video/display/screen/lcd_nt35510.c
index 74322a747928e5152f77f4b3024a86f1ca733771..4f9ac20928dc6989d9af5f161cd7bdee8178e0af 100755 (executable)
--- a/drivers/video/display/screen/lcd_nt35510.c
+++ b/drivers/video/display/screen/lcd_nt35510.c
@@ -317,7 +317,7 @@ void WriteParameter(char DH)
 void init_nt35510(void)\r
 {\r
        WriteCommand(0X1100); \r
-       mdelay(120);\r
+       msleep(120);\r
 \r
        WriteCommand(0X1300); \r
 \r
@@ -1431,11 +1431,11 @@ else if(OUT_FACE == OUT_P666)
        WriteCommand(0X2000); //\r
 \r
        WriteCommand(0X1100); \r
-       mdelay(120);\r
+       msleep(120);\r
 \r
        WriteCommand(0X2900); \r
 \r
-       mdelay(100);\r
+       msleep(100);\r
        WriteCommand(0X2C00); \r
 }\r
 \r
@@ -1443,7 +1443,7 @@ else if(OUT_FACE == OUT_P666)
 void resume_nt35510(void)\r
 {\r
        WriteCommand(0X1100); \r
-       mdelay(120);\r
+       msleep(120);\r
 \r
        WriteCommand(0X1300); \r
 \r
@@ -1578,11 +1578,11 @@ else if(OUT_FACE == OUT_P666)
        WriteCommand(0X2000); //\r
 \r
        WriteCommand(0X1100); \r
-       mdelay(120);\r
+       msleep(120);\r
 \r
        WriteCommand(0X2900); \r
 \r
-       mdelay(100);\r
+       msleep(100);\r
        WriteCommand(0X2C00); \r
 }\r
 \r
@@ -1594,9 +1594,9 @@ int init(void)
        gpio_request(RK29_PIN6_PC6, NULL);\r
        gpio_direction_output(RK29_PIN6_PC6, 1);\r
        gpio_direction_output(RK29_PIN6_PC6, 0);\r
-       mdelay(5);\r
+       msleep(5);\r
        gpio_set_value(RK29_PIN6_PC6, 1);\r
-       mdelay(50);\r
+       msleep(50);\r
        gpio_free(RK29_PIN6_PC6);\r
 \r
        if(gLcd_info)\r
@@ -1622,21 +1622,21 @@ int standby(u8 enable)  //***enable =1 means suspend, 0 means resume
                WriteCommand(0X2800); \r
                //set_backlight(0);\r
                WriteCommand(0X1100); \r
-               mdelay(5);\r
+               msleep(5);\r
                WriteCommand(0X4f00); \r
                WriteParameter(0x01);\r
        } else { \r
                gpio_request(RK29_PIN6_PC6, NULL);\r
                gpio_direction_output(RK29_PIN6_PC6, 1);\r
                gpio_direction_output(RK29_PIN6_PC6, 0);\r
-               mdelay(5);\r
+               msleep(5);\r
                gpio_set_value(RK29_PIN6_PC6, 1);\r
-               mdelay(50);\r
+               msleep(50);\r
                gpio_free(RK29_PIN6_PC6);\r
                init_nt35510();\r
                //set_backlight(255);\r
                //resume_nt35510();//may be fail to wake up LCD some time,so change to init lcd again\r
-               printk("%s\n",__FUNCTION__);printk("%s\n",__FUNCTION__);\r
+               printk("%s\n",__FUNCTION__);\r
        }\r
 \r
     if(gLcd_info)\r