Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
cacd9759
K
Kernel
项目概览
openeuler
/
Kernel
大约 1 年 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cacd9759
编写于
10月 22, 2018
作者:
D
Dmitry Torokhov
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'next' into for-linus
Prepare input updates for 4.20 merge window.
上级
13c1c5e4
f39f8688
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
64 addition
and
29 deletion
+64
-29
Documentation/devicetree/bindings/input/pwm-vibrator.txt
Documentation/devicetree/bindings/input/pwm-vibrator.txt
+2
-2
Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
...ion/devicetree/bindings/input/touchscreen/touchscreen.txt
+4
-2
MAINTAINERS
MAINTAINERS
+1
-1
drivers/input/keyboard/sun4i-lradc-keys.c
drivers/input/keyboard/sun4i-lradc-keys.c
+3
-3
drivers/input/misc/xen-kbdfront.c
drivers/input/misc/xen-kbdfront.c
+1
-1
drivers/input/mouse/cyapa_gen3.c
drivers/input/mouse/cyapa_gen3.c
+2
-2
drivers/input/mouse/synaptics.c
drivers/input/mouse/synaptics.c
+1
-3
drivers/input/serio/xilinx_ps2.c
drivers/input/serio/xilinx_ps2.c
+1
-1
drivers/input/touchscreen/atmel_mxt_ts.c
drivers/input/touchscreen/atmel_mxt_ts.c
+1
-2
drivers/input/touchscreen/elants_i2c.c
drivers/input/touchscreen/elants_i2c.c
+4
-3
drivers/input/touchscreen/of_touchscreen.c
drivers/input/touchscreen/of_touchscreen.c
+28
-8
drivers/input/touchscreen/silead.c
drivers/input/touchscreen/silead.c
+13
-0
drivers/input/touchscreen/st1232.c
drivers/input/touchscreen/st1232.c
+1
-0
drivers/input/touchscreen/wm97xx-core.c
drivers/input/touchscreen/wm97xx-core.c
+2
-1
未找到文件。
Documentation/devicetree/bindings/input/pwm-vibrator.txt
浏览文件 @
cacd9759
...
...
@@ -58,8 +58,8 @@ Example from Motorola Droid 4:
vibrator {
compatible = "pwm-vibrator";
pwms = <&pwm
8
0 1000000000 0>,
<&pwm9
0 1000000000 0>;
pwms = <&pwm
9
0 1000000000 0>,
<&pwm8
0 1000000000 0>;
pwm-names = "enable", "direction";
direction-duty-cycle-ns = <1000000000>;
};
...
...
Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
浏览文件 @
cacd9759
General Touchscreen Properties:
Optional properties for Touchscreens:
- touchscreen-min-x : minimum x coordinate reported (0 if not set)
- touchscreen-min-y : minimum y coordinate reported (0 if not set)
- touchscreen-size-x : horizontal resolution of touchscreen
(
in pixels
)
(
maximum x coordinate reported + 1
)
- touchscreen-size-y : vertical resolution of touchscreen
(
in pixels
)
(
maximum y coordinate reported + 1
)
- touchscreen-max-pressure : maximum reported pressure (arbitrary range
dependent on the controller)
- touchscreen-fuzz-x : horizontal noise value of the absolute input
...
...
MAINTAINERS
浏览文件 @
cacd9759
...
...
@@ -3953,7 +3953,7 @@ D-LINK DIR-685 TOUCHKEYS DRIVER
M: Linus Walleij <linus.walleij@linaro.org>
L: linux-input@vger.kernel.org
S: Supported
F: drivers/input/dlink-dir685-touchkeys.c
F: drivers/input/
keyboard/
dlink-dir685-touchkeys.c
DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
M: Joshua Kinard <kumba@gentoo.org>
...
...
drivers/input/keyboard/sun4i-lradc-keys.c
浏览文件 @
cacd9759
...
...
@@ -185,19 +185,19 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev,
error
=
of_property_read_u32
(
pp
,
"channel"
,
&
channel
);
if
(
error
||
channel
!=
0
)
{
dev_err
(
dev
,
"%
s: Inval channel prop
\n
"
,
pp
->
name
);
dev_err
(
dev
,
"%
pOFn: Inval channel prop
\n
"
,
pp
);
return
-
EINVAL
;
}
error
=
of_property_read_u32
(
pp
,
"voltage"
,
&
map
->
voltage
);
if
(
error
)
{
dev_err
(
dev
,
"%
s: Inval voltage prop
\n
"
,
pp
->
name
);
dev_err
(
dev
,
"%
pOFn: Inval voltage prop
\n
"
,
pp
);
return
-
EINVAL
;
}
error
=
of_property_read_u32
(
pp
,
"linux,code"
,
&
map
->
keycode
);
if
(
error
)
{
dev_err
(
dev
,
"%
s: Inval linux,code prop
\n
"
,
pp
->
name
);
dev_err
(
dev
,
"%
pOFn: Inval linux,code prop
\n
"
,
pp
);
return
-
EINVAL
;
}
...
...
drivers/input/misc/xen-kbdfront.c
浏览文件 @
cacd9759
...
...
@@ -524,7 +524,7 @@ static void xenkbd_backend_changed(struct xenbus_device *dev,
case
XenbusStateClosed
:
if
(
dev
->
state
==
XenbusStateClosed
)
break
;
/*
Missed the backend's CLOSING state -- fallthrough
*/
/*
fall through - Missed the backend's CLOSING state
*/
case
XenbusStateClosing
:
xenbus_frontend_closed
(
dev
);
break
;
...
...
drivers/input/mouse/cyapa_gen3.c
浏览文件 @
cacd9759
...
...
@@ -1067,7 +1067,7 @@ static int cyapa_gen3_do_operational_check(struct cyapa *cyapa)
return
error
;
}
/* Fall
through state
*/
/* Fall
through
*/
case
CYAPA_STATE_BL_IDLE
:
/* Try to get firmware version in bootloader mode. */
cyapa_gen3_bl_query_data
(
cyapa
);
...
...
@@ -1078,7 +1078,7 @@ static int cyapa_gen3_do_operational_check(struct cyapa *cyapa)
return
error
;
}
/* Fall
through state
*/
/* Fall
through
*/
case
CYAPA_STATE_OP
:
/*
* Reading query data before going back to the full mode
...
...
drivers/input/mouse/synaptics.c
浏览文件 @
cacd9759
...
...
@@ -99,9 +99,7 @@ static int synaptics_mode_cmd(struct psmouse *psmouse, u8 mode)
int
synaptics_detect
(
struct
psmouse
*
psmouse
,
bool
set_properties
)
{
struct
ps2dev
*
ps2dev
=
&
psmouse
->
ps2dev
;
u8
param
[
4
];
param
[
0
]
=
0
;
u8
param
[
4
]
=
{
0
};
ps2_command
(
ps2dev
,
param
,
PSMOUSE_CMD_SETRES
);
ps2_command
(
ps2dev
,
param
,
PSMOUSE_CMD_SETRES
);
...
...
drivers/input/serio/xilinx_ps2.c
浏览文件 @
cacd9759
...
...
@@ -245,7 +245,7 @@ static int xps2_of_probe(struct platform_device *ofdev)
unsigned
int
irq
;
int
error
;
dev_info
(
dev
,
"Device Tree Probing
\'
%
s
\'\n
"
,
dev
->
of_node
->
nam
e
);
dev_info
(
dev
,
"Device Tree Probing
\'
%
pOFn
\'\n
"
,
dev
->
of_nod
e
);
/* Get iospace for the device */
error
=
of_address_to_resource
(
dev
->
of_node
,
0
,
&
r_mem
);
...
...
drivers/input/touchscreen/atmel_mxt_ts.c
浏览文件 @
cacd9759
...
...
@@ -29,7 +29,6 @@
#include <linux/property.h>
#include <linux/slab.h>
#include <linux/gpio/consumer.h>
#include <linux/property.h>
#include <asm/unaligned.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
...
...
@@ -489,7 +488,7 @@ static int mxt_lookup_bootloader_address(struct mxt_data *data, bool retry)
bootloader
=
appmode
-
0x24
;
break
;
}
/* Fall through for normal case */
/* Fall through
-
for normal case */
case
0x4c
:
case
0x4d
:
case
0x5a
:
...
...
drivers/input/touchscreen/elants_i2c.c
浏览文件 @
cacd9759
...
...
@@ -147,10 +147,11 @@ struct elants_data {
u8
cmd_resp
[
HEADER_SIZE
];
struct
completion
cmd_done
;
u8
buf
[
MAX_PACKET_SIZE
];
bool
wake_irq_enabled
;
bool
keep_power_in_suspend
;
/* Must be last to be used for DMA operations */
u8
buf
[
MAX_PACKET_SIZE
]
____cacheline_aligned
;
};
static
int
elants_i2c_send
(
struct
i2c_client
*
client
,
...
...
@@ -863,7 +864,7 @@ static irqreturn_t elants_i2c_irq(int irq, void *_dev)
int
i
;
int
len
;
len
=
i2c_master_recv
(
client
,
ts
->
buf
,
sizeof
(
ts
->
buf
));
len
=
i2c_master_recv
_dmasafe
(
client
,
ts
->
buf
,
sizeof
(
ts
->
buf
));
if
(
len
<
0
)
{
dev_err
(
&
client
->
dev
,
"%s: failed to read data: %d
\n
"
,
__func__
,
len
);
...
...
drivers/input/touchscreen/of_touchscreen.c
浏览文件 @
cacd9759
...
...
@@ -35,7 +35,7 @@ static bool touchscreen_get_prop_u32(struct device *dev,
static
void
touchscreen_set_params
(
struct
input_dev
*
dev
,
unsigned
long
axis
,
int
max
,
int
fuzz
)
int
m
in
,
int
m
ax
,
int
fuzz
)
{
struct
input_absinfo
*
absinfo
;
...
...
@@ -47,6 +47,7 @@ static void touchscreen_set_params(struct input_dev *dev,
}
absinfo
=
&
dev
->
absinfo
[
axis
];
absinfo
->
minimum
=
min
;
absinfo
->
maximum
=
max
;
absinfo
->
fuzz
=
fuzz
;
}
...
...
@@ -68,8 +69,9 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
struct
touchscreen_properties
*
prop
)
{
struct
device
*
dev
=
input
->
dev
.
parent
;
struct
input_absinfo
*
absinfo
;
unsigned
int
axis
;
unsigned
int
maximum
,
fuzz
;
unsigned
int
m
inimum
,
m
aximum
,
fuzz
;
bool
data_present
;
input_alloc_absinfo
(
input
);
...
...
@@ -77,7 +79,10 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
return
;
axis
=
multitouch
?
ABS_MT_POSITION_X
:
ABS_X
;
data_present
=
touchscreen_get_prop_u32
(
dev
,
"touchscreen-size-x"
,
data_present
=
touchscreen_get_prop_u32
(
dev
,
"touchscreen-min-x"
,
input_abs_get_min
(
input
,
axis
),
&
minimum
)
|
touchscreen_get_prop_u32
(
dev
,
"touchscreen-size-x"
,
input_abs_get_max
(
input
,
axis
)
+
1
,
&
maximum
)
|
...
...
@@ -85,10 +90,13 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
input_abs_get_fuzz
(
input
,
axis
),
&
fuzz
);
if
(
data_present
)
touchscreen_set_params
(
input
,
axis
,
maximum
-
1
,
fuzz
);
touchscreen_set_params
(
input
,
axis
,
m
inimum
,
m
aximum
-
1
,
fuzz
);
axis
=
multitouch
?
ABS_MT_POSITION_Y
:
ABS_Y
;
data_present
=
touchscreen_get_prop_u32
(
dev
,
"touchscreen-size-y"
,
data_present
=
touchscreen_get_prop_u32
(
dev
,
"touchscreen-min-y"
,
input_abs_get_min
(
input
,
axis
),
&
minimum
)
|
touchscreen_get_prop_u32
(
dev
,
"touchscreen-size-y"
,
input_abs_get_max
(
input
,
axis
)
+
1
,
&
maximum
)
|
...
...
@@ -96,7 +104,7 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
input_abs_get_fuzz
(
input
,
axis
),
&
fuzz
);
if
(
data_present
)
touchscreen_set_params
(
input
,
axis
,
maximum
-
1
,
fuzz
);
touchscreen_set_params
(
input
,
axis
,
m
inimum
,
m
aximum
-
1
,
fuzz
);
axis
=
multitouch
?
ABS_MT_PRESSURE
:
ABS_PRESSURE
;
data_present
=
touchscreen_get_prop_u32
(
dev
,
...
...
@@ -108,7 +116,7 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
input_abs_get_fuzz
(
input
,
axis
),
&
fuzz
);
if
(
data_present
)
touchscreen_set_params
(
input
,
axis
,
maximum
,
fuzz
);
touchscreen_set_params
(
input
,
axis
,
0
,
maximum
,
fuzz
);
if
(
!
prop
)
return
;
...
...
@@ -117,13 +125,25 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
prop
->
max_x
=
input_abs_get_max
(
input
,
axis
);
prop
->
max_y
=
input_abs_get_max
(
input
,
axis
+
1
);
prop
->
invert_x
=
device_property_read_bool
(
dev
,
"touchscreen-inverted-x"
);
if
(
prop
->
invert_x
)
{
absinfo
=
&
input
->
absinfo
[
axis
];
absinfo
->
maximum
-=
absinfo
->
minimum
;
absinfo
->
minimum
=
0
;
}
prop
->
invert_y
=
device_property_read_bool
(
dev
,
"touchscreen-inverted-y"
);
if
(
prop
->
invert_y
)
{
absinfo
=
&
input
->
absinfo
[
axis
+
1
];
absinfo
->
maximum
-=
absinfo
->
minimum
;
absinfo
->
minimum
=
0
;
}
prop
->
swap_x_y
=
device_property_read_bool
(
dev
,
"touchscreen-swapped-x-y"
);
if
(
prop
->
swap_x_y
)
swap
(
input
->
absinfo
[
axis
],
input
->
absinfo
[
axis
+
1
]);
}
...
...
drivers/input/touchscreen/silead.c
浏览文件 @
cacd9759
...
...
@@ -558,20 +558,33 @@ static int __maybe_unused silead_ts_suspend(struct device *dev)
static
int
__maybe_unused
silead_ts_resume
(
struct
device
*
dev
)
{
struct
i2c_client
*
client
=
to_i2c_client
(
dev
);
bool
second_try
=
false
;
int
error
,
status
;
silead_ts_set_power
(
client
,
SILEAD_POWER_ON
);
retry:
error
=
silead_ts_reset
(
client
);
if
(
error
)
return
error
;
if
(
second_try
)
{
error
=
silead_ts_load_fw
(
client
);
if
(
error
)
return
error
;
}
error
=
silead_ts_startup
(
client
);
if
(
error
)
return
error
;
status
=
silead_ts_get_status
(
client
);
if
(
status
!=
SILEAD_STATUS_OK
)
{
if
(
!
second_try
)
{
second_try
=
true
;
dev_dbg
(
dev
,
"Reloading firmware after unsuccessful resume
\n
"
);
goto
retry
;
}
dev_err
(
dev
,
"Resume error, status: 0x%02x
\n
"
,
status
);
return
-
ENODEV
;
}
...
...
drivers/input/touchscreen/st1232.c
浏览文件 @
cacd9759
...
...
@@ -195,6 +195,7 @@ static int st1232_ts_probe(struct i2c_client *client,
input_dev
->
id
.
bustype
=
BUS_I2C
;
input_dev
->
dev
.
parent
=
&
client
->
dev
;
__set_bit
(
INPUT_PROP_DIRECT
,
input_dev
->
propbit
);
__set_bit
(
EV_SYN
,
input_dev
->
evbit
);
__set_bit
(
EV_KEY
,
input_dev
->
evbit
);
__set_bit
(
EV_ABS
,
input_dev
->
evbit
);
...
...
drivers/input/touchscreen/wm97xx-core.c
浏览文件 @
cacd9759
...
...
@@ -929,7 +929,8 @@ static int __init wm97xx_init(void)
static
void
__exit
wm97xx_exit
(
void
)
{
driver_unregister
(
&
wm97xx_driver
);
if
(
IS_BUILTIN
(
CONFIG_AC97_BUS
))
driver_unregister
(
&
wm97xx_driver
);
platform_driver_unregister
(
&
wm97xx_mfd_driver
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录