78d28f8083
1, format all patches from https://github.com/megous/linux `git format-patch 79bf89b88a87f2ebf147f76d8c40183283b49b51...2a7cb228d29c3882c1414c10a44c5f3f59bfa44d` and copy them to sunxi-next with prefix `0000-` 2, remove unnecessary patches, due to they are revert of upstream patches:4d867e2bd64e674a3000b8e05fe47e8bb8175edda2888276ee3, remove fail to apply and no use:960ddd63a84, remove WireGuard patch:1cd13b836c5, remove meaningless patch:f26e36379a6, remove merged or included by megous/linux patches: 0112-mfd-axp20x-Add-supported-cells-for-AXP803.patch board-bpi-m3-make-ethernet-working.patch board-pine-h6-pine-h6-0025-phy-sun4i-usb-add-support-for-missing-USB-PHY-index.patch 7, remove stable release update patches. ignored. 8, rebase sunxi-next/sunxi64-next to upstream linux-4.19.y test result: all patches applied, no error. orangepipc/orangpioneplus build OK. Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
128 lines
4.0 KiB
Diff
128 lines
4.0 KiB
Diff
From 997e53ee52efc4a0602bf298125a7c9758abf15c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= <mylene.josserand@bootlin.com>
|
|
Date: Wed, 25 Jul 2018 09:34:08 +0200
|
|
Subject: [PATCH 17/82] Input: edt-ft5x06 - Add support for regulator
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Add the support of regulator to use it as VCC source.
|
|
|
|
Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com>
|
|
Reviewed-by: Rob Herring <robh@kernel.org>
|
|
---
|
|
.../bindings/input/touchscreen/edt-ft5x06.txt | 1 +
|
|
drivers/input/touchscreen/edt-ft5x06.c | 43 +++++++++++++++++++
|
|
2 files changed, 44 insertions(+)
|
|
|
|
diff --git a/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt b/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt
|
|
index da2dc5d6c98b..987faeb2fe4a 100644
|
|
--- a/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt
|
|
+++ b/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt
|
|
@@ -28,6 +28,7 @@ Required properties:
|
|
Optional properties:
|
|
- reset-gpios: GPIO specification for the RESET input
|
|
- wake-gpios: GPIO specification for the WAKE input
|
|
+ - vcc-supply: Regulator that supplies the touchscreen
|
|
|
|
- pinctrl-names: should be "default"
|
|
- pinctrl-0: a phandle pointing to the pin settings for the
|
|
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
|
|
index 1e18ca0d1b4e..dcde719094f7 100644
|
|
--- a/drivers/input/touchscreen/edt-ft5x06.c
|
|
+++ b/drivers/input/touchscreen/edt-ft5x06.c
|
|
@@ -39,6 +39,7 @@
|
|
#include <linux/input/mt.h>
|
|
#include <linux/input/touchscreen.h>
|
|
#include <linux/of_device.h>
|
|
+#include <linux/regulator/consumer.h>
|
|
|
|
#define WORK_REGISTER_THRESHOLD 0x00
|
|
#define WORK_REGISTER_REPORT_RATE 0x08
|
|
@@ -91,6 +92,7 @@ struct edt_ft5x06_ts_data {
|
|
struct touchscreen_properties prop;
|
|
u16 num_x;
|
|
u16 num_y;
|
|
+ struct regulator *vcc;
|
|
|
|
struct gpio_desc *reset_gpio;
|
|
struct gpio_desc *wake_gpio;
|
|
@@ -963,6 +965,13 @@ edt_ft5x06_ts_set_regs(struct edt_ft5x06_ts_data *tsdata)
|
|
}
|
|
}
|
|
|
|
+static void edt_ft5x06_disable_regulator(void *arg)
|
|
+{
|
|
+ struct edt_ft5x06_ts_data *data = arg;
|
|
+
|
|
+ regulator_disable(data->vcc);
|
|
+}
|
|
+
|
|
static int edt_ft5x06_ts_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
@@ -991,6 +1000,28 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
|
|
|
|
tsdata->max_support_points = chip_data->max_support_points;
|
|
|
|
+ tsdata->vcc = devm_regulator_get(&client->dev, "vcc");
|
|
+ if (IS_ERR(tsdata->vcc)) {
|
|
+ error = PTR_ERR(tsdata->vcc);
|
|
+ if (error != -EPROBE_DEFER)
|
|
+ dev_err(&client->dev, "failed to request regulator: %d\n",
|
|
+ error);
|
|
+ return error;
|
|
+ }
|
|
+
|
|
+ error = regulator_enable(tsdata->vcc);
|
|
+ if (error < 0) {
|
|
+ dev_err(&client->dev, "failed to enable vcc: %d\n",
|
|
+ error);
|
|
+ return error;
|
|
+ }
|
|
+
|
|
+ error = devm_add_action_or_reset(&client->dev,
|
|
+ edt_ft5x06_disable_regulator,
|
|
+ tsdata);
|
|
+ if (error)
|
|
+ return error;
|
|
+
|
|
tsdata->reset_gpio = devm_gpiod_get_optional(&client->dev,
|
|
"reset", GPIOD_OUT_HIGH);
|
|
if (IS_ERR(tsdata->reset_gpio)) {
|
|
@@ -1120,9 +1151,12 @@ static int edt_ft5x06_ts_remove(struct i2c_client *client)
|
|
static int __maybe_unused edt_ft5x06_ts_suspend(struct device *dev)
|
|
{
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
+ struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);
|
|
|
|
if (device_may_wakeup(dev))
|
|
enable_irq_wake(client->irq);
|
|
+ else
|
|
+ regulator_disable(tsdata->vcc);
|
|
|
|
return 0;
|
|
}
|
|
@@ -1130,9 +1164,18 @@ static int __maybe_unused edt_ft5x06_ts_suspend(struct device *dev)
|
|
static int __maybe_unused edt_ft5x06_ts_resume(struct device *dev)
|
|
{
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
+ struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);
|
|
+ int ret;
|
|
|
|
if (device_may_wakeup(dev))
|
|
disable_irq_wake(client->irq);
|
|
+ else {
|
|
+ ret = regulator_enable(tsdata->vcc);
|
|
+ if (ret < 0) {
|
|
+ dev_err(dev, "failed to enable vcc: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+ }
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
2.20.1
|
|
|