Fixed psmouse compile error and enabled mouse support in kconfig
This commit is contained in:
deata
parent
ff949ad586
commit
c246e0a305
|
|
@ -23,6 +23,7 @@ source="
|
|||
$_config
|
||||
compiler-gcc6.h
|
||||
00_return_address.patch
|
||||
psmouse_base.patch
|
||||
screen_reset_fix.patch
|
||||
"
|
||||
builddir="$srcdir/${_repository}-${_commit}"
|
||||
|
|
@ -74,7 +75,8 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="b2534400ab0578ffbf921bd7dac2e0c5fb37264687f9e968dd4816523a9aebfba3d73d065b45fdad548e3b3e852a9e855ddf9082a435f0749eee1f19ee3f881f linux-samsung-kylepro-cf1920dca4e0b68976002ea1855c467c550cb98f.tar.gz
|
||||
a3942286ab7f787438f5c5e6583bd74ef00d9b15d0488b6e89482d294bc211498559abd5118fc5ff9edd37b86a4bd4e03998b1fc82981dda804b41bdeff3059d config-samsung-kylepro.armhf
|
||||
e30da13d06938f4d3f6e2bb097374a2abe3f915cf30463b4066e168383bcaba30b417892ccc1d822aef784d32b05303fb1d9c553bc385786b82714c7abfd3062 config-samsung-kylepro.armhf
|
||||
d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h
|
||||
c40eaa11547f5bc2b1ff965506bdfe3015ff16e4b5ad9ccb3b8134ceafd1d32407c4ef2b213e02e036ce1e9bdcbfe768dff7d4b054bec77705a176c1f783b6f5 00_return_address.patch
|
||||
f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543 psmouse_base.patch
|
||||
c0a59be648ef646650c83b5d135daa05aae300c7ad5056d49f1b3f9967c4d7f337b0ddb8ae319b11e43c17aaf5fc9dcc9724463d265c1d765dc85c86f612f4ea screen_reset_fix.patch"
|
||||
|
|
|
|||
|
|
@ -1478,7 +1478,22 @@ CONFIG_KEYBOARD_GPIO=y
|
|||
# CONFIG_KEYBOARD_OMAP4 is not set
|
||||
# CONFIG_KEYBOARD_XTKBD is not set
|
||||
# CONFIG_KEYBOARD_VIRTUAL is not set
|
||||
# CONFIG_INPUT_MOUSE is not set
|
||||
CONFIG_INPUT_MOUSE=y
|
||||
CONFIG_MOUSE_PS2=y
|
||||
CONFIG_MOUSE_PS2_ALPS=y
|
||||
CONFIG_MOUSE_PS2_LOGIPS2PP=y
|
||||
CONFIG_MOUSE_PS2_SYNAPTICS=y
|
||||
CONFIG_MOUSE_PS2_TRACKPOINT=y
|
||||
# CONFIG_MOUSE_PS2_ELANTECH is not set
|
||||
# CONFIG_MOUSE_PS2_SENTELIC is not set
|
||||
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
|
||||
# CONFIG_MOUSE_SERIAL is not set
|
||||
# CONFIG_MOUSE_APPLETOUCH is not set
|
||||
# CONFIG_MOUSE_BCM5974 is not set
|
||||
# CONFIG_MOUSE_VSXXXAA is not set
|
||||
# CONFIG_MOUSE_GPIO is not set
|
||||
# CONFIG_MOUSE_SYNAPTICS_I2C is not set
|
||||
# CONFIG_MOUSE_SYNAPTICS_USB is not set
|
||||
# CONFIG_INPUT_JOYSTICK is not set
|
||||
# CONFIG_INPUT_TABLET is not set
|
||||
CONFIG_INPUT_TOUCHSCREEN=y
|
||||
|
|
@ -2041,21 +2056,230 @@ CONFIG_MEDIA_SUPPORT=y
|
|||
# Multimedia core support
|
||||
#
|
||||
CONFIG_MEDIA_CONTROLLER=y
|
||||
# CONFIG_VIDEO_DEV is not set
|
||||
CONFIG_VIDEO_DEV=y
|
||||
CONFIG_VIDEO_V4L2_COMMON=y
|
||||
# CONFIG_VIDEO_V4L2_SUBDEV_API is not set
|
||||
# CONFIG_DVB_CORE is not set
|
||||
# CONFIG_VIDEO_MEDIA is not set
|
||||
CONFIG_VIDEO_MEDIA=y
|
||||
|
||||
#
|
||||
# Multimedia drivers
|
||||
#
|
||||
# CONFIG_RC_CORE is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MEDIA_TUNER=y
|
||||
CONFIG_MEDIA_TUNER_CUSTOMISE=y
|
||||
|
||||
#
|
||||
# Customize TV tuners
|
||||
#
|
||||
CONFIG_MEDIA_TUNER_SIMPLE=m
|
||||
CONFIG_MEDIA_TUNER_TDA8290=m
|
||||
CONFIG_MEDIA_TUNER_TDA827X=m
|
||||
CONFIG_MEDIA_TUNER_TDA18271=m
|
||||
CONFIG_MEDIA_TUNER_TDA9887=m
|
||||
CONFIG_MEDIA_TUNER_TEA5761=m
|
||||
CONFIG_MEDIA_TUNER_TEA5767=m
|
||||
CONFIG_MEDIA_TUNER_MT20XX=m
|
||||
CONFIG_MEDIA_TUNER_MT2060=m
|
||||
CONFIG_MEDIA_TUNER_MT2063=m
|
||||
CONFIG_MEDIA_TUNER_MT2266=m
|
||||
CONFIG_MEDIA_TUNER_MT2131=m
|
||||
CONFIG_MEDIA_TUNER_QT1010=m
|
||||
CONFIG_MEDIA_TUNER_XC2028=m
|
||||
CONFIG_MEDIA_TUNER_XC5000=m
|
||||
CONFIG_MEDIA_TUNER_XC4000=m
|
||||
CONFIG_MEDIA_TUNER_MXL5005S=m
|
||||
CONFIG_MEDIA_TUNER_MXL5007T=m
|
||||
CONFIG_MEDIA_TUNER_MC44S803=m
|
||||
CONFIG_MEDIA_TUNER_MAX2165=m
|
||||
CONFIG_MEDIA_TUNER_TDA18218=m
|
||||
CONFIG_MEDIA_TUNER_TDA18212=m
|
||||
CONFIG_FLASH_ENABLE=y
|
||||
# CONFIG_FLASH_MIC2871 is not set
|
||||
CONFIG_FLASH_SKY81290=y
|
||||
# CONFIG_FLASH_RT8547 is not set
|
||||
# CONFIG_FLASH_DS8515 is not set
|
||||
# CONFIG_FLASH_SKY81279 is not set
|
||||
CONFIG_VIDEO_V4L2=y
|
||||
# CONFIG_LATIN_CAMERA_FLICKER_60HZ is not set
|
||||
CONFIG_VIDEO_CAPTURE_DRIVERS=y
|
||||
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
|
||||
# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
|
||||
|
||||
#
|
||||
# Encoders, decoders, sensors and other helper chips
|
||||
#
|
||||
|
||||
#
|
||||
# Audio decoders, processors and mixers
|
||||
#
|
||||
# CONFIG_VIDEO_TVAUDIO is not set
|
||||
# CONFIG_VIDEO_TDA7432 is not set
|
||||
# CONFIG_VIDEO_TDA9840 is not set
|
||||
# CONFIG_VIDEO_TEA6415C is not set
|
||||
# CONFIG_VIDEO_TEA6420 is not set
|
||||
# CONFIG_VIDEO_MSP3400 is not set
|
||||
# CONFIG_VIDEO_CS5345 is not set
|
||||
# CONFIG_VIDEO_CS53L32A is not set
|
||||
# CONFIG_VIDEO_TLV320AIC23B is not set
|
||||
# CONFIG_VIDEO_WM8775 is not set
|
||||
# CONFIG_VIDEO_WM8739 is not set
|
||||
# CONFIG_VIDEO_VP27SMPX is not set
|
||||
|
||||
#
|
||||
# RDS decoders
|
||||
#
|
||||
# CONFIG_VIDEO_SAA6588 is not set
|
||||
|
||||
#
|
||||
# Video decoders
|
||||
#
|
||||
# CONFIG_VIDEO_ADV7180 is not set
|
||||
# CONFIG_VIDEO_ADV7183 is not set
|
||||
# CONFIG_VIDEO_BT819 is not set
|
||||
# CONFIG_VIDEO_BT856 is not set
|
||||
# CONFIG_VIDEO_BT866 is not set
|
||||
# CONFIG_VIDEO_KS0127 is not set
|
||||
# CONFIG_VIDEO_SAA7110 is not set
|
||||
# CONFIG_VIDEO_SAA711X is not set
|
||||
# CONFIG_VIDEO_SAA7191 is not set
|
||||
# CONFIG_VIDEO_TVP514X is not set
|
||||
# CONFIG_VIDEO_TVP5150 is not set
|
||||
# CONFIG_VIDEO_TVP7002 is not set
|
||||
# CONFIG_VIDEO_VPX3220 is not set
|
||||
|
||||
#
|
||||
# Video and audio decoders
|
||||
#
|
||||
# CONFIG_VIDEO_SAA717X is not set
|
||||
# CONFIG_VIDEO_CX25840 is not set
|
||||
|
||||
#
|
||||
# MPEG video encoders
|
||||
#
|
||||
# CONFIG_VIDEO_CX2341X is not set
|
||||
|
||||
#
|
||||
# Video encoders
|
||||
#
|
||||
# CONFIG_VIDEO_SAA7127 is not set
|
||||
# CONFIG_VIDEO_SAA7185 is not set
|
||||
# CONFIG_VIDEO_ADV7170 is not set
|
||||
# CONFIG_VIDEO_ADV7175 is not set
|
||||
# CONFIG_VIDEO_ADV7343 is not set
|
||||
# CONFIG_VIDEO_AK881X is not set
|
||||
|
||||
#
|
||||
# Camera sensor devices
|
||||
#
|
||||
# CONFIG_VIDEO_OV7670 is not set
|
||||
# CONFIG_VIDEO_VS6624 is not set
|
||||
# CONFIG_VIDEO_MT9V011 is not set
|
||||
# CONFIG_VIDEO_TCM825X is not set
|
||||
# CONFIG_VIDEO_SR030PC30 is not set
|
||||
|
||||
#
|
||||
# Flash devices
|
||||
#
|
||||
# CONFIG_VIDEO_ADP1653 is not set
|
||||
# CONFIG_VIDEO_AS3643 is not set
|
||||
# CONFIG_GPIO_FLASH is not set
|
||||
# CONFIG_VIDEO_A3907 is not set
|
||||
# CONFIG_VIDEO_DW9714 is not set
|
||||
# CONFIG_VIDEO_AS3645A is not set
|
||||
|
||||
#
|
||||
# Video improvement chips
|
||||
#
|
||||
# CONFIG_VIDEO_UPD64031A is not set
|
||||
# CONFIG_VIDEO_UPD64083 is not set
|
||||
|
||||
#
|
||||
# Miscelaneous helper chips
|
||||
#
|
||||
# CONFIG_VIDEO_THS7303 is not set
|
||||
# CONFIG_VIDEO_M52790 is not set
|
||||
CONFIG_V4L_USB_DRIVERS=y
|
||||
# CONFIG_USB_VIDEO_CLASS is not set
|
||||
CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
|
||||
CONFIG_USB_GSPCA=m
|
||||
# CONFIG_USB_M5602 is not set
|
||||
# CONFIG_USB_STV06XX is not set
|
||||
# CONFIG_USB_GL860 is not set
|
||||
# CONFIG_USB_GSPCA_BENQ is not set
|
||||
# CONFIG_USB_GSPCA_CONEX is not set
|
||||
# CONFIG_USB_GSPCA_CPIA1 is not set
|
||||
# CONFIG_USB_GSPCA_ETOMS is not set
|
||||
# CONFIG_USB_GSPCA_FINEPIX is not set
|
||||
# CONFIG_USB_GSPCA_JEILINJ is not set
|
||||
# CONFIG_USB_GSPCA_JL2005BCD is not set
|
||||
# CONFIG_USB_GSPCA_KINECT is not set
|
||||
# CONFIG_USB_GSPCA_KONICA is not set
|
||||
# CONFIG_USB_GSPCA_MARS is not set
|
||||
# CONFIG_USB_GSPCA_MR97310A is not set
|
||||
# CONFIG_USB_GSPCA_NW80X is not set
|
||||
# CONFIG_USB_GSPCA_OV519 is not set
|
||||
# CONFIG_USB_GSPCA_OV534 is not set
|
||||
# CONFIG_USB_GSPCA_OV534_9 is not set
|
||||
# CONFIG_USB_GSPCA_PAC207 is not set
|
||||
# CONFIG_USB_GSPCA_PAC7302 is not set
|
||||
# CONFIG_USB_GSPCA_PAC7311 is not set
|
||||
# CONFIG_USB_GSPCA_SE401 is not set
|
||||
# CONFIG_USB_GSPCA_SN9C2028 is not set
|
||||
# CONFIG_USB_GSPCA_SN9C20X is not set
|
||||
# CONFIG_USB_GSPCA_SONIXB is not set
|
||||
# CONFIG_USB_GSPCA_SONIXJ is not set
|
||||
# CONFIG_USB_GSPCA_SPCA500 is not set
|
||||
# CONFIG_USB_GSPCA_SPCA501 is not set
|
||||
# CONFIG_USB_GSPCA_SPCA505 is not set
|
||||
# CONFIG_USB_GSPCA_SPCA506 is not set
|
||||
# CONFIG_USB_GSPCA_SPCA508 is not set
|
||||
# CONFIG_USB_GSPCA_SPCA561 is not set
|
||||
# CONFIG_USB_GSPCA_SPCA1528 is not set
|
||||
# CONFIG_USB_GSPCA_SQ905 is not set
|
||||
# CONFIG_USB_GSPCA_SQ905C is not set
|
||||
# CONFIG_USB_GSPCA_SQ930X is not set
|
||||
# CONFIG_USB_GSPCA_STK014 is not set
|
||||
# CONFIG_USB_GSPCA_STV0680 is not set
|
||||
# CONFIG_USB_GSPCA_SUNPLUS is not set
|
||||
# CONFIG_USB_GSPCA_T613 is not set
|
||||
# CONFIG_USB_GSPCA_TOPRO is not set
|
||||
# CONFIG_USB_GSPCA_TV8532 is not set
|
||||
# CONFIG_USB_GSPCA_VC032X is not set
|
||||
# CONFIG_USB_GSPCA_VICAM is not set
|
||||
# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
|
||||
# CONFIG_USB_GSPCA_ZC3XX is not set
|
||||
# CONFIG_VIDEO_PVRUSB2 is not set
|
||||
# CONFIG_VIDEO_HDPVR is not set
|
||||
# CONFIG_VIDEO_EM28XX is not set
|
||||
# CONFIG_VIDEO_USBVISION is not set
|
||||
# CONFIG_USB_ET61X251 is not set
|
||||
# CONFIG_USB_SN9C102 is not set
|
||||
# CONFIG_USB_PWC is not set
|
||||
# CONFIG_VIDEO_CPIA2 is not set
|
||||
# CONFIG_USB_ZR364XX is not set
|
||||
# CONFIG_USB_STKWEBCAM is not set
|
||||
# CONFIG_USB_S2255 is not set
|
||||
# CONFIG_V4L_PLATFORM_DRIVERS is not set
|
||||
# CONFIG_V4L_MEM2MEM_DRIVERS is not set
|
||||
CONFIG_RADIO_ADAPTERS=y
|
||||
# CONFIG_RADIO_SI470X is not set
|
||||
# CONFIG_USB_MR800 is not set
|
||||
# CONFIG_USB_DSBR is not set
|
||||
# CONFIG_I2C_SI4713 is not set
|
||||
# CONFIG_RADIO_SI4713 is not set
|
||||
# CONFIG_USB_KEENE is not set
|
||||
# CONFIG_RADIO_TEA5764 is not set
|
||||
# CONFIG_RADIO_SAA7706H is not set
|
||||
# CONFIG_RADIO_TEF6862 is not set
|
||||
# CONFIG_RADIO_WL1273 is not set
|
||||
|
||||
#
|
||||
# Texas Instruments WL128x FM driver (ST based)
|
||||
#
|
||||
# CONFIG_RADIO_WL128X is not set
|
||||
# CONFIG_ISDBT is not set
|
||||
|
||||
#
|
||||
|
|
@ -2388,6 +2612,7 @@ CONFIG_USB_G_ANDROID_SAMSUNG_COMPOSITE=y
|
|||
# CONFIG_USB_G_MULTI is not set
|
||||
# CONFIG_USB_G_HID is not set
|
||||
# CONFIG_USB_G_DBGP is not set
|
||||
# CONFIG_USB_G_WEBCAM is not set
|
||||
# CONFIG_USB_MTP_SAMSUNG is not set
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
From ae4fef6fc558b0621532d0de6ebaaeaabe861792 Mon Sep 17 00:00:00 2001
|
||||
From: sub77 <sub77@ymail.com>
|
||||
Date: Fri, 31 Jul 2015 17:47:45 +0200
|
||||
Subject: [PATCH] fix build error: PS2MOUSE fsp_detect & lifebook
|
||||
|
||||
---
|
||||
drivers/input/mouse/psmouse-base.c | 62 +++++++++++++++++++-------------------
|
||||
1 file changed, 31 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
|
||||
index a19c183557d..ad3d2e861d0 100644
|
||||
--- a/drivers/input/mouse/psmouse-base.c
|
||||
+++ b/drivers/input/mouse/psmouse-base.c
|
||||
@@ -708,14 +708,14 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
||||
/*
|
||||
* We always check for lifebook because it does not disturb mouse
|
||||
* (it only checks DMI information).
|
||||
+ *
|
||||
+ * if (psmouse_do_detect(lifebook_detect, psmouse, set_properties) == 0) {
|
||||
+ * if (max_proto > PSMOUSE_IMEX) {
|
||||
+ * if (!set_properties || lifebook_init(psmouse) == 0)
|
||||
+ * return PSMOUSE_LIFEBOOK;
|
||||
+ * }
|
||||
+ * }
|
||||
*/
|
||||
- if (psmouse_do_detect(lifebook_detect, psmouse, set_properties) == 0) {
|
||||
- if (max_proto > PSMOUSE_IMEX) {
|
||||
- if (!set_properties || lifebook_init(psmouse) == 0)
|
||||
- return PSMOUSE_LIFEBOOK;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
/*
|
||||
* Try Kensington ThinkingMouse (we try first, because synaptics probe
|
||||
* upsets the thinkingmouse).
|
||||
@@ -821,19 +821,19 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
||||
/*
|
||||
* Try Finger Sensing Pad. We do it here because its probe upsets
|
||||
* Trackpoint devices (causing TP_READ_ID command to time out).
|
||||
- */
|
||||
- if (max_proto > PSMOUSE_IMEX) {
|
||||
- if (psmouse_do_detect(fsp_detect,
|
||||
- psmouse, set_properties) == 0) {
|
||||
- if (!set_properties || fsp_init(psmouse) == 0)
|
||||
- return PSMOUSE_FSP;
|
||||
-/*
|
||||
+ *
|
||||
+ * if (max_proto > PSMOUSE_IMEX) {
|
||||
+ * if (psmouse_do_detect(fsp_detect,
|
||||
+ * psmouse, set_properties) == 0) {
|
||||
+ * if (!set_properties || fsp_init(psmouse) == 0)
|
||||
+ * return PSMOUSE_FSP;
|
||||
+ *
|
||||
* Init failed, try basic relative protocols
|
||||
+ *
|
||||
+ * max_proto = PSMOUSE_IMEX;
|
||||
+ * }
|
||||
+ * }
|
||||
*/
|
||||
- max_proto = PSMOUSE_IMEX;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
/*
|
||||
* Reset to defaults in case the device got confused by extended
|
||||
* protocol probes. Note that we follow up with full reset because
|
||||
@@ -944,12 +944,12 @@ static const struct psmouse_protocol psmouse_protocols[] = {
|
||||
},
|
||||
#endif
|
||||
#ifdef CONFIG_MOUSE_PS2_LIFEBOOK
|
||||
- {
|
||||
- .type = PSMOUSE_LIFEBOOK,
|
||||
- .name = "LBPS/2",
|
||||
- .alias = "lifebook",
|
||||
- .init = lifebook_init,
|
||||
- },
|
||||
+/* {
|
||||
+* .type = PSMOUSE_LIFEBOOK,
|
||||
+* .name = "LBPS/2",
|
||||
+* .alias = "lifebook",
|
||||
+* .init = lifebook_init,
|
||||
+* },*/
|
||||
#endif
|
||||
#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
|
||||
{
|
||||
@@ -985,13 +985,13 @@ static const struct psmouse_protocol psmouse_protocols[] = {
|
||||
},
|
||||
#endif
|
||||
#ifdef CONFIG_MOUSE_PS2_SENTELIC
|
||||
- {
|
||||
- .type = PSMOUSE_FSP,
|
||||
- .name = "FSPPS/2",
|
||||
- .alias = "fsp",
|
||||
- .detect = fsp_detect,
|
||||
- .init = fsp_init,
|
||||
- },
|
||||
+/* {
|
||||
+* .type = PSMOUSE_FSP,
|
||||
+* .name = "FSPPS/2",
|
||||
+* .alias = "fsp",
|
||||
+* .detect = fsp_detect,
|
||||
+* .init = fsp_init,
|
||||
+* },*/
|
||||
#endif
|
||||
{
|
||||
.type = PSMOUSE_CORTRON,
|
||||
Loading…
Reference in New Issue