update config for it50

diff --git a/arch/arm/configs/rk2818_info_it50_defconfig b/arch/arm/configs/rk2818_info_it50_defconfig
index be31d586f88b30ba9dbb80f3d3a00900da095222..def4397ec0b0076108358c97cc24da7d58c3ab9f 100644 (file)
--- a/arch/arm/configs/rk2818_info_it50_defconfig
+++ b/arch/arm/configs/rk2818_info_it50_defconfig
@@ -699,8 +699,8 @@ CONFIG_KEYBOARD_RK28ADC_IT50=y
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_XPT2046_SPI is not set
-CONFIG_TOUCHSCREEN_XPT2046_CBN_SPI=y
+CONFIG_TOUCHSCREEN_XPT2046_SPI=y
+# CONFIG_TOUCHSCREEN_XPT2046_CBN_SPI is not set
 # CONFIG_TOUCHSCREEN_XPT2046_320X480_SPI is not set
 # CONFIG_TOUCHSCREEN_XPT2046_320X480_CBN_SPI is not set
 # CONFIG_TOUCHSCREEN_IT7250 is not set
@@ -736,7 +736,10 @@ CONFIG_INPUT_KEYCHORD=y
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_GPIO is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_G_SENSOR_DEVICE is not set
+CONFIG_G_SENSOR_DEVICE=y
+CONFIG_GS_MMA7660=y
+CONFIG_INPUT_JOGBALL=y
+CONFIG_RK2818_JOGBALL=y
 
 #
 # Hardware I/O ports

diff --git a/arch/arm/mach-rk2818/board-infoit50.c b/arch/arm/mach-rk2818/board-infoit50.c
index eef8b3d2e6a695893900dbdb414523bd4c32a044..0bc6342e194b842c29f74c3f06bfbb5e200df4cd 100644 (file)
--- a/arch/arm/mach-rk2818/board-infoit50.c
+++ b/arch/arm/mach-rk2818/board-infoit50.c
@@ -499,7 +499,7 @@ struct rk2818_i2c_platform_data default_i2c1_data = {
        .flags      = 0,
        .slave_addr = 0xff,
        .scl_rate  = 400*1000,
-       .mode           = I2C_MODE_IRQ,
+       .mode           = I2C_MODE_POLL,
        .io_init = rk2818_i2c1_io_init,
 };
 
@@ -1268,6 +1268,9 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_HEADSET_DET
     &rk28_device_headset,
 #endif
+#ifdef CONFIG_INPUT_JOGBALL
+       &rk2818_jogball_device,
+#endif
 #ifdef CONFIG_DWC_OTG
        &rk2818_device_dwc_otg,
 #endif

diff --git a/arch/arm/mach-rk2818/board-infosdk-rfkill.c b/arch/arm/mach-rk2818/board-infosdk-rfkill.c
index 0f7476580c1429e71633490d7edc544dfba5112d..0debdc24a9d9fdf9631dd513e94acba7ac01b826 100755 (executable)
--- a/arch/arm/mach-rk2818/board-infosdk-rfkill.c
+++ b/arch/arm/mach-rk2818/board-infosdk-rfkill.c
@@ -33,7 +33,7 @@
 #endif
 
 #ifdef CONFIG_MACH_RK2818INFO_IT50
-#define INFO_BT_GPIO_POWER_N   TCA6424_P02
+#define INFO_BT_GPIO_POWER_N   TCA6424_P01
 #define INFO_BT_GPIO_RESET_N   TCA6424_P14
 #else
 #define INFO_BT_GPIO_POWER_N   TCA6424_P25

diff --git a/arch/arm/mach-rk2818/devices.c b/arch/arm/mach-rk2818/devices.c
index 3c5c5c3478a4852fe6c9f226cf5b2e7150f08eb5..68eff2c9bab3ed8055f99d84c93ccbb8c2de6211 100755 (executable)
--- a/arch/arm/mach-rk2818/devices.c
+++ b/arch/arm/mach-rk2818/devices.c
@@ -484,6 +484,14 @@ struct platform_device rk2818_nand_device = {
 };
 
 #endif
+
+#if defined(CONFIG_INPUT_JOGBALL)
+struct platform_device rk2818_jogball_device = {
+               .name   = "rk2818_jogball",
+               .id     = -1,
+};
+#endif
+
 /*DWC_OTG*/
 static struct resource dwc_otg_resource[] = {
        {

diff --git a/arch/arm/mach-rk2818/devices.h b/arch/arm/mach-rk2818/devices.h
index 75960bebc939b16ca2a6b159457b419128fdceda..f91bc671adcad9dd88ceb56d790b7df3e6ae15a2 100755 (executable)
--- a/arch/arm/mach-rk2818/devices.h
+++ b/arch/arm/mach-rk2818/devices.h
@@ -42,6 +42,7 @@ extern struct platform_device rk2818_device_sdmmc0;
 extern struct platform_device rk2818_device_sdmmc1;
 extern struct rk2818_sdmmc_platform_data default_sdmmc0_data;
 extern struct rk2818_sdmmc_platform_data default_sdmmc1_data;
+extern struct platform_device rk2818_jogball_device;
 extern struct platform_device rk2818_device_i2s;
 extern struct rk2818_i2s_platform_data rk2818_i2s_platdata;
 extern struct platform_device rk2818_device_pmem;

diff --git a/drivers/input/jogball/Kconfig b/drivers/input/jogball/Kconfig
index d679f9e2edcd270a27626e0efbc9121a7eb0936f..268ea38e0038b1e98b2e406b3f03bb137b4cd27d 100644 (file)
--- a/drivers/input/jogball/Kconfig
+++ b/drivers/input/jogball/Kconfig
@@ -11,8 +11,8 @@ menuconfig INPUT_JOGBALL
 
 if INPUT_JOGBALL
 
-config RK28_JOGBALL
-       tristate "RK28 Jogball"
+config RK2818_JOGBALL
+       tristate "RK2818 Jogball"
        depends on INPUT_JOGBALL        
        help
            say Y here if you have a jogball interface .  

diff --git a/drivers/input/jogball/Makefile b/drivers/input/jogball/Makefile
index cf99825dfdbbd199109dd95f07f34e6946b97b6a..db3864b57f5b5f837ed144387bcfa6a99a0bc9fd 100644 (file)
--- a/drivers/input/jogball/Makefile
+++ b/drivers/input/jogball/Makefile
@@ -4,4 +4,4 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_RK28_JOGBALL)             += rk2818_jogball.o
+obj-$(CONFIG_RK2818_JOGBALL)           += rk2818_jogball.o

diff --git a/drivers/input/jogball/rk2818_jogball.c b/drivers/input/jogball/rk2818_jogball.c
index d76e5e1303b52a1da840f26f07a4b62341b687a1..683793464c24d4a71eac2cd086054eab7b8d8f4a 100644 (file)
--- a/drivers/input/jogball/rk2818_jogball.c
+++ b/drivers/input/jogball/rk2818_jogball.c
@@ -430,7 +430,7 @@ static struct platform_driver rk28_jogball_driver =
        .probe          = rk28_jogball_probe,\r
        .remove         = __devexit_p(rk28_jogball_remove),\r
        .driver         = {\r
-               .name   = "rk28_jogball",\r
+               .name   = "rk2818_jogball",\r
                .owner  = THIS_MODULE,\r
        },\r
        .shutdown   = rk28_jogball_shutdown,\r