Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-rk29 / board-rk29sdk.c

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 486e9c028d3acbff131c9c26fde2239ad83e98bb..e63176f2d45022aec071fee8beb1044dbc2d0764 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -344,6 +344,32 @@ struct p1003_platform_data p1003_info = {
 };\r
 #endif\r
 \r
+/*MMA8452 gsensor*/\r
+#if defined (CONFIG_GS_MMA8452)\r
+#define MMA8452_INT_PIN   RK29_PIN0_PA3\r
+\r
+int mma8452_init_platform_hw(void)\r
+{\r
+\r
+    if(gpio_request(MMA8452_INT_PIN,NULL) != 0){\r
+      gpio_free(MMA8452_INT_PIN);\r
+      printk("mma8452_init_platform_hw gpio_request error\n");\r
+      return -EIO;\r
+    }\r
+    gpio_pull_updown(MMA8452_INT_PIN, 1);\r
+    return 0;\r
+}\r
+\r
+\r
+struct mma8452_platform_data mma8452_info = {\r
+  .model= 8452,\r
+  .swap_xy = 0,\r
+  .init_platform_hw= mma8452_init_platform_hw,\r
+\r
+};\r
+#endif\r
+\r
+\r
 \r
 /*****************************************************************************************\r
  * i2c devices\r
@@ -457,6 +483,16 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
                ///.irq            = RK2818_PIN_PA4,\r
        },\r
 #endif\r
+#if defined (CONFIG_GS_MMA8452)\r
+    {\r
+      .type           = "gs_mma8452",\r
+      .addr           = 0x1c,\r
+      .flags          = 0,\r
+      .irq            = MMA8452_INT_PIN,\r
+      .platform_data  = &mma8452_info,\r
+    },\r
+#endif\r
+\r
 };\r
 #endif\r
 \r