From 8d8b3a5afadc3eb3ab18176f5f66b5d2d066c6b8 Mon Sep 17 00:00:00 2001
From: lizs <service@t-firefly.com>
Date: Thu, 30 Nov 2017 14:20:31 +0800
Subject: [PATCH] [AIO] Kernel->support mma8452 gsensor

---
 device/rockchip/rk3288/BoardConfig.mk         |   4 ++--
 .../arch/arm/boot/dts/firefly-rk3288-AIO.dts  |  10 ++++++++++
 .../arch/arm/boot/dts/lcd-LP079Qx1-AIO.dtsi   |   3 ++-
 .../arm/boot/dts/lcd-btl790-mipi-AIO.dtsi     |   3 ++-
 kernel/drivers/char/virtd                     | Bin 14996 -> 15048 bytes
 kernel/drivers/input/gsensor/mma8452.c        |   2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/device/rockchip/rk3288/BoardConfig.mk b/device/rockchip/rk3288/BoardConfig.mk
index 254a32359e..e12d50845e 100644
--- a/device/rockchip/rk3288/BoardConfig.mk
+++ b/device/rockchip/rk3288/BoardConfig.mk
@@ -38,8 +38,8 @@ EXTENDED_FONT_FOOTPRINT := true
 MALLOC_IMPL := dlmalloc
 
 # Sensors
-BOARD_SENSOR_ST := false
-BOARD_SENSOR_MPU := true
+BOARD_SENSOR_ST := true
+BOARD_SENSOR_MPU := false
 BOARD_USES_GENERIC_INVENSENSE := false
 
 # ------------ #
diff --git a/kernel/arch/arm/boot/dts/firefly-rk3288-AIO.dts b/kernel/arch/arm/boot/dts/firefly-rk3288-AIO.dts
index f55482e865..bd9e1d7be4 100644
--- a/kernel/arch/arm/boot/dts/firefly-rk3288-AIO.dts
+++ b/kernel/arch/arm/boot/dts/firefly-rk3288-AIO.dts
@@ -463,6 +463,16 @@
 
 &i2c4 {
 	status = "okay";
+
+    sensor@1d {
+           compatible = "gs_mma8452";
+           reg = <0x1d>;
+           type = <SENSOR_TYPE_ACCEL>;
+           irq-gpio = <&gpio5 GPIO_C2 GPIO_ACTIVE_HIGH>;
+           irq_enable = <1>;
+           poll_delay_ms = <30>;
+           layout = <2>;
+    };
 };
 
 &i2c5 {
diff --git a/kernel/arch/arm/boot/dts/lcd-LP079Qx1-AIO.dtsi b/kernel/arch/arm/boot/dts/lcd-LP079Qx1-AIO.dtsi
index 431b3f2d18..5cb7ebcda7 100644
--- a/kernel/arch/arm/boot/dts/lcd-LP079Qx1-AIO.dtsi
+++ b/kernel/arch/arm/boot/dts/lcd-LP079Qx1-AIO.dtsi
@@ -102,7 +102,7 @@
                  flip-y = <1>;
                  swap-xy = <0>;
          };
-
+/*
         mpu6050:mpu@68{
             status = "okay";
             compatible = "mpu6050";
@@ -116,6 +116,7 @@
             irq-gpio = <&gpio5 GPIO_C2 GPIO_ACTIVE_LOW>;
             mpu-debug = <0>;
         };
+*/
 };
 
 &pwm1 {
diff --git a/kernel/arch/arm/boot/dts/lcd-btl790-mipi-AIO.dtsi b/kernel/arch/arm/boot/dts/lcd-btl790-mipi-AIO.dtsi
index 06b602ff32..1f34ad5079 100644
--- a/kernel/arch/arm/boot/dts/lcd-btl790-mipi-AIO.dtsi
+++ b/kernel/arch/arm/boot/dts/lcd-btl790-mipi-AIO.dtsi
@@ -151,7 +151,7 @@
                  flip-y = <1>;
                  swap-xy = <0>;
          };
-
+/*
         mpu6050:mpu@68{
             status = "okay";
             compatible = "mpu6050";
@@ -165,6 +165,7 @@
             irq-gpio = <&gpio5 GPIO_C2 GPIO_ACTIVE_LOW>;
             mpu-debug = <0>;
         };
+*/
 };
 
 &pwm1 {
diff --git a/kernel/drivers/char/virtd b/kernel/drivers/char/virtd
index 6a5ccb1f77c43f035e8a423d2f938d168d00c367..faf8c59b20200037d259c098666c5c21e60006c9 100644
GIT binary patch
delta 369
zcmXZYJxBs^7{~GFITbMqj0%Z-xl{0;BvDNT4hAhzP&7FN)fgB=C^R(KX7qybYbgSC
zEL!T8f`V#lsG%v^G!g7&XbB1=drrFH^S$S}<^R9E^j$iqbMn-f@NgHFJb?tor(YaI
z$MJ!Dm2^~N(nj>QVxyU|lc<Gz3Y943tG|uLd+&d*r>LY6y>-M(6+0Em);Fu}%vFu#
zVag7f=boB_lPLQ7IEM#c$Wady&Ev}#;tzED70+T+{Kle~#IBgdg;+wlsVkuP5QAb(
zHXbYo-14?A^9hc`Pdtis{D_w@bj4AO>q_g4U_}pe3j4B(;YM7=t2l;sL-86$nl3cm
zFqG!<;>-y1FrH;K2@Wd0HzUC(dn6&3@gB&rtrm$=RyT<<Qf-GQYgPW<mT9OtXIsu1
O$wq!@#@z0Aw*CRs26meO

delta 366
zcmX|(y-Nc@5JzXvEU~!YLckL)-t9)s28?z>8X;vsg){++6D?BMqzqVCSPCix#zI8=
z=(Uj3&OihU3xzadqjC@f0r5{TarO|K_xAS~_OWr;Xi8SPR!a^`Vcqcy%suZ)IO`3D
z!>`Pr+hY)komM{$QP*^1v%^oP&shndCudm=nM|YY3Es&8tfKO!thR##e;fl(usqg1
z&7T~AW_)-_t%xm8vjBU<8%+6z3&c%aBi>PQ@WdDNx}v>>FT@A@A$D*^YPO3jQgd(t
z%JHB3Qdm(QPi2mmDJJ6hCIuVCZ#rE5Zv`coz(u8bh1zs{w@s~r2TBufmA2kp{7^Y&
zBhP9!fpf&8u$p~Ms3HJljsZ%>7XTIGJ%E60ae$4ms@IdLnwc;H9yti_=acp?<F{(H

diff --git a/kernel/drivers/input/gsensor/mma8452.c b/kernel/drivers/input/gsensor/mma8452.c
index 58bbe2b604..803b3bdec9 100755
--- a/kernel/drivers/input/gsensor/mma8452.c
+++ b/kernel/drivers/input/gsensor/mma8452.c
@@ -684,7 +684,7 @@ static int mma8452_init_client(struct i2c_client *client)
     }
 	gpio_pull_updown(client->irq, GPIOPullUp);
 	irq = gpio_to_irq(client->irq);
-	ret = request_irq(irq, mma8452_interrupt, IRQF_TRIGGER_LOW, client->dev.driver->name, mma8452);
+	ret = request_irq(irq, mma8452_interrupt, IRQF_TRIGGER_HIGH, client->dev.driver->name, mma8452);
 	mmaprintk("request irq is %d,ret is  0x%x\n",irq,ret);
 	if (ret ) {
 		gpio_free(client->irq);