shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-05 12:43:09 +09:00
Code Issues Packages Projects Releases Wiki Activity
843,814 Commits 55 Branches 2,486 Tags
f56e208d809e39146cd427bf424cd6fd89d033d2
Commit Graph

2078 Commits

Author SHA1 Message Date
Tao Huang
85f56e2278 input: touchscreen: gt9xx: avoid clang warning 
drivers/input/touchscreen/gt9xx/gt9xx_update.c:2744:19: warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
 while ((ready == 0)) //Wait for measurement complete
         ~~~~~~^~~~

Change-Id: I6954c7cd8867e1d85d435a23ee857cd4e3c58b4b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2019-06-24 10:47:11 +08:00
Tao Huang
fd0e3eb0c2 Merge remote branch 'android-4.19' of https://android.googlesource.com/kernel/common 
* android-4.19: (3557 commits)
  ANDROID: kernel: cgroup: cpuset: Clear cpus_requested for empty buf
  ANDROID: kernel: cgroup: cpuset: Add missing allocation of cpus_requested in alloc_trial_cpuset
  Linux 4.19.53
  rtc: pcf8523: don't return invalid date when battery is low
  drm: add fallback override/firmware EDID modes workaround
  drm/edid: abstract override/firmware EDID retrieval
  x86/resctrl: Prevent NULL pointer dereference when local MBM is disabled
  x86/mm/KASLR: Compute the size of the vmemmap section properly
  x86/kasan: Fix boot with 5-level paging and KASAN
  x86/microcode, cpuhotplug: Add a microcode loader CPU hotplug callback
  RAS/CEC: Fix binary search function
  RAS/CEC: Convert the timer callback to a workqueue
  timekeeping: Repair ktime_get_coarse*() granularity
  USB: serial: option: add Telit 0x1260 and 0x1261 compositions
  USB: serial: option: add support for Simcom SIM7500/SIM7600 RNDIS mode
  USB: serial: pl2303: add Allied Telesis VT-Kit3
  USB: usb-storage: Add new ID to ums-realtek
  USB: Fix chipmunk-like voice when using Logitech C270 for recording audio.
  usb: dwc2: host: Fix wMaxPacketSize handling (fix webcam regression)
  usb: dwc2: Fix DMA cache alignment issues
  ...

Conflicts:
	arch/arm/boot/dts/rk3288.dtsi
	drivers/bluetooth/hci_ldisc.c
	drivers/clk/clk-fractional-divider.c
	drivers/clk/rockchip/clk-rk3288.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	init/main.c
	kernel/sched/fair.c

Change-Id: I8bcf9aad06fe9648fc2621bac8475a47be1212fb
 2019-06-22 22:26:14 +08:00
Dmitry Torokhov
a10c88bf36 Input: stmfts - acknowledge that setting brightness is a blocking call 
commit 937c4e552f upstream.

We need to turn regulators on and off when switching brightness, and
that may block, therefore we have to set stmfts_brightness_set() as
LED's brightness_set_blocking() method.

Fixes: 78bcac7b2a ("Input: add support for the STMicroelectronics FingerTip touchscreen")
Acked-by: Andi Shyti <andi@etezian.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2019-05-08 07:21:53 +02:00
Zorro Liu
3147bd0ad5 driver: input: touch: add gslx680a touch driver 
Change-Id: I23e8cca1551308cd0a646aacde2149880e5766c7
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
 2019-03-21 19:19:21 +08:00
Zhou weixin
354a25a89c input: touchscreen: add gt1x driver 
Change-Id: Ic4c5abf51c3dd5383bdc91029afbc7c903c2093a
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
 2019-03-21 19:18:22 +08:00
Zhou weixin
a501b7db63 input: touchscreen: gsl3673: add tp driver for rk3326 f863 board 
Change-Id: I9aef5a8972887782c8becf6ddba3bc3649cb82fa
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
 2019-03-21 19:15:08 +08:00
Huang jianzhi
7a9cfb256f Input: add gslx680 touch panel for firefly-rk3288 board 
Change-Id: If273535f595217853009c3b0071010836f7c254e
Signed-off-by: Huang jianzhi <jesse.huang@rock-chips.com>
 2019-03-21 19:13:06 +08:00
Wu Liangqing
856e16bb9a driver: input: touchscreen: add gslx680 for rk3126c d708 
Change-Id: I59594bf83d2de744eb187fe0570366ddb56d8386
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
 2019-03-21 19:09:08 +08:00
Huang jianzhi
be28ad740b input: touchscreen: vtl_ts: tp firmware dts move to tp_fw.h 
Change-Id: I6279d91f17ecca0c9dcc2355c22737746faee7d4
Signed-off-by: Huang jianzhi <jesse.huang@rock-chips.com>
 2019-03-21 19:00:16 +08:00
Wenping Zhang
da25612009 input: touchscreen: add cy8c40xx touchpad support. 
Change-Id: I765177ee00472e19b8bc6fcbdb79db4ea914f3a9
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
 2019-03-21 18:49:47 +08:00
Guochun Huang
57f3ce1f24 input: touchscreen: add touch screen of gslx680 for rk3399-firefly-edp 
Change-Id: Ic4fa205f8f71353c4703d745e96ec9056181c198
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2019-03-21 18:49:36 +08:00
Xinhuang Li
3a0f74bcda input: touchscreen: add touch screen of gsl3673 for rk3399-evb 
Change-Id: I16a4e44c75a16aefa153b002bce83392522c7d30
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
 2019-03-21 18:47:06 +08:00
jerry.zhang
9b03d621d5 Input: add gslx680 touch panel for 3399 VR 
Change-Id: I89c3dd181324f6b39e50c40fd404743eab43fe52
Signed-off-by: jerry.zhang <jerry.zhang@rock-chips.com>
 2019-03-21 18:46:49 +08:00
Xu Jianqun
349ecabe2c ARM64: dts: rockchip: support gt9xx for Rockchip platform 
Add support gt9xx driver for Rockchip platform goodix
touchscreen.

There is a goodix driver on upstream but it not work well, so
use the old driver until someone debug the upstream driver.

Change-Id: Id8711a63150da4bdcd8e78f3b2a82157e1b3de4f
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
 2019-03-21 17:08:14 +08:00
Tao Huang
60a5825e9c Merge remote branch 'android-4.19' of https://android.googlesource.com/kernel/common 
* android-4.19: (206154 commits)
  Linux 4.19.20
  cifs: Always resolve hostname before reconnecting
  md/raid5: fix 'out of memory' during raid cache recovery
  of: overlay: do not duplicate properties from overlay for new nodes
  of: overlay: use prop add changeset entry for property in new nodes
  of: overlay: add missing of_node_get() in __of_attach_node_sysfs
  of: overlay: add tests to validate kfrees from overlay removal
  of: Convert to using %pOFn instead of device_node.name
  mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
  mm: hwpoison: use do_send_sig_info() instead of force_sig()
  mm, oom: fix use-after-free in oom_kill_process
  mm,memory_hotplug: fix scan_movable_pages() for gigantic hugepages
  oom, oom_reaper: do not enqueue same task twice
  mm/hugetlb.c: teach follow_hugetlb_page() to handle FOLL_NOWAIT
  kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
  btrfs: On error always free subvol_name in btrfs_mount
  Btrfs: fix deadlock when allocating tree block during leaf/node split
  mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
  platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
  platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
  ...

Conflicts:
	Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt
	Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt
	Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
	Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
	Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt
	Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt
	Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
	Documentation/devicetree/bindings/media/i2c/ov2685.txt
	Documentation/devicetree/bindings/media/i2c/ov5695.txt
	Documentation/devicetree/bindings/media/i2c/ov7251.txt
	Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
	Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt
	Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
	Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
	Documentation/devicetree/bindings/soc/rockchip/grf.txt
	Documentation/devicetree/bindings/sound/rockchip,pdm.txt
	Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt
	Documentation/devicetree/bindings/usb/rockchip,dwc3.txt
	arch/arm/boot/dts/rk3036-kylin.dts
	arch/arm/boot/dts/rk3036.dtsi
	arch/arm/boot/dts/rk3228-evb.dts
	arch/arm/boot/dts/rk3229-evb.dts
	arch/arm/boot/dts/rk322x.dtsi
	arch/arm/boot/dts/rk3288-fennec.dts
	arch/arm/boot/dts/rk3288-firefly-reload.dts
	arch/arm/boot/dts/rk3288-miqi.dts
	arch/arm/boot/dts/rk3288-phycore-rdk.dts
	arch/arm/boot/dts/rk3288-phycore-som.dtsi
	arch/arm/boot/dts/rv1108.dtsi
	arch/arm64/boot/dts/rockchip/rk3328-evb.dts
	arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
	arch/arm64/boot/dts/rockchip/rk3328.dtsi
	arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
	arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
	arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
	arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
	arch/arm64/boot/dts/rockchip/rk3399.dtsi
	drivers/clk/rockchip/clk-ddr.c
	drivers/clk/rockchip/clk-half-divider.c
	drivers/clk/rockchip/clk-px30.c
	drivers/clk/rockchip/clk-rk3036.c
	drivers/clk/rockchip/clk-rk3128.c
	drivers/clk/rockchip/clk-rk3228.c
	drivers/clk/rockchip/clk-rk3328.c
	drivers/clk/rockchip/clk-rk3399.c
	drivers/clk/rockchip/clk-rv1108.c
	drivers/devfreq/event/rockchip-dfi.c
	drivers/gpu/drm/bridge/analogix/Kconfig
	drivers/gpu/drm/bridge/analogix/Makefile
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
	drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
	drivers/gpu/drm/bridge/dumb-vga-dac.c
	drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
	drivers/gpu/drm/rockchip/cdn-dp-core.c
	drivers/gpu/drm/rockchip/cdn-dp-core.h
	drivers/gpu/drm/rockchip/cdn-dp-reg.c
	drivers/gpu/drm/rockchip/cdn-dp-reg.h
	drivers/gpu/drm/rockchip/dw-mipi-dsi.c
	drivers/gpu/drm/rockchip/inno_hdmi.c
	drivers/gpu/drm/rockchip/inno_hdmi.h
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.h
	drivers/hid/hid-alps.c
	drivers/iio/light/vl6180.c
	drivers/leds/leds-is31fl32xx.c
	drivers/media/cec/cec-adap.c
	drivers/media/cec/cec-api.c
	drivers/media/cec/cec-notifier.c
	drivers/media/i2c/ov5647.c
	drivers/media/i2c/ov5695.c
	drivers/media/i2c/ov7251.c
	drivers/media/platform/rockchip/rga/rga.c
	drivers/media/rc/ir-imon-decoder.c
	drivers/media/rc/serial_ir.c
	drivers/media/spi/Kconfig
	drivers/media/spi/Makefile
	drivers/media/v4l2-core/v4l2-fwnode.c
	drivers/net/phy/rockchip.c
	drivers/phy/rockchip/Kconfig
	drivers/phy/rockchip/Makefile
	drivers/phy/rockchip/phy-rockchip-emmc.c
	drivers/phy/rockchip/phy-rockchip-inno-usb2.c
	drivers/phy/rockchip/phy-rockchip-typec.c
	drivers/phy/rockchip/phy-rockchip-usb.c
	drivers/pinctrl/pinctrl-rk805.c
	drivers/power/reset/reboot-mode.c
	drivers/soc/rockchip/grf.c
	drivers/usb/dwc3/dwc3-of-simple.c
	drivers/usb/gadget/udc/core.c
	include/drm/bridge/analogix_dp.h
	include/dt-bindings/clock/px30-cru.h
	include/dt-bindings/clock/rk3036-cru.h
	include/dt-bindings/clock/rk3128-cru.h
	include/dt-bindings/clock/rk3228-cru.h
	include/dt-bindings/clock/rk3328-cru.h
	include/dt-bindings/clock/rk3399-cru.h
	include/dt-bindings/power/px30-power.h
	include/dt-bindings/power/rk3036-power.h
	include/dt-bindings/power/rk3228-power.h
	include/media/cec-notifier.h
	include/soc/rockchip/rockchip_sip.h
	include/sound/hdmi-codec.h
	sound/soc/codecs/hdmi-codec.c
	sound/soc/rockchip/rockchip_pdm.c
	sound/soc/rockchip/rockchip_pdm.h

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2019-02-14 11:48:20 +08:00
Tao Huang
135b29c75f rk: revert to v4.4 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2019-02-10 00:33:21 +08:00
Sanjeev Chugh
f168056530 Input: atmel_mxt_ts - don't try to free unallocated kernel memory 
commit 1e3c336ad8 upstream.

If the user attempts to update Atmel device with an invalid configuration
cfg file, error handling code is trying to free cfg file memory which is
not allocated yet hence results into kernel crash.

This patch fixes the order of memory free operations.

Signed-off-by: Sanjeev Chugh <sanjeev_chugh@mentor.com>
Fixes: a4891f1058 ("Input: atmel_mxt_ts - zero terminate config firmware file")
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2019-01-09 17:38:41 +01:00
Randy Dunlap
d7dba42c38 Input: wm97xx-ts - fix exit path 
[ Upstream commit a3f7c3fcf6 ]

Loading then unloading wm97xx-ts.ko when CONFIG_AC97_BUS=m
causes a WARNING: from drivers/base/driver.c:

Unexpected driver unregister!
WARNING: CPU: 0 PID: 1709 at ../drivers/base/driver.c:193 driver_unregister+0x30/0x40

Fix this by only calling driver_unregister() with the same
condition that driver_register() is called.

Fixes: ae9d1b5fbd ("Input: wm97xx: add new AC97 bus support")

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2018-11-21 09:19:08 +01:00
Tao Huang
75c2080503 drivers/input/touchscreen: remove unused ts_lib driver 
Change-Id: Ief30bdafe5d47365d548f1a9d64d59422571542a
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 17:14:17 +08:00
Tao Huang
9d37857eb4 drivers/input/touchscreen: remove unused tp_760_ts driver 
Change-Id: Ib4e9e4916c79ace52f8d4f07890d7b59295c1f6f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 17:12:28 +08:00
Tao Huang
8dcadbd312 drivers/input/touchscreen: remove unused synaptics_i2c_rmi4 driver 
Change-Id: Ieba95a4d827be98d11f42b727503deda309376d1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 17:11:34 +08:00
Tao Huang
68e98ecf6d drivers/input/touchscreen: remove unused sitronix_ts_a720 driver 
Change-Id: I5cfeadf2fe54a4ffd2fa19a84b9e83e49b38c943
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 17:10:48 +08:00
Tao Huang
16ad48d300 drivers/input/touchscreen: remove unused rk_tp driver 
Change-Id: Ic9b672df60b66d186d7118d247765f4a579d0e94
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 17:09:55 +08:00
Tao Huang
9fa8492c58 drivers/input/touchscreen: remove unused rockchip_gslX680 driver 
Change-Id: Ib532198f80b3b0188e53622ec1424b7c2507e5f6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 17:04:06 +08:00
Tao Huang
4269853a66 drivers/input/touchscreen: remove unused pixcir_i2c_ts.h 
Change-Id: Ibb0487088d371d9fe507d99432006154d8923056
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:59:36 +08:00
Tao Huang
1bcc81c00c drivers/input/touchscreen: remove unused ntp070 driver 
Change-Id: I41a3bf67ec2b2cf805a467c4513c15398c2ef740
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:53:59 +08:00
Tao Huang
5a2b61ba8f drivers/input/touchscreen: remove unused nas_ts driver 
Change-Id: Ic074a959feb4154c148183e2edb12f3d41fce192
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:53:17 +08:00
Tao Huang
f2d24f6e01 drivers/input/touchscreen: remove unused sintek_3FA16 driver 
Change-Id: Ibda2ce8f8fc1fc06050d520a3fb4719f1bd4c016
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:52:22 +08:00
Tao Huang
6e9f46babd drivers/input/touchscreen: remove unused it7260_ts driver 
Change-Id: I4dffdda22a9f5a13e16b9fc13559ac1a445f08c6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:50:38 +08:00
Tao Huang
536564461b drivers/input/touchscreen: remove unused ili2102_ts driver 
Change-Id: Ie88dc8bfc2517d6d37b01d52439ae3b313819d08
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:49:39 +08:00
Tao Huang
58de8e21df drivers/input/touchscreen: remove unused i30_ts driver 
Change-Id: Iaa05fd2abe6635522ffd5fbe5cb6db43b48cf8ba
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:48:43 +08:00
Tao Huang
309820f785 drivers/input/touchscreen: remove unused hannstar_p1003 driver 
Change-Id: Idd30ff141d0700de22e2be60e7be89e8b2332451
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:48:27 +08:00
Tao Huang
6e72ff82d7 drivers/input/touchscreen: remove unused gt801/gt8110/gt811/gt818/gt819 drivers 
Change-Id: Ib3f78cb12fe43203dbc5d5d4c2bac9258991c41e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:45:15 +08:00
Tao Huang
5fef86f5a5 drivers/input/touchscreen: remove unused rk29_i2c_goodix driver 
Change-Id: I1405d25be1bdd63f7e73c7d34d4550af4a142c45
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:40:34 +08:00
Tao Huang
1f70ad388c drivers/input/touchscreen: remove unused goodix_touch driver 
Change-Id: I55d557be33d87baec3625e1c1a609162d1861d66
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:39:32 +08:00
Tao Huang
1073beba41 drivers/input/touchscreen: remove unused ft5x0x drivers 
Change-Id: I9a507df383338559cf9a0bb541c23684d0feb717
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:34:42 +08:00
Tao Huang
6bc23f6656 drivers/input/touchscreen: remove unused eeti_egalax_i2c driver 
Change-Id: I7b4984c27ba9aaf9f308644b71904221bc4af3f9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:31:19 +08:00
Tao Huang
682eaafb00 drivers/input/touchscreen: remove unused ctp_it7250 driver 
Change-Id: Ic37db4c2f16f37285974cc08285df56e9298fa86
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:29:31 +08:00
Tao Huang
7869732ee3 drivers/input/touchscreen: remove unused xpt2046 driver 
Change-Id: Id8140d167c7aebd7d1bb6de451a275897a49a3f7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:20:23 +08:00
Tao Huang
bf0d7a3437 drivers/input/touchscreen: remove unused byd693x_ts driver 
Change-Id: Ib8af7476a7e4ad1e4695c2c8dbd770b13d66c7d1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:14:23 +08:00
Tao Huang
5b43c3279e drivers/input/touchscreen: remove unused atmel mxt1386/mxt224 drivers 
Change-Id: Iadf4f95de2238b57e25eca6199403c02b22c1856
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:11:29 +08:00
Tao Huang
f032789dc1 drivers/input/touchscreen: remove unused IT7260_ts driver 
Change-Id: I568892ae649abcd45189fbeddc9e2799cca93da5
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:06:52 +08:00
Tao Huang
8845164e32 drivers/input/touchscreen: remove unused 86v_gt811_ts driver 
Change-Id: I3103cd578351df223fb8d73cc35e4855d834ac7d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:05:09 +08:00
Tao Huang
33598f4238 drivers/input/touchscreen: remove unused CT36X_JS_DS_973H_LX20x30_V18120810W.txt 
Change-Id: I64d6d9e7d2d13578f713ea1d196a3da04480438b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 16:03:19 +08:00
Tao Huang
59e6e0bb43 drivers/input/touchscreen: remove unused zet62xx drivers 
Change-Id: Ie01baae9849bd588796669cbfb13ab5a5145f51b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 15:22:14 +08:00
Tao Huang
0039514fc6 drivers/input/touchscreen: remove unused ct36x drivers 
Change-Id: Iaab79b3a681c693caa948bd9acd49096f87b0bf9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2018-11-03 15:18:42 +08:00
Tao Huang
d376ad8f23 Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git 
* linux-linaro-lsk-v4.4-android: (1212 commits)
  ANDROID: sdcardfs: Change current->fs under lock
  ANDROID: sdcardfs: Don't use OVERRIDE_CRED macro
  ANDROID: restrict store of prefer_idle as boolean
  BACKPORT: arm/syscalls: Optimize address limit check
  UPSTREAM: syscalls: Use CHECK_DATA_CORRUPTION for addr_limit_user_check
  BACKPORT: arm64/syscalls: Check address limit on user-mode return
  BACKPORT: x86/syscalls: Check address limit on user-mode return
  BACKPORT: lkdtm: add bad USER_DS test
  UPSTREAM: bug: switch data corruption check to __must_check
  BACKPORT: lkdtm: Add tests for struct list corruption
  UPSTREAM: bug: Provide toggle for BUG on data corruption
  UPSTREAM: list: Split list_del() debug checking into separate function
  UPSTREAM: rculist: Consolidate DEBUG_LIST for list_add_rcu()
  BACKPORT: list: Split list_add() debug checking into separate function
  FROMLIST: ANDROID: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl.
  BACKPORT: arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAW
  ANDROID: arm64: mm: fix 4.4.154 merge
  BACKPORT: zsmalloc: introduce zs_huge_class_size()
  BACKPORT: zram: drop max_zpage_size and use zs_huge_class_size()
  ANDROID: tracing: fix race condition reading saved tgids
  ...

Change-Id: I9f23db35eb926b6fa0d7af7dbbb55c9a37d536fc
 2018-10-10 19:37:13 +08:00
Greg Kroah-Hartman
e704966c45 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 
Dmitry writes:
  "Input updates for v4.19-rc5

   Just a few driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: uinput - allow for max == min during input_absinfo validation
  Input: elantech - enable middle button of touchpad on ThinkPad P72
  Input: atakbd - fix Atari CapsLock behaviour
  Input: atakbd - fix Atari keymap
  Input: egalax_ts - add system wakeup support
  Input: gpio-keys - fix a documentation index issue
 2018-09-28 18:04:50 -07:00
Nick Dyer
af39fa735a Input: atmel_mxt_ts - only use first T9 instance 
[ Upstream commit 36f5d9ef26 ]

The driver only registers one input device, which uses the screen
parameters from the first T9 instance. The first T63 instance also uses
those parameters.

It is incorrect to send input reports from the second instances of these
objects if they are enabled: the input scaling will be wrong and the
positions will be mashed together.

This also causes problems on Android if the number of slots exceeds 32.

In the future, this could be handled by looking for enabled touch object
instances and creating an input device for each one.

Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Acked-by: Benson Leung <bleung@chromium.org>
Acked-by: Yufeng Shen <miletus@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2018-09-19 22:48:58 +02:00
Anson Huang
49f62249a9 Input: egalax_ts - add system wakeup support 
This patch adds wakeup function support for egalax touch
screen, if "wakeup-source" is added to device tree's egalax
touch screen node, the wakeup function will be enabled, and
egalax touch screen will be able to wakeup system from suspend.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
 2018-09-18 15:28:07 -07:00