update board-rk29-aigo

diff --git a/arch/arm/configs/rk29_aigo_defconfig b/arch/arm/configs/rk29_aigo_defconfig
index 91dcfc554ac00b75c0f0f6c0f94e8e45850a2783..7cb62988d5c0bff0c419226a307ab9b6b4584676 100644 (file)
--- a/arch/arm/configs/rk29_aigo_defconfig
+++ b/arch/arm/configs/rk29_aigo_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.27
-# Thu Dec 30 18:19:14 2010
+# Wed Jan  5 10:23:09 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -805,7 +805,9 @@ CONFIG_TOUCHSCREEN_XPT2046_SPI_NOCHOOSE=y
 CONFIG_TOUCHSCREEN_IT7260=y
 # CONFIG_INPUT_MISC is not set
 CONFIG_INPUT_GPIO=y
-# CONFIG_G_SENSOR_DEVICE is not set
+CONFIG_G_SENSOR_DEVICE=y
+# CONFIG_GS_MMA7660 is not set
+CONFIG_GS_MMA8452=y
 # CONFIG_INPUT_JOGBALL is not set
 
 #

diff --git a/arch/arm/mach-rk29/board-rk29-aigo.c b/arch/arm/mach-rk29/board-rk29-aigo.c
index dadd4643112844478c72b2d3a5a163ec9323f2e2..8f01bce28f62fe3585641493508a1843dc3af415 100644 (file)
--- a/arch/arm/mach-rk29/board-rk29-aigo.c
+++ b/arch/arm/mach-rk29/board-rk29-aigo.c
@@ -62,7 +62,7 @@
 #define PMEM_GPU_SIZE       SZ_64M\r
 #define PMEM_UI_SIZE        SZ_32M\r
 #define PMEM_VPU_SIZE       SZ_64M\r
-#define PMEM_CAM_SIZE       0x00c00000\r
+#define PMEM_CAM_SIZE       0x01300000\r
 #ifdef CONFIG_VIDEO_RK29_WORK_IPP\r
 #define MEM_CAMIPP_SIZE     SZ_4M\r
 #else\r
@@ -80,45 +80,8 @@
 \r
 extern struct sys_timer rk29_timer;\r
 \r
-#define NAND_CS_MAX_NUM     1  /*form 0 to 8, it is 0 when no nand flash */\r
 int rk29_nand_io_init(void)\r
 {\r
-#if (NAND_CS_MAX_NUM == 2)
-    rk29_mux_api_set(GPIO0D2_FLASHCSN1_NAME, GPIO0H_FLASH_CSN1);\r
-#elif (NAND_CS_MAX_NUM == 3)
-    rk29_mux_api_set(GPIO0D2_FLASHCSN1_NAME, GPIO0H_FLASH_CSN1);\r
-    rk29_mux_api_set(GPIO0D3_FLASHCSN2_NAME, GPIO0H_FLASH_CSN2);\r
-#elif (NAND_CS_MAX_NUM == 4)
-    rk29_mux_api_set(GPIO0D2_FLASHCSN1_NAME, GPIO0H_FLASH_CSN1);\r
-    rk29_mux_api_set(GPIO0D3_FLASHCSN2_NAME, GPIO0H_FLASH_CSN2);\r
-    rk29_mux_api_set(GPIO0D4_FLASHCSN3_NAME, GPIO0H_FLASH_CSN3);\r
-#elif (NAND_CS_MAX_NUM == 5) \r
-    rk29_mux_api_set(GPIO0D2_FLASHCSN1_NAME, GPIO0H_FLASH_CSN1);\r
-    rk29_mux_api_set(GPIO0D3_FLASHCSN2_NAME, GPIO0H_FLASH_CSN2);\r
-    rk29_mux_api_set(GPIO0D4_FLASHCSN3_NAME, GPIO0H_FLASH_CSN3);\r
-    rk29_mux_api_set(GPIO0D5_FLASHCSN4_NAME, GPIO0H_FLASH_CSN4);  \r
-#elif (NAND_CS_MAX_NUM == 6)\r
-    rk29_mux_api_set(GPIO0D2_FLASHCSN1_NAME, GPIO0H_FLASH_CSN1);\r
-    rk29_mux_api_set(GPIO0D3_FLASHCSN2_NAME, GPIO0H_FLASH_CSN2);\r
-    rk29_mux_api_set(GPIO0D4_FLASHCSN3_NAME, GPIO0H_FLASH_CSN3);\r
-    rk29_mux_api_set(GPIO0D5_FLASHCSN4_NAME, GPIO0H_FLASH_CSN4); \r
-    rk29_mux_api_set(GPIO0D6_FLASHCSN5_NAME, GPIO0H_FLASH_CSN5);       \r
-#elif (NAND_CS_MAX_NUM == 7)\r
-    rk29_mux_api_set(GPIO0D2_FLASHCSN1_NAME, GPIO0H_FLASH_CSN1);\r
-    rk29_mux_api_set(GPIO0D3_FLASHCSN2_NAME, GPIO0H_FLASH_CSN2);\r
-    rk29_mux_api_set(GPIO0D4_FLASHCSN3_NAME, GPIO0H_FLASH_CSN3);\r
-    rk29_mux_api_set(GPIO0D5_FLASHCSN4_NAME, GPIO0H_FLASH_CSN4);  \r
-    rk29_mux_api_set(GPIO0D6_FLASHCSN5_NAME, GPIO0H_FLASH_CSN5); \r
-    rk29_mux_api_set(GPIO0D7_FLASHCSN6_NAME, GPIO0H_FLASH_CSN6); \r
-#elif (NAND_CS_MAX_NUM == 8)\r
-    rk29_mux_api_set(GPIO0D2_FLASHCSN1_NAME, GPIO0H_FLASH_CSN1);\r
-    rk29_mux_api_set(GPIO0D3_FLASHCSN2_NAME, GPIO0H_FLASH_CSN2);\r
-    rk29_mux_api_set(GPIO0D4_FLASHCSN3_NAME, GPIO0H_FLASH_CSN3);\r
-    rk29_mux_api_set(GPIO0D5_FLASHCSN4_NAME, GPIO0H_FLASH_CSN4);  \r
-    rk29_mux_api_set(GPIO0D6_FLASHCSN5_NAME, GPIO0H_FLASH_CSN5); \r
-    rk29_mux_api_set(GPIO0D7_FLASHCSN6_NAME, GPIO0H_FLASH_CSN6);  \r
-    rk29_mux_api_set(GPIO1A0_FLASHCS7_MDDRTQ_NAME, GPIO1L_FLASH_CS7);      \r
-#endif\r
     return 0;\r
 }\r
 \r
@@ -437,7 +400,7 @@ int it7260_init_platform_hw(void)
     gpio_direction_output(TOUCH_INT_PIN, 0);   \r
     gpio_set_value(TOUCH_INT_PIN,GPIO_LOW);    \r
  \r
-    msleep(100); //msleep(3000);    \r
+    msleep(100);  \r
     gpio_set_value(TOUCH_PWR_PIN,GPIO_HIGH);   \r
     msleep(100);       \r
 \r
@@ -794,6 +757,7 @@ static int rk29_sensor_power(struct device *dev, int on)
                } else {\r
                        gpio_set_value(camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
                        //printk("\n%s..%s..PowerPin=%d ..PinLevel = %x   \n",__FUNCTION__,dev_name(dev), camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
+                       msleep(100);\r
                }\r
        }\r
 \r
@@ -1672,12 +1636,21 @@ static void __init machine_rk29_init_irq(void)
        rk29_gpio_irq_setup();\r
 }\r
 #define POWER_ON_PIN RK29_PIN4_PA4\r
+static void rk29_pm_power_off(void)\r
+{\r
+       printk(KERN_ERR "rk29_pm_power_off start...\n");\r
+       \r
+       gpio_direction_output(POWER_ON_PIN, GPIO_LOW);\r
+       while(1);\r
+}\r
+\r
 static void __init machine_rk29_board_init(void)\r
 {\r
         rk29_board_iomux_init();\r
        gpio_request(POWER_ON_PIN,"poweronpin");        \r
        gpio_set_value(POWER_ON_PIN, GPIO_HIGH);\r
        gpio_direction_output(POWER_ON_PIN, GPIO_HIGH);\r
+       pm_power_off = rk29_pm_power_off;\r
 
 #ifdef CONFIG_WIFI_CONTROL_FUNC
                 rk29sdk_wifi_bt_gpio_control_init();