Merge branch 'p-ti-lsk-linux-4.4.y-next' into p-ti-lsk-android-linux-4.4.y

* p-ti-lsk-linux-4.4.y-next:
  arm: dts: dra76: enable auo fpdlink display
  drivers: video: serdes: support ub921 serializer
  arm: dts: dra7: enable auo fpdlink display
  arm: dts: add auo fpdlink display dts fragment
  drivers: video: serdes: support ub924 deserializer
  Input: goodix - add polling support for touch events
  drivers: video: serdes: avoid splitting i2c transfer
  drivers: video: serdes: improve error message
  arm: dts: dra7: fpdlink: restructure dts for reuse

Change-Id: Ia3842f0797a348f826494d47ee9c48fe2d8a9662
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

18 files changed, 527 insertions, 151 deletions

diff --git a/Documentation/devicetree/bindings/video/fpd3-serdes.txt b/Documentation/devicetree/bindings/video/fpd3-serdes.txt
index e2afceeafacb..afa56806f7a5 100644
--- a/Documentation/devicetree/bindings/video/fpd3-serdes.txt
+++ b/Documentation/devicetree/bindings/video/fpd3-serdes.txt
@@ -32,6 +32,8 @@ Required Properties:
     - "ti,ds90ub914aq": For TI FPDlink3 12bit video de serializer
     - "ti,ds90uh925q": For TI FPDlink3 24bit video serializer
     - "ti,ds90uh928q": For TI FPDlink3 24bit video de serializer
+    - "ti,ds90ub924q": For TI FPDlink3 24bit video de serializer
+    - "ti,ds90ub921q": For TI FPDlink3 24bit video serializer
 
   - reg: I2C slave address
         This would be the alias adress for remote device. The CPU side
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ddb6c3b1d8de..8b28d3badaea 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -494,11 +494,13 @@ dtb-$(CONFIG_SOC_OMAP5) += \
 dtb-$(CONFIG_SOC_DRA7XX) += \
         dra7-evm.dtb \
         dra7-evm-lcd-lg.dtb \
+        dra7-evm-fpd-lg.dtb \
         dra7-evm-lcd-lg-late-attach.dtb \
         dra7-evm-lcd-lg-late-attach-no-map.dtb \
         dra7-evm-lcd-osd.dtb \
         dra7-evm-lcd-osd101t2587.dtb \
         dra7-evm-lcd-osd-late-attach.dtb \
+        dra7-evm-fpd-auo-g101evn01.0.dtb \
         dra7-evm-vision.dtb \
         am57xx-beagle-x15.dtb \
         am57xx-beagle-x15-revb1.dtb \
@@ -514,6 +516,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
         dra72-evm-lcd-lg.dtb \
         dra72-evm-lcd-osd.dtb \
         dra72-evm-lcd-osd101t2587.dtb \
+        dra72-evm-fpd-lg.dtb \
         dra72-evm-revc.dtb \
         dra72-evm-revc-lcd-osd101t2045.dtb \
         dra72-evm-revc-lcd-osd101t2587.dtb \
diff --git a/arch/arm/boot/dts/dra7-evm-fpd-auo-g101evn01.0.dts b/arch/arm/boot/dts/dra7-evm-fpd-auo-g101evn01.0.dts
new file mode 100644
index 000000000000..64e79754bb22
--- /dev/null
+++ b/arch/arm/boot/dts/dra7-evm-fpd-auo-g101evn01.0.dts
@@ -0,0 +1,37 @@
+#include "dra7-evm.dts"
+#include "dra7x-evm-fpd-auo-g101evn01.0.dtsi"
+
+/ {
+        aliases {
+                display0 = &fpd_disp;
+                display1 = &hdmi0;
+        };
+};
+
+&dss {
+        ports {
+                status = "ok";
+        };
+};
+
+&disp_ser {
+        status = "ok";
+        ranges = <0x0 0x2d>;
+};
+
+/* Tie the end points of DSS and FPDLink together */
+
+&fpd_in {
+        remote-endpoint = <&dpi_out3>;
+};
+
+&dpi_out3 {
+        remote-endpoint = <&fpd_in>;
+};
+
+&lcd_fpd {
+        enable-gpios = <&pcf_gpio_21 0 GPIO_ACTIVE_LOW>;
+        /* P0, SEL_GPMC_AD_VID_S0 */
+
+        status = "ok";
+};
diff --git a/arch/arm/boot/dts/dra7-evm-fpd-lg.dts b/arch/arm/boot/dts/dra7-evm-fpd-lg.dts
new file mode 100644
index 000000000000..b8df0766ecff
--- /dev/null
+++ b/arch/arm/boot/dts/dra7-evm-fpd-lg.dts
@@ -0,0 +1,38 @@
+#include "dra7-evm.dts"
+#include "dra7x-evm-fpd-lg.dtsi"
+
+/ {
+        aliases {
+                display0 = &fpd_disp;
+                display1 = &hdmi0;
+        };
+};
+
+&dss {
+        ports {
+                status = "ok";
+        };
+};
+
+&disp_ser {
+        status = "ok";
+        ranges = <0x2c 0x2c>,
+                <0x1c 0x1c>;
+};
+
+/* Tie the end points of DSS and FPDLink together */
+
+&fpd_in {
+        remote-endpoint = <&dpi_out3>;
+};
+
+&dpi_out3 {
+        remote-endpoint = <&fpd_in>;
+};
+
+&lcd_fpd {
+        enable-gpios = <&pcf_gpio_21 0 GPIO_ACTIVE_LOW>;
+        /* P0, SEL_GPMC_AD_VID_S0 */
+
+        status = "ok";
+};
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index e1d794f6a2f2..9171c04dd954 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -54,7 +54,6 @@
         };
 
         aliases {
-                display1 = &fpd_disp;
                 i2c7 = &disp_ser;
         };
 
@@ -850,66 +849,7 @@ i2c_p3_exp: &i2c2 {
 
                 #address-cells = <1>;
                 #size-cells = <0>;
-                ranges = <0x2c 0x2c>,
-                        <0x1c 0x1c>;
-
-                disp_des: deserializer@2c {
-                        compatible = "ti,ds90uh928q";
-                        reg = <0x2c>;
-                        slave-mode;
-                };
-
-        };
-};
-
-
-&disp_ser {
-        fpd_disp: tlc59108@1c {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "ti,tlc59108";
-                reg = <0x1c>;
-
-        };
-};
-
-/ {
-        lcd_fpd: display_fpd {
-                /*
-                * This is not really a dpi panel, but panel-dpi driver
-                * works as dummy panel driver.
-                */
-                compatible = "lg,lp101wx2", "panel-dpi";
-
-                label = "lcd_fpd";
-                enable-gpios = <&pcf_gpio_21 0 GPIO_ACTIVE_LOW>;
-                /* P0, SEL_GPMC_AD_VID_S0 */
                 status = "disabled";
-
-                panel-timing {
-                        clock-frequency = <69300404>;
-                        hactive = <1280>;
-                        vactive = <800>;
-
-                        hfront-porch = <48>;
-                        hback-porch = <44>;
-                        hsync-len = <32>;
-
-                        vfront-porch = <4>;
-                        vback-porch = <7>;
-                        vsync-len = <12>;
-
-                        hsync-active = <0>;
-                        vsync-active = <0>;
-                        de-active = <1>;
-                        pixelclk-active = <0>;
-                };
-
-                port@lcd3 {
-                        fpd_in: endpoint {
-                                remote-endpoint = <&dpi_out3>;
-                        };
-                };
         };
 };
 
@@ -1136,7 +1076,6 @@ i2c_p3_exp: &i2c2 {
                         reg = <2>;
 
                         dpi_out3: endpoint {
-                                remote-endpoint = <&fpd_in>;
                                 data-lines = <24>;
                         };
                 };
diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
index a7a073fac380..1896ef30f673 100644
--- a/arch/arm/boot/dts/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
@@ -16,7 +16,6 @@
 
         aliases {
                 display0 = &hdmi0;
-                display1 = &fpd_disp;
                 sound0 = &snd0;
                 sound1 = &hdmi;
                 i2c7 = &disp_ser;
@@ -587,69 +586,13 @@ i2c_p3_exp: &i2c5 {
         disp_ser: serializer@1b {
                 compatible = "ti,ds90uh925q";
                 reg = <0x1b>;
+                status = "disabled";
 
                 #address-cells = <1>;
                 #size-cells = <0>;
-                ranges = <0x2c 0x2c>,
-                        <0x1c 0x1c>;
-
-                disp_des: deserializer@2c {
-                        compatible = "ti,ds90uh928q";
-                        reg = <0x2c>;
-                        slave-mode;
-                };
-        };
-};
-
-&disp_ser {
-        fpd_disp: tlc59108@1c {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "ti,tlc59108";
-                reg = <0x1c>;
-
         };
 };
 
-/ {
-        lcd_fpd: display_fpd {
-                /*
-                * This is not really a dpi panel, but panel-dpi driver
-                * works as dummy panel driver.
-                */
-                compatible = "lg,lp101wx2", "panel-dpi";
-
-                label = "lcd_fpd";
-                enable-gpios = <&pcf_gpio_21 0 GPIO_ACTIVE_LOW>;
-                /* P0, SEL_GPMC_AD_VID_S0 */
-                status = "disabled";
-
-                panel-timing {
-                        clock-frequency = <69300404>;
-                        hactive = <1280>;
-                        vactive = <800>;
-
-                        hfront-porch = <48>;
-                        hback-porch = <44>;
-                        hsync-len = <32>;
-
-                        vfront-porch = <4>;
-                        vback-porch = <7>;
-                        vsync-len = <12>;
-
-                        hsync-active = <0>;
-                        vsync-active = <0>;
-                        de-active = <1>;
-                        pixelclk-active = <0>;
-                };
-
-                port@lcd3 {
-                        fpd_in: endpoint {
-                                remote-endpoint = <&dpi_out3>;
-                        };
-                };
-        };
-};
 
 &dss {
         status = "ok";
@@ -663,7 +606,6 @@ i2c_p3_exp: &i2c5 {
                         reg = <2>;
 
                         dpi_out3: endpoint {
-                                remote-endpoint = <&fpd_in>;
                                 data-lines = <24>;
                         };
                 };
diff --git a/arch/arm/boot/dts/dra72-evm-fpd-lg.dts b/arch/arm/boot/dts/dra72-evm-fpd-lg.dts
new file mode 100644
index 000000000000..9ed0f66fdb76
--- /dev/null
+++ b/arch/arm/boot/dts/dra72-evm-fpd-lg.dts
@@ -0,0 +1,39 @@
+#include "dra72-evm.dts"
+#include "dra7x-evm-fpd-lg.dtsi"
+
+/* Set display aliases for use by Android */
+/ {
+        aliases {
+                display0 = &fpd_disp;
+                display1 = &hdmi0;
+        };
+};
+
+&dss {
+        ports {
+                status = "ok";
+        };
+};
+
+&disp_ser {
+        status = "ok";
+        ranges = <0x2c 0x2c>,
+                <0x1c 0x1c>;
+};
+
+/* Tie the end points of DSS and FPDLink together */
+
+&fpd_in {
+        remote-endpoint = <&dpi_out3>;
+};
+
+&dpi_out3 {
+        remote-endpoint = <&fpd_in>;
+};
+
+&lcd_fpd {
+        enable-gpios = <&pcf_gpio_21 0 GPIO_ACTIVE_LOW>;
+        /* P0, SEL_GPMC_AD_VID_S0 */
+
+        status = "ok";
+};
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index 73ac6c98771f..cc108d2f9b09 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -11,7 +11,6 @@
 
         aliases {
                 display0 = &hdmi0;
-                display1 = &fpd_disp;
                 sound1 = &hdmi;
                 i2c7 = &disp_ser;
         };
diff --git a/arch/arm/boot/dts/dra76-evm-fpd-auo-g101evn01.0.dts b/arch/arm/boot/dts/dra76-evm-fpd-auo-g101evn01.0.dts
new file mode 100644
index 000000000000..69983d70d1f4
--- /dev/null
+++ b/arch/arm/boot/dts/dra76-evm-fpd-auo-g101evn01.0.dts
@@ -0,0 +1,67 @@
+#include "dra76-evm.dts"
+#include "dra7x-evm-fpd-auo-g101evn01.0.dtsi"
+
+/ {
+        aliases {
+                display0 = &fpd_disp;
+                display1 = &hdmi0;
+        };
+};
+
+&dss {
+        ports {
+                status = "ok";
+        };
+};
+
+&disp_ser {
+        status = "ok";
+        ranges = <0x0 0x2d>;
+};
+
+/* Tie the end points of DSS and FPDLink together */
+&fpd_in {
+        remote-endpoint = <&dpi_out3>;
+};
+
+&dpi_out3 {
+        remote-endpoint = <&fpd_in>;
+};
+
+&lcd_fpd {
+        status = "ok";
+};
+
+/* U21 on the EVM */
+/* gpmc_ad_vid_s0: high: GPMC , low: VOUT3 */
+&pcf_gpio_21 {
+        p0 {
+                gpio-hog;
+                gpios = <0 GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "gpmc_ad_vid_s0";
+        };
+};
+
+
+/* U110 on the EVM. For Rev A boards */
+/*
+&pcf_hdmi {
+        p11 {
+                gpio-hog;
+                gpios = <11 GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "disp1_vpoc_onn";
+        };
+};
+*/
+
+/* For supplying power to the display via FPDLink */
+&gpio2 {
+        p2 {
+                gpio-hog;
+                gpios =  <2 GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "disp1_vpoc_onn";
+        };
+};
diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
index f0c7666649c1..946a9a69038b 100644
--- a/arch/arm/boot/dts/dra76-evm.dts
+++ b/arch/arm/boot/dts/dra76-evm.dts
@@ -54,6 +54,10 @@
                 };
         };
 
+        aliases {
+                i2c7 = &disp_ser;
+        };
+
         vsys_12v0: fixedregulator-vsys12v0 {
                 /* main supply */
                 compatible = "regulator-fixed";
@@ -474,9 +478,35 @@
         phy-supply = <&ldo3_reg>;
 };
 
+&i2c3 {
+        disp_ser: serializer@0c {
+                compatible = "ti,ds90ub921q";
+                reg = <0x0c>;
+
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+};
+
 &dss {
         status = "ok";
         vdda_video-supply = <&ldo5_reg>;
+
+        ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                status = "disabled";
+
+                port@lcd3 {
+                        reg = <2>;
+
+                        dpi_out3: endpoint {
+                                data-lines = <24>;
+                        };
+                };
+        };
 };
 
 &hdmi {
diff --git a/arch/arm/boot/dts/dra7x-evm-fpd-auo-g101evn01.0.dtsi b/arch/arm/boot/dts/dra7x-evm-fpd-auo-g101evn01.0.dtsi
new file mode 100644
index 000000000000..c928be92c1ac
--- /dev/null
+++ b/arch/arm/boot/dts/dra7x-evm-fpd-auo-g101evn01.0.dtsi
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/ {
+        backlight {
+                compatible = "led-backlight";
+                leds = <&backlight_led>;
+                brightness-levels = <0 2 38 74 110 146 182 218 255>;
+                default-brightness-level = <8>;
+
+                enable-gpios = <&pcf_display_board 0 GPIO_ACTIVE_LOW>;
+        };
+
+        lcd_fpd: display {
+                compatible = "auo,g101evn01.0", "panel-dpi";
+
+                label = "lcd_fpd";
+                status = "disabled";
+
+                panel-timing {
+                        clock-frequency = <68930000>;
+                        hactive = <1280>;
+                        vactive = <800>;
+
+                        hfront-porch = <48>;
+                        hsync-len = <32>;
+                        hback-porch = <48>;
+
+                        vfront-porch = <4>;
+                        vsync-len = <4>;
+                        vback-porch = <8>;
+
+                        hsync-active = <0>;
+                        vsync-active = <0>;
+                        de-active = <1>;
+                        pixelclk-active = <1>;
+                };
+
+                port {
+                        fpd_in: endpoint {
+                        };
+                };
+        };
+};
+
+&disp_ser {
+
+        /*
+        * 0x2c - deserializer
+        * 0x40 - TLC59108
+        * 0x27 - PCF8575
+        * 0x57 - EEPROM
+        * 0x14 - Goodix Touch Controller
+        * 0x28 - RF430CL330H
+        */
+
+        disp_des: deserializer@2c {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "ti,ds90ub924q";
+                reg = <0x2c>;
+                slave-mode;
+        };
+
+        /* TLC chip for LCD panel power and backlight */
+        fpd_disp: tlc59108@40 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "ti,tlc59108";
+                reg = <0x40>;
+
+                backlight_led: bl@2 {
+                        label = "backlight";
+                        reg = <0x2>;
+                };
+        };
+
+        pcf_display_board: gpio@27 {
+                compatible = "nxp,pcf8575";
+                reg = <0x27>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        touchscreen: goodix-gt9271@14 {
+                status = "okay";
+                compatible = "goodix,gt9271";
+                reg = <0x14>;
+
+                touchscreen-size-x = <1280>;
+                touchscreen-size-y = <800>;
+                touchscreen-inverted-y;
+
+                /* Reset gpio line is inverted before going to touch panel */
+                reset-gpios = <&pcf_display_board 5 GPIO_ACTIVE_LOW>;
+                irq-gpios = <&pcf_display_board 6 GPIO_ACTIVE_HIGH>;
+        };
+
+        /* Below two slaves on the I2C bus are not yet defined */
+        /* ID EEPROM 0x57 */
+        /* RF430CL330H 0x28 */
+};
diff --git a/arch/arm/boot/dts/dra7x-evm-fpd-lg.dtsi b/arch/arm/boot/dts/dra7x-evm-fpd-lg.dtsi
new file mode 100644
index 000000000000..b4760b4efdad
--- /dev/null
+++ b/arch/arm/boot/dts/dra7x-evm-fpd-lg.dtsi
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+
+
+/ {
+        lcd_fpd: display_fpd {
+                /*
+                * This is not really a dpi panel, but panel-dpi driver
+                * works as dummy panel driver.
+                */
+                compatible = "lg,lp101wx2", "panel-dpi";
+
+                label = "lcd_fpd";
+                status = "disabled";
+
+                panel-timing {
+                        clock-frequency = <69300404>;
+                        hactive = <1280>;
+                        vactive = <800>;
+
+                        hfront-porch = <48>;
+                        hback-porch = <44>;
+                        hsync-len = <32>;
+
+                        vfront-porch = <4>;
+                        vback-porch = <7>;
+                        vsync-len = <12>;
+
+                        hsync-active = <0>;
+                        vsync-active = <0>;
+                        de-active = <1>;
+                        pixelclk-active = <0>;
+                };
+
+                port {
+                        fpd_in: endpoint {
+                        };
+                };
+        };
+};
+
+&disp_ser {
+        disp_des: deserializer@2c {
+                compatible = "ti,ds90uh928q";
+                reg = <0x2c>;
+                slave-mode;
+        };
+        fpd_disp: tlc59108@1c {
+                compatible = "ti,tlc59108";
+                reg = <0x1c>;
+        };
+};
diff --git a/arch/arm/boot/dts/dra7x-evm-lcd-lg.dtsi b/arch/arm/boot/dts/dra7x-evm-lcd-lg.dtsi
index 52a957d08cf2..23268b7a474f 100644
--- a/arch/arm/boot/dts/dra7x-evm-lcd-lg.dtsi
+++ b/arch/arm/boot/dts/dra7x-evm-lcd-lg.dtsi
@@ -12,7 +12,6 @@
         aliases {
                 display0 = &tlc59108;
                 display1 = &hdmi0;
-                display2 = &fpd_disp;
         };
 
         backlight {
diff --git a/arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi b/arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi
index 219e4f953797..7dc9c986a73a 100644
--- a/arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi
+++ b/arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi
@@ -10,7 +10,6 @@
         aliases {
                 display0 = &lcd;
                 display1 = &hdmi0;
-                display2 = &fpd_disp;
         };
 
         lcd_bl: backlight {
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 8364d84fd696..97f1eacdda0e 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -325,6 +325,7 @@ config TOUCHSCREEN_GOODIX
         tristate "Goodix I2C touchscreen"
         depends on I2C
         depends on GPIOLIB
+        select INPUT_POLLDEV
         help
           Say Y here if you have the Goodix touchscreen (such as one
           installed in Onda v975w tablets) connected to your
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index a27f0d7107af..916c9877261f 100644
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -22,6 +22,7 @@
 #include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/input/mt.h>
+#include <linux/input-polldev.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
@@ -34,6 +35,7 @@
 struct goodix_ts_data {
         struct i2c_client *client;
         struct input_dev *input_dev;
+        struct input_polled_dev *poll_dev;
         int abs_x_max;
         int abs_y_max;
         bool swapped_x_y;
@@ -77,6 +79,8 @@ struct goodix_ts_data {
 #define MAX_CONTACTS_LOC        5
 #define TRIGGER_LOC             6
 
+#define TSC_DEFAULT_POLL_PERIOD 30 /* ms */
+
 static const unsigned long goodix_irq_flags[] = {
         IRQ_TYPE_EDGE_RISING,
         IRQ_TYPE_EDGE_FALLING,
@@ -281,6 +285,20 @@ static void goodix_process_events(struct goodix_ts_data *ts)
         input_sync(ts->input_dev);
 }
 
+static void _goodix_process_events(struct goodix_ts_data *ts)
+{
+        goodix_process_events(ts);
+
+        if (goodix_i2c_write_u8(ts->client, GOODIX_READ_COOR_ADDR, 0) < 0)
+                dev_err(&ts->client->dev, "I2C write end_cmd error\n");
+
+}
+static void goodix_poll(struct input_polled_dev *poll_dev)
+{
+        struct goodix_ts_data *ts = poll_dev->private;
+
+        _goodix_process_events(ts);
+}
 /**
  * goodix_ts_irq_handler - The IRQ handler
  *
@@ -291,10 +309,7 @@ static irqreturn_t goodix_ts_irq_handler(int irq, void *dev_id)
 {
         struct goodix_ts_data *ts = dev_id;
 
-        goodix_process_events(ts);
-
-        if (goodix_i2c_write_u8(ts->client, GOODIX_READ_COOR_ADDR, 0) < 0)
-                dev_err(&ts->client->dev, "I2C write end_cmd error\n");
+        _goodix_process_events(ts);
 
         return IRQ_HANDLED;
 }
@@ -614,6 +629,58 @@ static int goodix_request_input_dev(struct goodix_ts_data *ts)
         return 0;
 }
 
+static int goodix_request_input_polled_dev(struct goodix_ts_data *ts)
+{
+        int error;
+        struct input_polled_dev *poll_dev;
+
+        dev_err(&ts->client->dev, "Setting up polling.\n");
+        poll_dev = input_allocate_polled_device();
+        if (!poll_dev) {
+                dev_err(&ts->client->dev, "Failed to allocate polled input device.\n");
+                error = -ENOMEM;
+                return error;
+        }
+
+        ts->poll_dev = poll_dev;
+
+        poll_dev->private = ts;
+        poll_dev->poll = goodix_poll;
+        poll_dev->poll_interval = TSC_DEFAULT_POLL_PERIOD;
+
+        ts->input_dev = poll_dev->input;
+        if (!ts->input_dev) {
+                dev_err(&ts->client->dev, "Failed to allocate input device.");
+                return -ENOMEM;
+        }
+
+        input_set_abs_params(ts->input_dev, ABS_MT_POSITION_X,
+                             0, ts->abs_x_max, 0, 0);
+        input_set_abs_params(ts->input_dev, ABS_MT_POSITION_Y,
+                             0, ts->abs_y_max, 0, 0);
+        input_set_abs_params(ts->input_dev, ABS_MT_WIDTH_MAJOR, 0, 255, 0, 0);
+        input_set_abs_params(ts->input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
+
+        input_mt_init_slots(ts->input_dev, ts->max_touch_num,
+                            INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED);
+
+        ts->input_dev->name = "Goodix Capacitive TouchScreen";
+        ts->input_dev->phys = "input/ts";
+        ts->input_dev->id.bustype = BUS_I2C;
+        ts->input_dev->id.vendor = 0x0416;
+        ts->input_dev->id.product = ts->id;
+        ts->input_dev->id.version = ts->version;
+
+        error = input_register_polled_device(poll_dev);
+        if (error) {
+                dev_err(&ts->client->dev,
+                        "Failed to register input device: %d", error);
+                return error;
+        }
+
+        return 0;
+}
+
 /**
  * goodix_configure_dev - Finish device initialization
  *
@@ -637,15 +704,23 @@ static int goodix_configure_dev(struct goodix_ts_data *ts)
 
         goodix_read_config(ts);
 
-        error = goodix_request_input_dev(ts);
-        if (error)
-                return error;
+        if (ts->client->irq) {
+                error = goodix_request_input_dev(ts);
+                if (error)
+                        return error;
+                ts->irq_flags = goodix_irq_flags[ts->int_trigger_type] |
+                        IRQF_ONESHOT;
+                error = goodix_request_irq(ts);
+                if (error) {
+                        dev_err(&ts->client->dev, "request IRQ failed: %d\n",
+                                error);
+                        return error;
+                }
+        } else {
+                /* setup polling if IRQ is not defined */
+
+                error = goodix_request_input_polled_dev(ts);
 
-        ts->irq_flags = goodix_irq_flags[ts->int_trigger_type] | IRQF_ONESHOT;
-        error = goodix_request_irq(ts);
-        if (error) {
-                dev_err(&ts->client->dev, "request IRQ failed: %d\n", error);
-                return error;
         }
 
         return 0;
diff --git a/drivers/video/serdes/fpd3_i2c_adap.c b/drivers/video/serdes/fpd3_i2c_adap.c
index 136c29c10956..8cc866fc1221 100644
--- a/drivers/video/serdes/fpd3_i2c_adap.c
+++ b/drivers/video/serdes/fpd3_i2c_adap.c
@@ -100,8 +100,10 @@ static int fpd3_serdes_setup_aliases(struct i2c_client *client)
                 count++;
         }
 
-        if (count >= FPD3_MAX_POLL_COUNT)
+        if (count >= FPD3_MAX_POLL_COUNT) {
+                dev_err(&client->dev, "Unable to sync with remote slave");
                 return -EIO;
+        }
 
         dev_dbg(&client->dev, "Remote signal detected");
         return 0;
@@ -197,38 +199,36 @@ static int fpd3_master_xfer(struct i2c_adapter *adap,
                         struct i2c_msg msgs[], int num)
 {
         struct i2c_adapter *alias_adap;
-        struct i2c_msg new_msg;
+        struct i2c_msg *new_msg;
         u8 alias_addr;
         int i, ret = 0;
-        int num_tred = 0;
 
         if (setup_link(adap))
                 return -EIO;
 
         alias_adap = __get_alias_adapter(adap);
 
+        new_msg = kcalloc(num, sizeof(*new_msg), GFP_KERNEL);
+
         for (i = 0; i < num; i++) {
                 alias_addr = __get_alias_addr(adap, msgs[i].addr);
                 if (alias_addr == 0) {
                         ret = -EINVAL;
-                        break;
+                        goto cleanup;
                 }
 
                 /* Copy the i2c_msgs into temporary buffer; xlate address */
-                new_msg = msgs[i];
-                new_msg.addr = alias_addr;
-                /* Issue the messages on the alias adapter */
-                ret = i2c_transfer(alias_adap, &new_msg, 1);
-                if (ret < 0)
-                        break;
-                else
-                        num_tred++;
+                new_msg[i] = msgs[i];
+                new_msg[i].addr = alias_addr;
         }
 
-        if (ret < 0)
-                return ret;
-        else
-                return num_tred;
+        /* Issue the messages on the alias adapter */
+        ret = i2c_transfer(alias_adap, new_msg, num);
+
+ cleanup:
+        kfree(new_msg);
+
+        return ret;
 }
 
 static int fpd3_smbus_xfer(struct i2c_adapter *adap, u16 addr,
diff --git a/drivers/video/serdes/fpd3_serdes.c b/drivers/video/serdes/fpd3_serdes.c
index 90de8d559f2f..3598683a3d31 100644
--- a/drivers/video/serdes/fpd3_serdes.c
+++ b/drivers/video/serdes/fpd3_serdes.c
@@ -23,6 +23,8 @@
  * DS90UB913aq/DS90UB914aq http://www.ti.com/lit/ds/snls443a/snls443a.pdf
  * DS90UH925Q http://www.ti.com/lit/ds/symlink/ds90uh925q-q1.pdf
  * DS90UH928Q http://www.ti.com/lit/ds/snls440a/snls440a.pdf
+ * DS90UB924Q http://www.ti.com/lit/ds/snls512/snls512.pdf
+ * DS90UB921Q http://www.ti.com/lit/ds/symlink/ds90ub921-q1.pdf
  *
  * Documentation:-
  * -> Documentation/video-serdes.txt
@@ -78,6 +80,20 @@ static const unsigned int fpd3_24bit_des_init[] = {
         FPD3_DES_CONFIG1,       0x4c,
 };
 
+static const unsigned int fpd3_921_ser_init[] = {
+        /* Reset entire digital block except registers */
+        FPD3_SER_RESET,         0x01,
+        /* back chan en, auto ack WR, i2c passthrough, rising edge pclk */
+        FPD3_SER_CONFIG1,       0x8b,
+};
+
+static const unsigned int fpd3_924_des_init[] = {
+        /* digital reset1 */
+        FPD3_DES_RESET,         0x02,
+        /* back channel en */
+        FPD3_DES_RESET,         0x04,
+};
+
 static struct fpd3_serdes_platform_data fpd3_serdes_pdata[] = {
         {
                 .name = "fpd3_12b_ser",
@@ -119,6 +135,26 @@ static struct fpd3_serdes_platform_data fpd3_serdes_pdata[] = {
                 .init_seq = fpd3_24bit_des_init,
                 .init_len = ARRAY_SIZE(fpd3_24bit_des_init),
         },
+        {
+                .name = "fpd3_924_des",
+                .dev_type = FPD3_DES_DEV,
+                .ngpio = 4,
+                .nslaves = 8,
+                .device_id = 0x58,
+                .gpio_2reg = 2 * FPD3_DES_GPIO_01 + 1,
+                .init_seq = fpd3_924_des_init,
+                .init_len = ARRAY_SIZE(fpd3_924_des_init),
+        },
+        {
+                .name = "fpd3_921_ser",
+                .dev_type = FPD3_SER_DEV,
+                .ngpio = 4,
+                .nslaves = 1,
+                .device_id = 0x18,
+                .gpio_2reg = 2 * FPD3_SER_GPIO_01 + 1,
+                .init_seq = fpd3_921_ser_init,
+                .init_len = ARRAY_SIZE(fpd3_921_ser_init),
+        },
 };
 
 /* GPIO operations */
@@ -309,6 +345,8 @@ static const struct i2c_device_id fpd3_serdes_i2c_ids[] = {
         { "ds90ub914aq", 8 },
         { "ds90uh925q", 8 },
         { "ds90uh928q", 8 },
+        { "ds90ub924q", 8 },
+        { "ds90ub921q", 8 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, fpd3_serdes_i2c_ids);
@@ -318,6 +356,8 @@ static const struct of_device_id fpd3_serdes_dt_ids[] = {
         {.compatible = "ti,ds90ub914aq", &fpd3_serdes_pdata[1], },
         {.compatible = "ti,ds90uh925q", &fpd3_serdes_pdata[2], },
         {.compatible = "ti,ds90uh928q", &fpd3_serdes_pdata[3], },
+        {.compatible = "ti,ds90ub924q", &fpd3_serdes_pdata[4], },
+        {.compatible = "ti,ds90ub921q", &fpd3_serdes_pdata[5], },
         { }
 };