* Re: [PATCH v2] MAINTAINERS: add maintainers for ChromeOS EC sub-drivers
From: Chanwoo Choi @ 2018-12-12 0:55 UTC (permalink / raw)
To: Enric Balletbo i Serra, linux-kernel
Cc: Alessandro Zummo, linux-pwm, linux-iio, Alexandre Belloni,
linux-i2c, groeck, kernel, linux-rtc, Benson Leung,
Sebastian Reichel, linux-input, Dmitry Torokhov, Jonathan Cameron,
Peter Meerwald-Stadler, devicetree, Thierry Reding, linux-pm,
MyungJoo Ham, Lee Jones, Hartmut Knaack, Rob Herring,
Lars-Peter Clausen, Mark
In-Reply-To: <20181211190953.13626-1-enric.balletbo@collabora.com>
Hi Enric,
On 2018년 12월 12일 04:09, Enric Balletbo i Serra wrote:
> There are multiple ChromeOS EC sub-drivers spread in different
> subsystems, as all of them are related to the Chrome stuff add
> Benson and myself as a maintainers for all these sub-drivers.
>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
>
> Changes in v2:
> - Fix typo in Benson email address.
>
> MAINTAINERS | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a24129b0b043..bbe7180e2851 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3625,6 +3625,30 @@ S: Maintained
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
> F: drivers/platform/chrome/
>
> +CHROMEOS EC SUBDRIVERS
> +M: Benson Leung <bleung@chromium.org>
> +M: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> +S: Maintained
> +F: Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
> +F: Documentation/devicetree/bindings/input/cros-ec-keyb.txt
> +F: Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt
> +F: Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt
> +F: Documentation/devicetree/bindings/mfd/cros-ec.txt
> +F: Documentation/ABI/testing/sysfs-bus-iio-cros-ec
> +F: drivers/extcon/extcon-usbc-cros-ec.c
> +F: drivers/i2c/busses/i2c-cros-ec-tunnel.c
> +F: drivers/iio/accel/cros_ec*
> +F: drivers/iio/common/cros_ec_sensors/
> +F: drivers/iio/light/cros_ec*
> +F: drivers/iio/pressure/cros_ec*
> +F: drivers/input/keyboard/cros_ec*
> +F: drivers/mfd/cros_ec*
> +F: drivers/power/supply/cros_usbpd-charger.c
> +F: drivers/pwm/pwm-cros-ec.c
> +F: drivers/rtc/rtc-cros-ec.c
> +F: include/linux/iio/common/cros_ec_sensors_core.h
> +F: include/linux/mfd/cros_ec*
> +
> CIRRUS LOGIC AUDIO CODEC DRIVERS
> M: Brian Austin <brian.austin@cirrus.com>
> M: Paul Handrigan <Paul.Handrigan@cirrus.com>
>
For extcon part,
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
--
Best Regards,
Chanwoo Choi
Samsung Electronics
^ permalink raw reply
* [PATCH v4 1/8] dt-bindings: stmpe: reformatting parameter list and use tabs only
From: Philippe Schenker @ 2018-12-12 13:06 UTC (permalink / raw)
To: jic23, marcel.ziswiler, stefan
Cc: Mark Rutland, devicetree, Alexandre Torgue, Dmitry Torokhov,
linux-kernel, Rob Herring, linux-stm32, Philippe Schenker,
thierry.reding, linux-arm-kernel, Max Krummenacher, linux-input,
Lee Jones, Philippe Schenker, Maxime Coquelin
This patch reformats the parameter list for stmpe device in a
table-style so it is more clear to read.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---
Changes in v4:
- New separate precursor patch for holding reformatting
Changes in v3: None
Changes in v2: None
.../bindings/input/touchscreen/stmpe.txt | 52 ++++++++++++-------
.../devicetree/bindings/mfd/stmpe.txt | 14 ++---
2 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt b/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt
index 127baa31a77a..1d3f84308142 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt
@@ -5,24 +5,40 @@ Required properties:
- compatible: "st,stmpe-ts"
Optional properties:
-- st,sample-time: ADC converstion time in number of clock. (0 -> 36 clocks, 1 ->
- 44 clocks, 2 -> 56 clocks, 3 -> 64 clocks, 4 -> 80 clocks, 5 -> 96 clocks, 6
- -> 144 clocks), recommended is 4.
-- st,mod-12b: ADC Bit mode (0 -> 10bit ADC, 1 -> 12bit ADC)
-- st,ref-sel: ADC reference source (0 -> internal reference, 1 -> external
- reference)
-- st,adc-freq: ADC Clock speed (0 -> 1.625 MHz, 1 -> 3.25 MHz, 2 || 3 -> 6.5 MHz)
-- st,ave-ctrl: Sample average control (0 -> 1 sample, 1 -> 2 samples, 2 -> 4
- samples, 3 -> 8 samples)
-- st,touch-det-delay: Touch detect interrupt delay (0 -> 10 us, 1 -> 50 us, 2 ->
- 100 us, 3 -> 500 us, 4-> 1 ms, 5 -> 5 ms, 6 -> 10 ms, 7 -> 50 ms) recommended
- is 3
-- st,settling: Panel driver settling time (0 -> 10 us, 1 -> 100 us, 2 -> 500 us, 3
- -> 1 ms, 4 -> 5 ms, 5 -> 10 ms, 6 for 50 ms, 7 -> 100 ms) recommended is 2
-- st,fraction-z: Length of the fractional part in z (fraction-z ([0..7]) = Count of
- the fractional part) recommended is 7
-- st,i-drive: current limit value of the touchscreen drivers (0 -> 20 mA typical 35
- mA max, 1 -> 50 mA typical 80 mA max)
+- st,sample-time : ADC conversion time in number of clock.
+ 0 -> 36 clocks 4 -> 80 clocks (recommended)
+ 1 -> 44 clocks 5 -> 96 clocks
+ 2 -> 56 clocks 6 -> 144 clocks
+ 3 -> 64 clocks
+- st,mod-12b : ADC Bit mode
+ 0 -> 10bit ADC 1 -> 12bit ADC
+- st,ref-sel : ADC reference source
+ 0 -> internal 1 -> external
+- st,adc-freq : ADC Clock speed
+ 0 -> 1.625 MHz 2 || 3 -> 6.5 MHz
+ 1 -> 3.25 MHz
+- st,ave-ctrl : Sample average control
+ 0 -> 1 sample
+ 1 -> 2 samples
+ 2 -> 4 samples
+ 3 -> 8 samples
+- st,touch-det-delay : Touch detect interrupt delay (recommended is 3)
+ 0 -> 10 us 5 -> 5 ms
+ 1 -> 50 us 6 -> 10 ms
+ 2 -> 100 us 7 -> 50 ms
+ 3 -> 500 us
+ 4 -> 1 ms
+- st,settling : Panel driver settling time (recommended is 2)
+ 0 -> 10 us 5 -> 10 ms
+ 1 -> 100 us 6 for 50 ms
+ 2 -> 500 us 7 -> 100 ms
+ 3 -> 1 ms
+ 4 -> 5 ms
+- st,fraction-z : Length of the fractional part in z (recommended is 7)
+ (fraction-z ([0..7]) = Count of the fractional part)
+- st,i-drive : current limit value of the touchscreen drivers
+ 0 -> 20 mA (typical 35mA max)
+ 1 -> 50 mA (typical 80 mA max)
Node name must be stmpe_touchscreen and should be child node of stmpe node to
which it belongs.
diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt
index c797c05cd3c2..a46e7177195d 100644
--- a/Documentation/devicetree/bindings/mfd/stmpe.txt
+++ b/Documentation/devicetree/bindings/mfd/stmpe.txt
@@ -4,15 +4,15 @@ STMPE is an MFD device which may expose the following inbuilt devices: gpio,
keypad, touchscreen, adc, pwm, rotator.
Required properties:
- - compatible : "st,stmpe[610|801|811|1600|1601|2401|2403]"
- - reg : I2C/SPI address of the device
+ - compatible : "st,stmpe[610|801|811|1600|1601|2401|2403]"
+ - reg : I2C/SPI address of the device
Optional properties:
- - interrupts : The interrupt outputs from the controller
- - interrupt-controller : Marks the device node as an interrupt controller
- - wakeup-source : Marks the input device as wakable
- - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024
- - irq-gpio : If present, which GPIO to use for event IRQ
+ - interrupts : The interrupt outputs from the controller
+ - interrupt-controller : Marks the device node as an interrupt controller
+ - wakeup-source : Marks the input device as wakable
+ - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024
+ - irq-gpio : If present, which GPIO to use for event IRQ
Example:
--
2.19.2
^ permalink raw reply related
* [PATCH v4 2/8] mfd: stmpe: Move ADC related defines to header of mfd
From: Philippe Schenker @ 2018-12-12 13:06 UTC (permalink / raw)
To: jic23, marcel.ziswiler, stefan
Cc: thierry.reding, Philippe Schenker, Philippe Schenker,
Alexandre Torgue, Lee Jones, linux-kernel, Dmitry Torokhov,
linux-input, Maxime Coquelin, linux-stm32, linux-arm-kernel
In-Reply-To: <20181212130649.15146-1-dev@pschenker.ch>
Move defines that are ADC related to the header of the overlying mfd,
so they can be used from multiple sub-devices.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- This is a new added commit. Separate commit for moving the defines
out of drivers/input/touchscreen/stmpe-ts.c to overlying mfd-device
drivers/mfd/stmpe.c
- Pre-fix defines with STMPE_
drivers/input/touchscreen/stmpe-ts.c | 34 +++++++++++-----------------
include/linux/mfd/stmpe.h | 11 +++++++++
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
index 2a78e27b4495..c5d9006588a2 100644
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -49,17 +49,6 @@
#define STMPE_IRQ_TOUCH_DET 0
-#define SAMPLE_TIME(x) ((x & 0xf) << 4)
-#define MOD_12B(x) ((x & 0x1) << 3)
-#define REF_SEL(x) ((x & 0x1) << 1)
-#define ADC_FREQ(x) (x & 0x3)
-#define AVE_CTRL(x) ((x & 0x3) << 6)
-#define DET_DELAY(x) ((x & 0x7) << 3)
-#define SETTLING(x) (x & 0x7)
-#define FRACTION_Z(x) (x & 0x7)
-#define I_DRIVE(x) (x & 0x1)
-#define OP_MODE(x) ((x & 0x7) << 1)
-
#define STMPE_TS_NAME "stmpe-ts"
#define XY_MASK 0xfff
@@ -213,9 +202,10 @@ static int stmpe_init_hw(struct stmpe_touch *ts)
return ret;
}
- adc_ctrl1 = SAMPLE_TIME(ts->sample_time) | MOD_12B(ts->mod_12b) |
- REF_SEL(ts->ref_sel);
- adc_ctrl1_mask = SAMPLE_TIME(0xff) | MOD_12B(0xff) | REF_SEL(0xff);
+ adc_ctrl1 = STMPE_SAMPLE_TIME(ts->sample_time) |
+ STMPE_MOD_12B(ts->mod_12b) | STMPE_REF_SEL(ts->ref_sel);
+ adc_ctrl1_mask = STMPE_SAMPLE_TIME(0xff) | STMPE_MOD_12B(0xff) |
+ STMPE_REF_SEL(0xff);
ret = stmpe_set_bits(stmpe, STMPE_REG_ADC_CTRL1,
adc_ctrl1_mask, adc_ctrl1);
@@ -225,15 +215,17 @@ static int stmpe_init_hw(struct stmpe_touch *ts)
}
ret = stmpe_set_bits(stmpe, STMPE_REG_ADC_CTRL2,
- ADC_FREQ(0xff), ADC_FREQ(ts->adc_freq));
+ STMPE_ADC_FREQ(0xff), STMPE_ADC_FREQ(ts->adc_freq));
if (ret) {
dev_err(dev, "Could not setup ADC\n");
return ret;
}
- tsc_cfg = AVE_CTRL(ts->ave_ctrl) | DET_DELAY(ts->touch_det_delay) |
- SETTLING(ts->settling);
- tsc_cfg_mask = AVE_CTRL(0xff) | DET_DELAY(0xff) | SETTLING(0xff);
+ tsc_cfg = STMPE_AVE_CTRL(ts->ave_ctrl) |
+ STMPE_DET_DELAY(ts->touch_det_delay) |
+ STMPE_SETTLING(ts->settling);
+ tsc_cfg_mask = STMPE_AVE_CTRL(0xff) | STMPE_DET_DELAY(0xff) |
+ STMPE_SETTLING(0xff);
ret = stmpe_set_bits(stmpe, STMPE_REG_TSC_CFG, tsc_cfg_mask, tsc_cfg);
if (ret) {
@@ -242,14 +234,14 @@ static int stmpe_init_hw(struct stmpe_touch *ts)
}
ret = stmpe_set_bits(stmpe, STMPE_REG_TSC_FRACTION_Z,
- FRACTION_Z(0xff), FRACTION_Z(ts->fraction_z));
+ STMPE_FRACTION_Z(0xff), STMPE_FRACTION_Z(ts->fraction_z));
if (ret) {
dev_err(dev, "Could not config touch\n");
return ret;
}
ret = stmpe_set_bits(stmpe, STMPE_REG_TSC_I_DRIVE,
- I_DRIVE(0xff), I_DRIVE(ts->i_drive));
+ STMPE_I_DRIVE(0xff), STMPE_I_DRIVE(ts->i_drive));
if (ret) {
dev_err(dev, "Could not config touch\n");
return ret;
@@ -263,7 +255,7 @@ static int stmpe_init_hw(struct stmpe_touch *ts)
}
ret = stmpe_set_bits(stmpe, STMPE_REG_TSC_CTRL,
- OP_MODE(0xff), OP_MODE(OP_MOD_XYZ));
+ STMPE_OP_MODE(0xff), STMPE_OP_MODE(OP_MOD_XYZ));
if (ret) {
dev_err(dev, "Could not set mode\n");
return ret;
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h
index 4a827af17e59..c0353f6431f9 100644
--- a/include/linux/mfd/stmpe.h
+++ b/include/linux/mfd/stmpe.h
@@ -10,6 +10,17 @@
#include <linux/mutex.h>
+#define STMPE_SAMPLE_TIME(x) ((x & 0xf) << 4)
+#define STMPE_MOD_12B(x) ((x & 0x1) << 3)
+#define STMPE_REF_SEL(x) ((x & 0x1) << 1)
+#define STMPE_ADC_FREQ(x) (x & 0x3)
+#define STMPE_AVE_CTRL(x) ((x & 0x3) << 6)
+#define STMPE_DET_DELAY(x) ((x & 0x7) << 3)
+#define STMPE_SETTLING(x) (x & 0x7)
+#define STMPE_FRACTION_Z(x) (x & 0x7)
+#define STMPE_I_DRIVE(x) (x & 0x1)
+#define STMPE_OP_MODE(x) ((x & 0x7) << 1)
+
struct device;
struct regulator;
--
2.19.2
^ permalink raw reply related
* [PATCH v4 4/8] Input: stmpe-ts: preparations for STMPE ADC driver
From: Philippe Schenker @ 2018-12-12 13:06 UTC (permalink / raw)
To: jic23, marcel.ziswiler, stefan
Cc: thierry.reding, Philippe Schenker, Philippe Schenker,
Alexandre Torgue, linux-input, linux-kernel, Dmitry Torokhov,
Lee Jones, Maxime Coquelin, linux-stm32, linux-arm-kernel
In-Reply-To: <20181212130649.15146-1-dev@pschenker.ch>
This patch removes common ADC settings in favor to use
stmpe811_adc_common_init that is present in MFD. This is necessary in
preparation for the stmpe-adc driver, because those two drivers have
common settings for the ADC.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---
Changes in v4:
- New patch: Split changes in stmpe-ts.c to a separate commit
- Remove common adc settings from init and call the
stmpe811_adc_common_init function
Changes in v3:
- Undo ADC-settings related code-deletions in stmpe-ts.c that the code
is backwards-compatible to older devicetrees.
Changes in v2: None
drivers/input/touchscreen/stmpe-ts.c | 42 +++++-----------------------
1 file changed, 7 insertions(+), 35 deletions(-)
diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
index c5d9006588a2..cf9c9aa39f6e 100644
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -30,8 +30,6 @@
* with touchscreen controller
*/
#define STMPE_REG_INT_STA 0x0B
-#define STMPE_REG_ADC_CTRL1 0x20
-#define STMPE_REG_ADC_CTRL2 0x21
#define STMPE_REG_TSC_CTRL 0x40
#define STMPE_REG_TSC_CFG 0x41
#define STMPE_REG_FIFO_TH 0x4A
@@ -58,15 +56,6 @@
* @idev: registered input device
* @work: a work item used to scan the device
* @dev: a pointer back to the MFD cell struct device*
- * @sample_time: ADC converstion time in number of clock.
- * (0 -> 36 clocks, 1 -> 44 clocks, 2 -> 56 clocks, 3 -> 64 clocks,
- * 4 -> 80 clocks, 5 -> 96 clocks, 6 -> 144 clocks),
- * recommended is 4.
- * @mod_12b: ADC Bit mode (0 -> 10bit ADC, 1 -> 12bit ADC)
- * @ref_sel: ADC reference source
- * (0 -> internal reference, 1 -> external reference)
- * @adc_freq: ADC Clock speed
- * (0 -> 1.625 MHz, 1 -> 3.25 MHz, 2 || 3 -> 6.5 MHz)
* @ave_ctrl: Sample average control
* (0 -> 1 sample, 1 -> 2 samples, 2 -> 4 samples, 3 -> 8 samples)
* @touch_det_delay: Touch detect interrupt delay
@@ -88,10 +77,6 @@ struct stmpe_touch {
struct input_dev *idev;
struct delayed_work work;
struct device *dev;
- u8 sample_time;
- u8 mod_12b;
- u8 ref_sel;
- u8 adc_freq;
u8 ave_ctrl;
u8 touch_det_delay;
u8 settling;
@@ -192,7 +177,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)
static int stmpe_init_hw(struct stmpe_touch *ts)
{
int ret;
- u8 adc_ctrl1, adc_ctrl1_mask, tsc_cfg, tsc_cfg_mask;
+ u8 tsc_cfg, tsc_cfg_mask;
struct stmpe *stmpe = ts->stmpe;
struct device *dev = ts->dev;
@@ -202,22 +187,9 @@ static int stmpe_init_hw(struct stmpe_touch *ts)
return ret;
}
- adc_ctrl1 = STMPE_SAMPLE_TIME(ts->sample_time) |
- STMPE_MOD_12B(ts->mod_12b) | STMPE_REF_SEL(ts->ref_sel);
- adc_ctrl1_mask = STMPE_SAMPLE_TIME(0xff) | STMPE_MOD_12B(0xff) |
- STMPE_REF_SEL(0xff);
-
- ret = stmpe_set_bits(stmpe, STMPE_REG_ADC_CTRL1,
- adc_ctrl1_mask, adc_ctrl1);
- if (ret) {
- dev_err(dev, "Could not setup ADC\n");
- return ret;
- }
-
- ret = stmpe_set_bits(stmpe, STMPE_REG_ADC_CTRL2,
- STMPE_ADC_FREQ(0xff), STMPE_ADC_FREQ(ts->adc_freq));
+ ret = stmpe811_adc_common_init(stmpe);
if (ret) {
- dev_err(dev, "Could not setup ADC\n");
+ stmpe_disable(stmpe, STMPE_BLOCK_TOUCHSCREEN | STMPE_BLOCK_ADC);
return ret;
}
@@ -295,13 +267,13 @@ static void stmpe_ts_get_platform_info(struct platform_device *pdev,
if (np) {
if (!of_property_read_u32(np, "st,sample-time", &val))
- ts->sample_time = val;
+ ts->stmpe->sample_time = val;
if (!of_property_read_u32(np, "st,mod-12b", &val))
- ts->mod_12b = val;
+ ts->stmpe->mod_12b = val;
if (!of_property_read_u32(np, "st,ref-sel", &val))
- ts->ref_sel = val;
+ ts->stmpe->ref_sel = val;
if (!of_property_read_u32(np, "st,adc-freq", &val))
- ts->adc_freq = val;
+ ts->stmpe->adc_freq = val;
if (!of_property_read_u32(np, "st,ave-ctrl", &val))
ts->ave_ctrl = val;
if (!of_property_read_u32(np, "st,touch-det-delay", &val))
--
2.19.2
^ permalink raw reply related
* [PATCH v4 6/8] iio: adc: add STMPE ADC devicetree bindings
From: Philippe Schenker @ 2018-12-12 13:06 UTC (permalink / raw)
To: jic23, marcel.ziswiler, stefan
Cc: thierry.reding, Max Krummenacher, Philippe Schenker, devicetree,
linux-iio, Hartmut Knaack, Alexandre Torgue, linux-input,
linux-kernel, Rob Herring, Dmitry Torokhov, Lee Jones,
Maxime Coquelin, Mark Rutland, Peter Meerwald-Stadler,
linux-stm32, linux-arm-kernel, Lars-Peter Clausen
In-Reply-To: <20181212130649.15146-1-dev@pschenker.ch>
From: Stefan Agner <stefan@agner.ch>
This adds the devicetree bindings for the STMPE ADC. And corrects a
typo in st,sample-time it is rather "6 -> 124 clocks" according
to the datasheet and not 144.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---
Changes in v4:
- Put reformatting in a separate precursor patch.
Changes in v3:
- Reformatted documentation for touchscreen to use tabs and have a better
overview of the settings.
- Added note which adc-settings will take precedence.
- changed typo in sample-time setting from 144 clocks to 124 clocks, as stated
in the datasheet.
Changes in v2:
- Moved the bindings for ADC to the overlying mfd.
- Reformatted for better readability
.../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 ++++++++++++
.../bindings/input/touchscreen/stmpe.txt | 32 +++++++++----------
.../devicetree/bindings/mfd/stmpe.txt | 14 ++++++++
3 files changed, 51 insertions(+), 16 deletions(-)
create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt
diff --git a/Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt b/Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt
new file mode 100644
index 000000000000..480e66422625
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt
@@ -0,0 +1,21 @@
+STMPE ADC driver
+----------------
+
+Required properties:
+ - compatible: "st,stmpe-adc"
+
+Optional properties:
+Note that the ADC is shared with the STMPE touchscreen. ADC related settings
+have to be done in the mfd.
+- st,norequest-mask: bitmask specifying which ADC channels should _not_ be
+ requestable due to different usage (e.g. touch)
+
+Node name must be stmpe_adc and should be child node of stmpe node to
+which it belongs.
+
+Example:
+
+ stmpe_adc {
+ compatible = "st,stmpe-adc";
+ st,norequest-mask = <0x0F>; /* dont use ADC CH3-0 */
+ };
diff --git a/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt b/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt
index 1d3f84308142..8e2b240882fa 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/stmpe.txt
@@ -5,18 +5,6 @@ Required properties:
- compatible: "st,stmpe-ts"
Optional properties:
-- st,sample-time : ADC conversion time in number of clock.
- 0 -> 36 clocks 4 -> 80 clocks (recommended)
- 1 -> 44 clocks 5 -> 96 clocks
- 2 -> 56 clocks 6 -> 144 clocks
- 3 -> 64 clocks
-- st,mod-12b : ADC Bit mode
- 0 -> 10bit ADC 1 -> 12bit ADC
-- st,ref-sel : ADC reference source
- 0 -> internal 1 -> external
-- st,adc-freq : ADC Clock speed
- 0 -> 1.625 MHz 2 || 3 -> 6.5 MHz
- 1 -> 3.25 MHz
- st,ave-ctrl : Sample average control
0 -> 1 sample
1 -> 2 samples
@@ -40,17 +28,29 @@ Optional properties:
0 -> 20 mA (typical 35mA max)
1 -> 50 mA (typical 80 mA max)
+Optional properties common with MFD (deprecated):
+ - st,sample-time : ADC conversion time in number of clock.
+ 0 -> 36 clocks 4 -> 80 clocks (recommended)
+ 1 -> 44 clocks 5 -> 96 clocks
+ 2 -> 56 clocks 6 -> 124 clocks
+ 3 -> 64 clocks
+ - st,mod-12b : ADC Bit mode
+ 0 -> 10bit ADC 1 -> 12bit ADC
+ - st,ref-sel : ADC reference source
+ 0 -> internal 1 -> external
+ - st,adc-freq : ADC Clock speed
+ 0 -> 1.625 MHz 2 || 3 -> 6.5 MHz
+ 1 -> 3.25 MHz
+
Node name must be stmpe_touchscreen and should be child node of stmpe node to
which it belongs.
+Note that common ADC settings of stmpe_touchscreen will take precedence.
+
Example:
stmpe_touchscreen {
compatible = "st,stmpe-ts";
- st,sample-time = <4>;
- st,mod-12b = <1>;
- st,ref-sel = <0>;
- st,adc-freq = <1>;
st,ave-ctrl = <1>;
st,touch-det-delay = <2>;
st,settling = <2>;
diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt
index a46e7177195d..d4408a417193 100644
--- a/Documentation/devicetree/bindings/mfd/stmpe.txt
+++ b/Documentation/devicetree/bindings/mfd/stmpe.txt
@@ -14,6 +14,20 @@ Optional properties:
- st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024
- irq-gpio : If present, which GPIO to use for event IRQ
+Optional properties for devices with touch and ADC (STMPE811|STMPE610):
+ - st,sample-time : ADC conversion time in number of clock.
+ 0 -> 36 clocks 4 -> 80 clocks (recommended)
+ 1 -> 44 clocks 5 -> 96 clocks
+ 2 -> 56 clocks 6 -> 124 clocks
+ 3 -> 64 clocks
+ - st,mod-12b : ADC Bit mode
+ 0 -> 10bit ADC 1 -> 12bit ADC
+ - st,ref-sel : ADC reference source
+ 0 -> internal 1 -> external
+ - st,adc-freq : ADC Clock speed
+ 0 -> 1.625 MHz 2 || 3 -> 6.5 MHz
+ 1 -> 3.25 MHz
+
Example:
stmpe1601: stmpe1601@40 {
--
2.19.2
^ permalink raw reply related
* Re: Elantech SMBus support regression
From: Benjamin Tissoires @ 2018-12-12 14:25 UTC (permalink / raw)
To: Kai Heng Feng, Dmitry Torokhov; +Cc: open list:HID CORE LAYER, lkml
In-Reply-To: <6E2F161C-046B-4D5F-B831-B1308A554C40@canonical.com>
Hi,
sorry for the late reply. I was always meaning to fix this the proper
way but couldn't dedicate a full day of work to go to the bottom of
elan_i2c.
Meanwhile, I am thinking at simply having a blacklist of devices that
we know are not working well (P52, L480, L580 and P72).
Could you get the value of /sys/bus/serio/devices/serio1/firmware_id
from all of these laptops?
I know the P52 is LEN2131, but I don't seem to find the other PNPIds.
Cheers,
Benjamin
On Thu, Nov 22, 2018 at 5:22 AM Kai Heng Feng
<kai.heng.feng@canonical.com> wrote:
>
> Hi Benjamin,
>
> It appears the Elantech SMBus support breaks some users’ touchpad.
>
> Please have a look at [1] [2], thanks!
>
> [1] https://bugs.launchpad.net/bugs/1803600
> [2] https://bugs.archlinux.org/task/59714
>
> Kai-Heng
^ permalink raw reply
* [PATCH] Input: elantech - Disable elan-i2c for P52 and P72
From: Benjamin Tissoires @ 2018-12-12 15:42 UTC (permalink / raw)
To: Dmitry Torokhov, kt.liao, Aaron Ma, Kai Heng Feng
Cc: linux-input, linux-kernel, Benjamin Tissoires, stable
The current implementation of elan_i2c is known to not support those
2 laptops.
A proper fix is to tweak both elantech and elan_i2c to transmit the
correct information from PS/2, which would make a bad candidate for
stable.
So to give us some time for fixing the root of the problem, disable
elan_i2c for the devices we know are not behaving properly.
Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1803600
Link: https://bugs.archlinux.org/task/59714
Fixes: df077237cf55 Input: elantech - detect new ICs and setup Host Notify for them
Cc: stable@vger.kernel.org # v4.18+
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
drivers/input/mouse/elantech.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 2d95e8d93cc7..830ae9f07045 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1767,6 +1767,18 @@ static int elantech_smbus = IS_ENABLED(CONFIG_MOUSE_ELAN_I2C_SMBUS) ?
module_param_named(elantech_smbus, elantech_smbus, int, 0644);
MODULE_PARM_DESC(elantech_smbus, "Use a secondary bus for the Elantech device.");
+static const char * const i2c_blacklist_pnp_ids[] = {
+ /*
+ * these are known to not be working properly as bits are missing
+ * in elan_i2c
+ */
+ "LEN2131", /* ThinkPad P52 w/ NFC */
+ "LEN2132", /* ThinkPad P52 */
+ "LEN2133", /* ThinkPad P72 w/ NFC */
+ "LEN2134", /* ThinkPad P72 */
+ NULL
+};
+
static int elantech_create_smbus(struct psmouse *psmouse,
struct elantech_device_info *info,
bool leave_breadcrumbs)
@@ -1802,10 +1814,12 @@ static int elantech_setup_smbus(struct psmouse *psmouse,
if (elantech_smbus == ELANTECH_SMBUS_NOT_SET) {
/*
- * New ICs are enabled by default.
+ * New ICs are enabled by default, unless mentioned in
+ * i2c_blacklist_pnp_ids.
* Old ICs are up to the user to decide.
*/
- if (!ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version))
+ if (!ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version) ||
+ psmouse_matches_pnp_id(psmouse, i2c_blacklist_pnp_ids))
return -ENXIO;
}
--
2.19.2
^ permalink raw reply related
* [PATCH v4] Input: i8042 add i8042_is_mr_coffee() helper to avoid refconut leak
From: Yangtao Li @ 2018-12-12 16:35 UTC (permalink / raw)
To: dmitry.torokhov; +Cc: linux-input, linux-kernel, Yangtao Li
of_find_node_by_path() acquires a reference to the node returned by
it and that reference needs to be dropped by its caller. Add
i8042_is_mr_coffee() helper to avoid refconut leak.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
changes in v4:
-fix typo
changes in v3:
-add i8042_is_mr_coffee
---
drivers/input/serio/i8042-sparcio.h | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index 796289846204..28aa154d9c81 100644
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -106,11 +106,23 @@ static struct platform_driver sparc_i8042_driver = {
.remove = sparc_i8042_remove,
};
+static inline bool i8042_is_mr_coffee(void)
+{
+ struct device_node *root;
+ bool is_mr_coffee;
+
+ root = of_find_node_by_path("/");
+ is_mr_coffree = !strcmp(root->name, "SUNW,JavaStation-1");
+ of_node_put(root);
+
+ return is_mr_coffee;
+}
+
static int __init i8042_platform_init(void)
{
- struct device_node *root = of_find_node_by_path("/");
+ bool match = i8042_is_mr_coffee();
- if (!strcmp(root->name, "SUNW,JavaStation-1")) {
+ if (match) {
/* Hardcoded values for MrCoffee. */
i8042_kbd_irq = i8042_aux_irq = 13 | 0x20;
kbd_iobase = ioremap(0x71300060, 8);
@@ -138,9 +150,9 @@ static int __init i8042_platform_init(void)
static inline void i8042_platform_exit(void)
{
- struct device_node *root = of_find_node_by_path("/");
+ bool match = i8042_is_mr_coffee();
- if (strcmp(root->name, "SUNW,JavaStation-1"))
+ if (!match)
platform_driver_unregister(&sparc_i8042_driver);
}
--
2.17.0
^ permalink raw reply related
* Re: [PATCH v3] Input: i8042 add i8042_is_mr_coffee() helper to avoid refconut leak
From: Frank Lee @ 2018-12-12 16:37 UTC (permalink / raw)
To: lkp; +Cc: kbuild-all, Dmitry Torokhov, linux-input, linux-kernel
In-Reply-To: <201812110132.w5WK8nap%fengguang.wu@intel.com>
The newer has been sent.
Thanks,
Yangtao
^ permalink raw reply
* Re: [PATCH v2] MAINTAINERS: add maintainers for ChromeOS EC sub-drivers
From: Jonathan Cameron @ 2018-12-12 17:06 UTC (permalink / raw)
To: Enric Balletbo i Serra
Cc: linux-kernel, Alessandro Zummo, linux-pwm, linux-iio,
Alexandre Belloni, linux-i2c, groeck, kernel, linux-rtc,
Chanwoo Choi, Benson Leung, Sebastian Reichel, linux-input,
Dmitry Torokhov, Peter Meerwald-Stadler, devicetree,
Thierry Reding, linux-pm, MyungJoo Ham, Lee Jones, Hartmut Knaack,
Rob Herring, Lars-Peter
In-Reply-To: <20181211190953.13626-1-enric.balletbo@collabora.com>
On Tue, 11 Dec 2018 20:09:52 +0100
Enric Balletbo i Serra <enric.balletbo@collabora.com> wrote:
> There are multiple ChromeOS EC sub-drivers spread in different
> subsystems, as all of them are related to the Chrome stuff add
> Benson and myself as a maintainers for all these sub-drivers.
>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> for iio parts.
> ---
>
> Changes in v2:
> - Fix typo in Benson email address.
>
> MAINTAINERS | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a24129b0b043..bbe7180e2851 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3625,6 +3625,30 @@ S: Maintained
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
> F: drivers/platform/chrome/
>
> +CHROMEOS EC SUBDRIVERS
> +M: Benson Leung <bleung@chromium.org>
> +M: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> +S: Maintained
> +F: Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
> +F: Documentation/devicetree/bindings/input/cros-ec-keyb.txt
> +F: Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt
> +F: Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt
> +F: Documentation/devicetree/bindings/mfd/cros-ec.txt
> +F: Documentation/ABI/testing/sysfs-bus-iio-cros-ec
> +F: drivers/extcon/extcon-usbc-cros-ec.c
> +F: drivers/i2c/busses/i2c-cros-ec-tunnel.c
> +F: drivers/iio/accel/cros_ec*
> +F: drivers/iio/common/cros_ec_sensors/
> +F: drivers/iio/light/cros_ec*
> +F: drivers/iio/pressure/cros_ec*
> +F: drivers/input/keyboard/cros_ec*
> +F: drivers/mfd/cros_ec*
> +F: drivers/power/supply/cros_usbpd-charger.c
> +F: drivers/pwm/pwm-cros-ec.c
> +F: drivers/rtc/rtc-cros-ec.c
> +F: include/linux/iio/common/cros_ec_sensors_core.h
> +F: include/linux/mfd/cros_ec*
> +
> CIRRUS LOGIC AUDIO CODEC DRIVERS
> M: Brian Austin <brian.austin@cirrus.com>
> M: Paul Handrigan <Paul.Handrigan@cirrus.com>
^ permalink raw reply
* Re: [PATCH v2] MAINTAINERS: add maintainers for ChromeOS EC sub-drivers
From: Benson Leung @ 2018-12-12 18:21 UTC (permalink / raw)
To: Enric Balletbo i Serra
Cc: linux-kernel, Alessandro Zummo, linux-pwm, linux-iio,
Alexandre Belloni, linux-i2c, groeck, kernel, linux-rtc,
Chanwoo Choi, Benson Leung, Sebastian Reichel, linux-input,
Dmitry Torokhov, Jonathan Cameron, Peter Meerwald-Stadler,
devicetree, Thierry Reding, linux-pm, MyungJoo Ham, Lee Jones,
Hartmut Knaack, Rob
In-Reply-To: <20181211190953.13626-1-enric.balletbo@collabora.com>
[-- Attachment #1: Type: text/plain, Size: 2222 bytes --]
On Tue, Dec 11, 2018 at 08:09:52PM +0100, Enric Balletbo i Serra wrote:
> There are multiple ChromeOS EC sub-drivers spread in different
> subsystems, as all of them are related to the Chrome stuff add
> Benson and myself as a maintainers for all these sub-drivers.
>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Benson Leung <bleung@chromium.org>
Thanks for sending this, Enric.
> ---
>
> Changes in v2:
> - Fix typo in Benson email address.
>
> MAINTAINERS | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a24129b0b043..bbe7180e2851 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3625,6 +3625,30 @@ S: Maintained
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
> F: drivers/platform/chrome/
>
> +CHROMEOS EC SUBDRIVERS
> +M: Benson Leung <bleung@chromium.org>
> +M: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> +S: Maintained
> +F: Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
> +F: Documentation/devicetree/bindings/input/cros-ec-keyb.txt
> +F: Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt
> +F: Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt
> +F: Documentation/devicetree/bindings/mfd/cros-ec.txt
> +F: Documentation/ABI/testing/sysfs-bus-iio-cros-ec
> +F: drivers/extcon/extcon-usbc-cros-ec.c
> +F: drivers/i2c/busses/i2c-cros-ec-tunnel.c
> +F: drivers/iio/accel/cros_ec*
> +F: drivers/iio/common/cros_ec_sensors/
> +F: drivers/iio/light/cros_ec*
> +F: drivers/iio/pressure/cros_ec*
> +F: drivers/input/keyboard/cros_ec*
> +F: drivers/mfd/cros_ec*
> +F: drivers/power/supply/cros_usbpd-charger.c
> +F: drivers/pwm/pwm-cros-ec.c
> +F: drivers/rtc/rtc-cros-ec.c
> +F: include/linux/iio/common/cros_ec_sensors_core.h
> +F: include/linux/mfd/cros_ec*
> +
> CIRRUS LOGIC AUDIO CODEC DRIVERS
> M: Brian Austin <brian.austin@cirrus.com>
> M: Paul Handrigan <Paul.Handrigan@cirrus.com>
> --
> 2.19.2
>
--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
bleung@google.com
Chromium OS Project
bleung@chromium.org
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply
* Re: [PATCH v2] MAINTAINERS: add maintainers for ChromeOS EC sub-drivers
From: Alexandre Belloni @ 2018-12-12 22:29 UTC (permalink / raw)
To: Enric Balletbo i Serra
Cc: linux-kernel, Alessandro Zummo, linux-pwm, linux-iio, linux-i2c,
groeck, kernel, linux-rtc, Chanwoo Choi, Benson Leung,
Sebastian Reichel, linux-input, Dmitry Torokhov, Jonathan Cameron,
Peter Meerwald-Stadler, devicetree, Thierry Reding, linux-pm,
MyungJoo Ham, Lee Jones, Hartmut Knaack, Rob Herring,
Lars-Peter Clausen <lars@
In-Reply-To: <20181211190953.13626-1-enric.balletbo@collabora.com>
On 11/12/2018 20:09:52+0100, Enric Balletbo i Serra wrote:
> There are multiple ChromeOS EC sub-drivers spread in different
> subsystems, as all of them are related to the Chrome stuff add
> Benson and myself as a maintainers for all these sub-drivers.
>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
You definitively don't need my ack to get that applied but anyway:
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
However, you should probably indicate which tree do you expect that to
go through ;)
> ---
>
> Changes in v2:
> - Fix typo in Benson email address.
>
> MAINTAINERS | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a24129b0b043..bbe7180e2851 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3625,6 +3625,30 @@ S: Maintained
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
> F: drivers/platform/chrome/
>
> +CHROMEOS EC SUBDRIVERS
> +M: Benson Leung <bleung@chromium.org>
> +M: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> +S: Maintained
> +F: Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
> +F: Documentation/devicetree/bindings/input/cros-ec-keyb.txt
> +F: Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt
> +F: Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt
> +F: Documentation/devicetree/bindings/mfd/cros-ec.txt
> +F: Documentation/ABI/testing/sysfs-bus-iio-cros-ec
> +F: drivers/extcon/extcon-usbc-cros-ec.c
> +F: drivers/i2c/busses/i2c-cros-ec-tunnel.c
> +F: drivers/iio/accel/cros_ec*
> +F: drivers/iio/common/cros_ec_sensors/
> +F: drivers/iio/light/cros_ec*
> +F: drivers/iio/pressure/cros_ec*
> +F: drivers/input/keyboard/cros_ec*
> +F: drivers/mfd/cros_ec*
> +F: drivers/power/supply/cros_usbpd-charger.c
> +F: drivers/pwm/pwm-cros-ec.c
> +F: drivers/rtc/rtc-cros-ec.c
> +F: include/linux/iio/common/cros_ec_sensors_core.h
> +F: include/linux/mfd/cros_ec*
> +
> CIRRUS LOGIC AUDIO CODEC DRIVERS
> M: Brian Austin <brian.austin@cirrus.com>
> M: Paul Handrigan <Paul.Handrigan@cirrus.com>
> --
> 2.19.2
>
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply
* [PATCH] Documentation: hid: fix wrong data structure reference for UHID_OUTPUT
From: Peter Hutterer @ 2018-12-13 1:28 UTC (permalink / raw)
To: Benjamin Tissoires, Jiri Kosina; +Cc: linux-input, linux-kernel
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
Documentation/hid/uhid.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/hid/uhid.txt b/Documentation/hid/uhid.txt
index c8656dd029a9..958fff945304 100644
--- a/Documentation/hid/uhid.txt
+++ b/Documentation/hid/uhid.txt
@@ -160,7 +160,7 @@ them but you should handle them according to your needs.
UHID_OUTPUT:
This is sent if the HID device driver wants to send raw data to the I/O
device on the interrupt channel. You should read the payload and forward it to
- the device. The payload is of type "struct uhid_data_req".
+ the device. The payload is of type "struct uhid_output_req".
This may be received even though you haven't received UHID_OPEN, yet.
UHID_GET_REPORT:
--
2.19.2
^ permalink raw reply related
* [PATCH AUTOSEL 4.19 02/73] Input: hyper-v - fix wakeup from suspend-to-idle
From: Sasha Levin @ 2018-12-13 4:27 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Sasha Levin, devel, Vitaly Kuznetsov, Dmitry Torokhov,
linux-input
In-Reply-To: <20181213042838.75160-1-sashal@kernel.org>
From: Vitaly Kuznetsov <vkuznets@redhat.com>
[ Upstream commit 10f91c73cc41ceead210a905dbd196398e99c7d2 ]
It makes little sense but still possible to put Hyper-V guests into
suspend-to-idle state. To wake them up two wakeup sources were registered
in the past: hyperv-keyboard and hid-hyperv. However, since
commit eed4d47efe95 ("ACPI / sleep: Ignore spurious SCI wakeups from
suspend-to-idle") pm_wakeup_event() from these devices is ignored. Switch
to pm_wakeup_hard_event() API as these devices are actually the only
possible way to wakeup Hyper-V guests.
Fixes: eed4d47efe95 (ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle)
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: K. Y. Srinivasan <kys@microsoft.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/hid/hid-hyperv.c | 2 +-
drivers/input/serio/hyperv-keyboard.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index b372854cf38d..704049e62d58 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -309,7 +309,7 @@ static void mousevsc_on_receive(struct hv_device *device,
hid_input_report(input_dev->hid_device, HID_INPUT_REPORT,
input_dev->input_buf, len, 1);
- pm_wakeup_event(&input_dev->device->device, 0);
+ pm_wakeup_hard_event(&input_dev->device->device);
break;
default:
diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c
index 47a0e81a2989..a8b9be3e28db 100644
--- a/drivers/input/serio/hyperv-keyboard.c
+++ b/drivers/input/serio/hyperv-keyboard.c
@@ -177,7 +177,7 @@ static void hv_kbd_on_receive(struct hv_device *hv_dev,
* state because the Enter-UP can trigger a wakeup at once.
*/
if (!(info & IS_BREAK))
- pm_wakeup_event(&hv_dev->device, 0);
+ pm_wakeup_hard_event(&hv_dev->device);
break;
--
2.19.1
^ permalink raw reply related
* [PATCH AUTOSEL 4.19 39/73] Input: synaptics - enable SMBus for HP 15-ay000
From: Sasha Levin @ 2018-12-13 4:28 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Teika Kazura, Dmitry Torokhov, Sasha Levin, linux-input
In-Reply-To: <20181213042838.75160-1-sashal@kernel.org>
From: Teika Kazura <teika@gmx.com>
[ Upstream commit 5a6dab15f7a79817cab4af612ddd99eda793fce6 ]
SMBus works fine for the touchpad with id SYN3221, used in the HP 15-ay000
series,
This device has been reported in these messages in the "linux-input"
mailing list:
* https://marc.info/?l=linux-input&m=152016683003369&w=2
* https://www.spinics.net/lists/linux-input/msg52525.html
Reported-by: Nitesh Debnath <niteshkd1999@gmail.com>
Reported-by: Teika Kazura <teika@gmx.com>
Signed-off-by: Teika Kazura <teika@gmx.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/mouse/synaptics.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index c42813d50591..2bd5bb11c8ba 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -178,6 +178,7 @@ static const char * const smbus_pnp_ids[] = {
"LEN0096", /* X280 */
"LEN0097", /* X280 -> ALPS trackpoint */
"LEN200f", /* T450s */
+ "SYN3221", /* HP 15-ay000 */
NULL
};
--
2.19.1
^ permalink raw reply related
* [PATCH AUTOSEL 4.19 40/73] Input: omap-keypad - fix keyboard debounce configuration
From: Sasha Levin @ 2018-12-13 4:28 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Tony Lindgren, Dmitry Torokhov, Sasha Levin, linux-input
In-Reply-To: <20181213042838.75160-1-sashal@kernel.org>
From: Tony Lindgren <tony@atomide.com>
[ Upstream commit 6c3516fed7b61a3527459ccfa67fab130d910610 ]
I noticed that the Android v3.0.8 kernel on droid4 is using different
keypad values from the mainline kernel and does not have issues with
keys occasionally being stuck until pressed again. Turns out there was
an earlier patch posted to fix this as "Input: omap-keypad: errata i689:
Correct debounce time", but it was never reposted to fix use macros
for timing calculations.
This updated version is using macros, and also fixes the use of the
input clock rate to use 32768KiHz instead of 32000KiHz. And we want to
use the known good Android kernel values of 3 and 6 instead of 2 and 6
in the earlier patch.
Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/keyboard/omap4-keypad.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 46406345742b..a7dc286f406c 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -60,8 +60,18 @@
/* OMAP4 values */
#define OMAP4_VAL_IRQDISABLE 0x0
-#define OMAP4_VAL_DEBOUNCINGTIME 0x7
-#define OMAP4_VAL_PVT 0x7
+
+/*
+ * Errata i689: If a key is released for a time shorter than debounce time,
+ * the keyboard will idle and never detect the key release. The workaround
+ * is to use at least a 12ms debounce time. See omap5432 TRM chapter
+ * "26.4.6.2 Keyboard Controller Timer" for more information.
+ */
+#define OMAP4_KEYPAD_PTV_DIV_128 0x6
+#define OMAP4_KEYPAD_DEBOUNCINGTIME_MS(dbms, ptv) \
+ ((((dbms) * 1000) / ((1 << ((ptv) + 1)) * (1000000 / 32768))) - 1)
+#define OMAP4_VAL_DEBOUNCINGTIME_16MS \
+ OMAP4_KEYPAD_DEBOUNCINGTIME_MS(16, OMAP4_KEYPAD_PTV_DIV_128)
enum {
KBD_REVISION_OMAP4 = 0,
@@ -181,9 +191,9 @@ static int omap4_keypad_open(struct input_dev *input)
kbd_writel(keypad_data, OMAP4_KBD_CTRL,
OMAP4_DEF_CTRL_NOSOFTMODE |
- (OMAP4_VAL_PVT << OMAP4_DEF_CTRL_PTV_SHIFT));
+ (OMAP4_KEYPAD_PTV_DIV_128 << OMAP4_DEF_CTRL_PTV_SHIFT));
kbd_writel(keypad_data, OMAP4_KBD_DEBOUNCINGTIME,
- OMAP4_VAL_DEBOUNCINGTIME);
+ OMAP4_VAL_DEBOUNCINGTIME_16MS);
/* clear pending interrupts */
kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS,
kbd_read_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS));
--
2.19.1
^ permalink raw reply related
* [PATCH AUTOSEL 4.14 02/41] Input: hyper-v - fix wakeup from suspend-to-idle
From: Sasha Levin @ 2018-12-13 4:30 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Sasha Levin, devel, Vitaly Kuznetsov, Dmitry Torokhov,
linux-input
In-Reply-To: <20181213043054.75891-1-sashal@kernel.org>
From: Vitaly Kuznetsov <vkuznets@redhat.com>
[ Upstream commit 10f91c73cc41ceead210a905dbd196398e99c7d2 ]
It makes little sense but still possible to put Hyper-V guests into
suspend-to-idle state. To wake them up two wakeup sources were registered
in the past: hyperv-keyboard and hid-hyperv. However, since
commit eed4d47efe95 ("ACPI / sleep: Ignore spurious SCI wakeups from
suspend-to-idle") pm_wakeup_event() from these devices is ignored. Switch
to pm_wakeup_hard_event() API as these devices are actually the only
possible way to wakeup Hyper-V guests.
Fixes: eed4d47efe95 (ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle)
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: K. Y. Srinivasan <kys@microsoft.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/hid/hid-hyperv.c | 2 +-
drivers/input/serio/hyperv-keyboard.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index 6039f071fab1..5f1de24206ab 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -309,7 +309,7 @@ static void mousevsc_on_receive(struct hv_device *device,
hid_input_report(input_dev->hid_device, HID_INPUT_REPORT,
input_dev->input_buf, len, 1);
- pm_wakeup_event(&input_dev->device->device, 0);
+ pm_wakeup_hard_event(&input_dev->device->device);
break;
default:
diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c
index 25151d9214e0..55288a026e4e 100644
--- a/drivers/input/serio/hyperv-keyboard.c
+++ b/drivers/input/serio/hyperv-keyboard.c
@@ -177,7 +177,7 @@ static void hv_kbd_on_receive(struct hv_device *hv_dev,
* state because the Enter-UP can trigger a wakeup at once.
*/
if (!(info & IS_BREAK))
- pm_wakeup_event(&hv_dev->device, 0);
+ pm_wakeup_hard_event(&hv_dev->device);
break;
--
2.19.1
^ permalink raw reply related
* [PATCH AUTOSEL 4.14 20/41] Input: synaptics - enable SMBus for HP 15-ay000
From: Sasha Levin @ 2018-12-13 4:30 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Teika Kazura, Dmitry Torokhov, Sasha Levin, linux-input
In-Reply-To: <20181213043054.75891-1-sashal@kernel.org>
From: Teika Kazura <teika@gmx.com>
[ Upstream commit 5a6dab15f7a79817cab4af612ddd99eda793fce6 ]
SMBus works fine for the touchpad with id SYN3221, used in the HP 15-ay000
series,
This device has been reported in these messages in the "linux-input"
mailing list:
* https://marc.info/?l=linux-input&m=152016683003369&w=2
* https://www.spinics.net/lists/linux-input/msg52525.html
Reported-by: Nitesh Debnath <niteshkd1999@gmail.com>
Reported-by: Teika Kazura <teika@gmx.com>
Signed-off-by: Teika Kazura <teika@gmx.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/mouse/synaptics.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 65c9095eb517..54f0d037b5b6 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -178,6 +178,7 @@ static const char * const smbus_pnp_ids[] = {
"LEN0096", /* X280 */
"LEN0097", /* X280 -> ALPS trackpoint */
"LEN200f", /* T450s */
+ "SYN3221", /* HP 15-ay000 */
NULL
};
--
2.19.1
^ permalink raw reply related
* [PATCH AUTOSEL 4.14 21/41] Input: omap-keypad - fix keyboard debounce configuration
From: Sasha Levin @ 2018-12-13 4:30 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Tony Lindgren, Dmitry Torokhov, Sasha Levin, linux-input
In-Reply-To: <20181213043054.75891-1-sashal@kernel.org>
From: Tony Lindgren <tony@atomide.com>
[ Upstream commit 6c3516fed7b61a3527459ccfa67fab130d910610 ]
I noticed that the Android v3.0.8 kernel on droid4 is using different
keypad values from the mainline kernel and does not have issues with
keys occasionally being stuck until pressed again. Turns out there was
an earlier patch posted to fix this as "Input: omap-keypad: errata i689:
Correct debounce time", but it was never reposted to fix use macros
for timing calculations.
This updated version is using macros, and also fixes the use of the
input clock rate to use 32768KiHz instead of 32000KiHz. And we want to
use the known good Android kernel values of 3 and 6 instead of 2 and 6
in the earlier patch.
Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/keyboard/omap4-keypad.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 940d38b08e6b..ce8e2baf31bb 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -60,8 +60,18 @@
/* OMAP4 values */
#define OMAP4_VAL_IRQDISABLE 0x0
-#define OMAP4_VAL_DEBOUNCINGTIME 0x7
-#define OMAP4_VAL_PVT 0x7
+
+/*
+ * Errata i689: If a key is released for a time shorter than debounce time,
+ * the keyboard will idle and never detect the key release. The workaround
+ * is to use at least a 12ms debounce time. See omap5432 TRM chapter
+ * "26.4.6.2 Keyboard Controller Timer" for more information.
+ */
+#define OMAP4_KEYPAD_PTV_DIV_128 0x6
+#define OMAP4_KEYPAD_DEBOUNCINGTIME_MS(dbms, ptv) \
+ ((((dbms) * 1000) / ((1 << ((ptv) + 1)) * (1000000 / 32768))) - 1)
+#define OMAP4_VAL_DEBOUNCINGTIME_16MS \
+ OMAP4_KEYPAD_DEBOUNCINGTIME_MS(16, OMAP4_KEYPAD_PTV_DIV_128)
enum {
KBD_REVISION_OMAP4 = 0,
@@ -181,9 +191,9 @@ static int omap4_keypad_open(struct input_dev *input)
kbd_writel(keypad_data, OMAP4_KBD_CTRL,
OMAP4_DEF_CTRL_NOSOFTMODE |
- (OMAP4_VAL_PVT << OMAP4_DEF_CTRL_PTV_SHIFT));
+ (OMAP4_KEYPAD_PTV_DIV_128 << OMAP4_DEF_CTRL_PTV_SHIFT));
kbd_writel(keypad_data, OMAP4_KBD_DEBOUNCINGTIME,
- OMAP4_VAL_DEBOUNCINGTIME);
+ OMAP4_VAL_DEBOUNCINGTIME_16MS);
/* clear pending interrupts */
kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS,
kbd_read_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS));
--
2.19.1
^ permalink raw reply related
* [PATCH AUTOSEL 4.9 17/34] Input: omap-keypad - fix keyboard debounce configuration
From: Sasha Levin @ 2018-12-13 4:31 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Tony Lindgren, Dmitry Torokhov, Sasha Levin, linux-input
In-Reply-To: <20181213043200.76295-1-sashal@kernel.org>
From: Tony Lindgren <tony@atomide.com>
[ Upstream commit 6c3516fed7b61a3527459ccfa67fab130d910610 ]
I noticed that the Android v3.0.8 kernel on droid4 is using different
keypad values from the mainline kernel and does not have issues with
keys occasionally being stuck until pressed again. Turns out there was
an earlier patch posted to fix this as "Input: omap-keypad: errata i689:
Correct debounce time", but it was never reposted to fix use macros
for timing calculations.
This updated version is using macros, and also fixes the use of the
input clock rate to use 32768KiHz instead of 32000KiHz. And we want to
use the known good Android kernel values of 3 and 6 instead of 2 and 6
in the earlier patch.
Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/keyboard/omap4-keypad.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 6639b2b8528a..f78c464899db 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -60,8 +60,18 @@
/* OMAP4 values */
#define OMAP4_VAL_IRQDISABLE 0x0
-#define OMAP4_VAL_DEBOUNCINGTIME 0x7
-#define OMAP4_VAL_PVT 0x7
+
+/*
+ * Errata i689: If a key is released for a time shorter than debounce time,
+ * the keyboard will idle and never detect the key release. The workaround
+ * is to use at least a 12ms debounce time. See omap5432 TRM chapter
+ * "26.4.6.2 Keyboard Controller Timer" for more information.
+ */
+#define OMAP4_KEYPAD_PTV_DIV_128 0x6
+#define OMAP4_KEYPAD_DEBOUNCINGTIME_MS(dbms, ptv) \
+ ((((dbms) * 1000) / ((1 << ((ptv) + 1)) * (1000000 / 32768))) - 1)
+#define OMAP4_VAL_DEBOUNCINGTIME_16MS \
+ OMAP4_KEYPAD_DEBOUNCINGTIME_MS(16, OMAP4_KEYPAD_PTV_DIV_128)
enum {
KBD_REVISION_OMAP4 = 0,
@@ -181,9 +191,9 @@ static int omap4_keypad_open(struct input_dev *input)
kbd_writel(keypad_data, OMAP4_KBD_CTRL,
OMAP4_DEF_CTRL_NOSOFTMODE |
- (OMAP4_VAL_PVT << OMAP4_DEF_CTRL_PTV_SHIFT));
+ (OMAP4_KEYPAD_PTV_DIV_128 << OMAP4_DEF_CTRL_PTV_SHIFT));
kbd_writel(keypad_data, OMAP4_KBD_DEBOUNCINGTIME,
- OMAP4_VAL_DEBOUNCINGTIME);
+ OMAP4_VAL_DEBOUNCINGTIME_16MS);
/* clear pending interrupts */
kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS,
kbd_read_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS));
--
2.19.1
^ permalink raw reply related
* [PATCH AUTOSEL 4.4 15/23] Input: omap-keypad - fix keyboard debounce configuration
From: Sasha Levin @ 2018-12-13 4:32 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Tony Lindgren, Dmitry Torokhov, Sasha Levin, linux-input
In-Reply-To: <20181213043259.76643-1-sashal@kernel.org>
From: Tony Lindgren <tony@atomide.com>
[ Upstream commit 6c3516fed7b61a3527459ccfa67fab130d910610 ]
I noticed that the Android v3.0.8 kernel on droid4 is using different
keypad values from the mainline kernel and does not have issues with
keys occasionally being stuck until pressed again. Turns out there was
an earlier patch posted to fix this as "Input: omap-keypad: errata i689:
Correct debounce time", but it was never reposted to fix use macros
for timing calculations.
This updated version is using macros, and also fixes the use of the
input clock rate to use 32768KiHz instead of 32000KiHz. And we want to
use the known good Android kernel values of 3 and 6 instead of 2 and 6
in the earlier patch.
Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/keyboard/omap4-keypad.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 6639b2b8528a..f78c464899db 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -60,8 +60,18 @@
/* OMAP4 values */
#define OMAP4_VAL_IRQDISABLE 0x0
-#define OMAP4_VAL_DEBOUNCINGTIME 0x7
-#define OMAP4_VAL_PVT 0x7
+
+/*
+ * Errata i689: If a key is released for a time shorter than debounce time,
+ * the keyboard will idle and never detect the key release. The workaround
+ * is to use at least a 12ms debounce time. See omap5432 TRM chapter
+ * "26.4.6.2 Keyboard Controller Timer" for more information.
+ */
+#define OMAP4_KEYPAD_PTV_DIV_128 0x6
+#define OMAP4_KEYPAD_DEBOUNCINGTIME_MS(dbms, ptv) \
+ ((((dbms) * 1000) / ((1 << ((ptv) + 1)) * (1000000 / 32768))) - 1)
+#define OMAP4_VAL_DEBOUNCINGTIME_16MS \
+ OMAP4_KEYPAD_DEBOUNCINGTIME_MS(16, OMAP4_KEYPAD_PTV_DIV_128)
enum {
KBD_REVISION_OMAP4 = 0,
@@ -181,9 +191,9 @@ static int omap4_keypad_open(struct input_dev *input)
kbd_writel(keypad_data, OMAP4_KBD_CTRL,
OMAP4_DEF_CTRL_NOSOFTMODE |
- (OMAP4_VAL_PVT << OMAP4_DEF_CTRL_PTV_SHIFT));
+ (OMAP4_KEYPAD_PTV_DIV_128 << OMAP4_DEF_CTRL_PTV_SHIFT));
kbd_writel(keypad_data, OMAP4_KBD_DEBOUNCINGTIME,
- OMAP4_VAL_DEBOUNCINGTIME);
+ OMAP4_VAL_DEBOUNCINGTIME_16MS);
/* clear pending interrupts */
kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS,
kbd_read_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS));
--
2.19.1
^ permalink raw reply related
* [PATCH AUTOSEL 3.18 11/16] Input: omap-keypad - fix keyboard debounce configuration
From: Sasha Levin @ 2018-12-13 4:33 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Tony Lindgren, Dmitry Torokhov, Sasha Levin, linux-input
In-Reply-To: <20181213043343.76896-1-sashal@kernel.org>
From: Tony Lindgren <tony@atomide.com>
[ Upstream commit 6c3516fed7b61a3527459ccfa67fab130d910610 ]
I noticed that the Android v3.0.8 kernel on droid4 is using different
keypad values from the mainline kernel and does not have issues with
keys occasionally being stuck until pressed again. Turns out there was
an earlier patch posted to fix this as "Input: omap-keypad: errata i689:
Correct debounce time", but it was never reposted to fix use macros
for timing calculations.
This updated version is using macros, and also fixes the use of the
input clock rate to use 32768KiHz instead of 32000KiHz. And we want to
use the known good Android kernel values of 3 and 6 instead of 2 and 6
in the earlier patch.
Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/keyboard/omap4-keypad.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 3ab045369c0c..1739221aa5fa 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -60,8 +60,18 @@
/* OMAP4 values */
#define OMAP4_VAL_IRQDISABLE 0x0
-#define OMAP4_VAL_DEBOUNCINGTIME 0x7
-#define OMAP4_VAL_PVT 0x7
+
+/*
+ * Errata i689: If a key is released for a time shorter than debounce time,
+ * the keyboard will idle and never detect the key release. The workaround
+ * is to use at least a 12ms debounce time. See omap5432 TRM chapter
+ * "26.4.6.2 Keyboard Controller Timer" for more information.
+ */
+#define OMAP4_KEYPAD_PTV_DIV_128 0x6
+#define OMAP4_KEYPAD_DEBOUNCINGTIME_MS(dbms, ptv) \
+ ((((dbms) * 1000) / ((1 << ((ptv) + 1)) * (1000000 / 32768))) - 1)
+#define OMAP4_VAL_DEBOUNCINGTIME_16MS \
+ OMAP4_KEYPAD_DEBOUNCINGTIME_MS(16, OMAP4_KEYPAD_PTV_DIV_128)
enum {
KBD_REVISION_OMAP4 = 0,
@@ -181,9 +191,9 @@ static int omap4_keypad_open(struct input_dev *input)
kbd_writel(keypad_data, OMAP4_KBD_CTRL,
OMAP4_DEF_CTRL_NOSOFTMODE |
- (OMAP4_VAL_PVT << OMAP4_DEF_CTRL_PTV_SHIFT));
+ (OMAP4_KEYPAD_PTV_DIV_128 << OMAP4_DEF_CTRL_PTV_SHIFT));
kbd_writel(keypad_data, OMAP4_KBD_DEBOUNCINGTIME,
- OMAP4_VAL_DEBOUNCINGTIME);
+ OMAP4_VAL_DEBOUNCINGTIME_16MS);
/* clear pending interrupts */
kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS,
kbd_read_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS));
--
2.19.1
^ permalink raw reply related
* Re: [PATCH v2] MAINTAINERS: add maintainers for ChromeOS EC sub-drivers
From: Lee Jones @ 2018-12-13 9:22 UTC (permalink / raw)
To: Enric Balletbo i Serra
Cc: linux-kernel, Alessandro Zummo, linux-pwm, linux-iio,
Alexandre Belloni, linux-i2c, groeck, kernel, linux-rtc,
Chanwoo Choi, Benson Leung, Sebastian Reichel, linux-input,
Dmitry Torokhov, Jonathan Cameron, Peter Meerwald-Stadler,
devicetree, Thierry Reding, linux-pm, MyungJoo Ham,
Hartmut Knaack, Rob Herring, Lars-Pet
In-Reply-To: <20181211190953.13626-1-enric.balletbo@collabora.com>
On Tue, 11 Dec 2018, Enric Balletbo i Serra wrote:
> There are multiple ChromeOS EC sub-drivers spread in different
> subsystems, as all of them are related to the Chrome stuff add
> Benson and myself as a maintainers for all these sub-drivers.
>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
>
> Changes in v2:
> - Fix typo in Benson email address.
>
> MAINTAINERS | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a24129b0b043..bbe7180e2851 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3625,6 +3625,30 @@ S: Maintained
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
> F: drivers/platform/chrome/
>
> +CHROMEOS EC SUBDRIVERS
> +M: Benson Leung <bleung@chromium.org>
> +M: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> +S: Maintained
> +F: Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
> +F: Documentation/devicetree/bindings/input/cros-ec-keyb.txt
> +F: Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt
> +F: Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt
> +F: Documentation/ABI/testing/sysfs-bus-iio-cros-ec
> +F: drivers/extcon/extcon-usbc-cros-ec.c
> +F: drivers/i2c/busses/i2c-cros-ec-tunnel.c
> +F: drivers/iio/accel/cros_ec*
> +F: drivers/iio/common/cros_ec_sensors/
> +F: drivers/iio/light/cros_ec*
> +F: drivers/iio/pressure/cros_ec*
> +F: drivers/input/keyboard/cros_ec*
> +F: drivers/power/supply/cros_usbpd-charger.c
> +F: drivers/pwm/pwm-cros-ec.c
> +F: drivers/rtc/rtc-cros-ec.c
> +F: include/linux/iio/common/cros_ec_sensors_core.h
> +F: Documentation/devicetree/bindings/mfd/cros-ec.txt
> +F: drivers/mfd/cros_ec*
> +F: include/linux/mfd/cros_ec*
Acked-by: Lee Jones <lee.jones@linaro.org>
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply
* Re: [PATCH v2] MAINTAINERS: add maintainers for ChromeOS EC sub-drivers
From: Enric Balletbo i Serra @ 2018-12-13 9:30 UTC (permalink / raw)
To: Alexandre Belloni
Cc: linux-kernel, Alessandro Zummo, linux-pwm, linux-iio, linux-i2c,
groeck, kernel, linux-rtc, Chanwoo Choi, Benson Leung,
Sebastian Reichel, linux-input, Dmitry Torokhov, Jonathan Cameron,
Peter Meerwald-Stadler, devicetree, Thierry Reding, linux-pm,
MyungJoo Ham, Lee Jones, Hartmut Knaack, Rob Herring,
Lars-Peter Clausen <lars@
In-Reply-To: <20181212222937.GL19816@piout.net>
Hi Alexandre,
On 12/12/18 23:29, Alexandre Belloni wrote:
> On 11/12/2018 20:09:52+0100, Enric Balletbo i Serra wrote:
>> There are multiple ChromeOS EC sub-drivers spread in different
>> subsystems, as all of them are related to the Chrome stuff add
>> Benson and myself as a maintainers for all these sub-drivers.
>>
>> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
>
> You definitively don't need my ack to get that applied but anyway:
> > Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
>
Thanks for the ack.
> However, you should probably indicate which tree do you expect that to
> go through ;)
>
Well, these are sub-drivers for different subsystems but are related to the main
ChromeOS EC. I expect all go through their specific subsystem and their
maintainer. I.e the rtc driver go through your tree, the mfd go through Lee's
tree, iio drivers through Jonathan's tree, etc. This is the reason I did not add
the tree. Main purpose here as that Benson and I are aware when someone sends a
change on one of the sub-drivers and we can review these patches.
Thanks,
Enric
>> ---
>>
>> Changes in v2:
>> - Fix typo in Benson email address.
>>
>> MAINTAINERS | 24 ++++++++++++++++++++++++
>> 1 file changed, 24 insertions(+)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index a24129b0b043..bbe7180e2851 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -3625,6 +3625,30 @@ S: Maintained
>> T: git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
>> F: drivers/platform/chrome/
>>
>> +CHROMEOS EC SUBDRIVERS
>> +M: Benson Leung <bleung@chromium.org>
>> +M: Enric Balletbo i Serra <enric.balletbo@collabora.com>
>> +S: Maintained
>> +F: Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
>> +F: Documentation/devicetree/bindings/input/cros-ec-keyb.txt
>> +F: Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt
>> +F: Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt
>> +F: Documentation/devicetree/bindings/mfd/cros-ec.txt
>> +F: Documentation/ABI/testing/sysfs-bus-iio-cros-ec
>> +F: drivers/extcon/extcon-usbc-cros-ec.c
>> +F: drivers/i2c/busses/i2c-cros-ec-tunnel.c
>> +F: drivers/iio/accel/cros_ec*
>> +F: drivers/iio/common/cros_ec_sensors/
>> +F: drivers/iio/light/cros_ec*
>> +F: drivers/iio/pressure/cros_ec*
>> +F: drivers/input/keyboard/cros_ec*
>> +F: drivers/mfd/cros_ec*
>> +F: drivers/power/supply/cros_usbpd-charger.c
>> +F: drivers/pwm/pwm-cros-ec.c
>> +F: drivers/rtc/rtc-cros-ec.c
>> +F: include/linux/iio/common/cros_ec_sensors_core.h
>> +F: include/linux/mfd/cros_ec*
>> +
>> CIRRUS LOGIC AUDIO CODEC DRIVERS
>> M: Brian Austin <brian.austin@cirrus.com>
>> M: Paul Handrigan <Paul.Handrigan@cirrus.com>
>> --
>> 2.19.2
>>
>
^ permalink raw reply
* Re: [PATCH v2] MAINTAINERS: add maintainers for ChromeOS EC sub-drivers
From: Alexandre Belloni @ 2018-12-13 9:50 UTC (permalink / raw)
To: Enric Balletbo i Serra
Cc: linux-kernel, Alessandro Zummo, linux-pwm, linux-iio, linux-i2c,
groeck, kernel, linux-rtc, Chanwoo Choi, Benson Leung,
Sebastian Reichel, linux-input, Dmitry Torokhov, Jonathan Cameron,
Peter Meerwald-Stadler, devicetree, Thierry Reding, linux-pm,
MyungJoo Ham, Lee Jones, Hartmut Knaack, Rob Herring,
Lars-Peter Clausen <lars@
In-Reply-To: <6f688bfe-2ebe-1934-0375-016ae859dcfb@collabora.com>
On 13/12/2018 10:30:16+0100, Enric Balletbo i Serra wrote:
> > However, you should probably indicate which tree do you expect that to
> > go through ;)
> >
>
> Well, these are sub-drivers for different subsystems but are related to the main
> ChromeOS EC. I expect all go through their specific subsystem and their
> maintainer. I.e the rtc driver go through your tree, the mfd go through Lee's
> tree, iio drivers through Jonathan's tree, etc. This is the reason I did not add
> the tree. Main purpose here as that Benson and I are aware when someone sends a
> change on one of the sub-drivers and we can review these patches.
>
Sure, sorry I was not clear but I was asking about this particular
patch because as it is, you will get acks from all the maintainers but I
think they all think someone else will apply it ;)
> Thanks,
> Enric
>
> >> ---
> >>
> >> Changes in v2:
> >> - Fix typo in Benson email address.
> >>
> >> MAINTAINERS | 24 ++++++++++++++++++++++++
> >> 1 file changed, 24 insertions(+)
> >>
> >> diff --git a/MAINTAINERS b/MAINTAINERS
> >> index a24129b0b043..bbe7180e2851 100644
> >> --- a/MAINTAINERS
> >> +++ b/MAINTAINERS
> >> @@ -3625,6 +3625,30 @@ S: Maintained
> >> T: git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
> >> F: drivers/platform/chrome/
> >>
> >> +CHROMEOS EC SUBDRIVERS
> >> +M: Benson Leung <bleung@chromium.org>
> >> +M: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> >> +S: Maintained
> >> +F: Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
> >> +F: Documentation/devicetree/bindings/input/cros-ec-keyb.txt
> >> +F: Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt
> >> +F: Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt
> >> +F: Documentation/devicetree/bindings/mfd/cros-ec.txt
> >> +F: Documentation/ABI/testing/sysfs-bus-iio-cros-ec
> >> +F: drivers/extcon/extcon-usbc-cros-ec.c
> >> +F: drivers/i2c/busses/i2c-cros-ec-tunnel.c
> >> +F: drivers/iio/accel/cros_ec*
> >> +F: drivers/iio/common/cros_ec_sensors/
> >> +F: drivers/iio/light/cros_ec*
> >> +F: drivers/iio/pressure/cros_ec*
> >> +F: drivers/input/keyboard/cros_ec*
> >> +F: drivers/mfd/cros_ec*
> >> +F: drivers/power/supply/cros_usbpd-charger.c
> >> +F: drivers/pwm/pwm-cros-ec.c
> >> +F: drivers/rtc/rtc-cros-ec.c
> >> +F: include/linux/iio/common/cros_ec_sensors_core.h
> >> +F: include/linux/mfd/cros_ec*
> >> +
> >> CIRRUS LOGIC AUDIO CODEC DRIVERS
> >> M: Brian Austin <brian.austin@cirrus.com>
> >> M: Paul Handrigan <Paul.Handrigan@cirrus.com>
> >> --
> >> 2.19.2
> >>
> >
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox