* [PATCH 0/3] Input: add dt support to zforce driver
@ 2014-01-09 21:19 Heiko Stübner
2014-01-09 21:21 ` [PATCH 1/3] dt-bindings: bindings for zforce touchscreens Heiko Stübner
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: Heiko Stübner @ 2014-01-09 21:19 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: Henrik Rydberg, linux-input
This adds the binding documentation and necessary parsing code to make
zforce based touchscreen usable on devicetree platforms.
Heiko Stuebner (3):
dt-bindings: bindings for zforce touchscreens
Input: zforce: Use internal pdata pointer instead of dev_get_platdata
Input: zforce: add devicetree support
.../bindings/input/touchscreen/zforce_ts.txt | 30 ++++++++++
.../devicetree/bindings/vendor-prefixes.txt | 1 +
drivers/input/touchscreen/zforce_ts.c | 63 ++++++++++++++++++--
3 files changed, 89 insertions(+), 5 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
--
1.7.10.4
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] dt-bindings: bindings for zforce touchscreens
2014-01-09 21:19 [PATCH 0/3] Input: add dt support to zforce driver Heiko Stübner
@ 2014-01-09 21:21 ` Heiko Stübner
2014-01-09 21:21 ` [PATCH 2/3] Input: zforce: Use internal pdata pointer instead of dev_get_platdata Heiko Stübner
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Heiko Stübner @ 2014-01-09 21:21 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Henrik Rydberg, linux-input, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, devicetree
Binding documentation for Neonode zForce infrared touchscreens.
Signed-off-by: Heiko Stuebner <heiko.stuebner@bqreaders.com>
---
.../bindings/input/touchscreen/zforce_ts.txt | 30 ++++++++++++++++++++
.../devicetree/bindings/vendor-prefixes.txt | 1 +
2 files changed, 31 insertions(+)
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
diff --git a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
new file mode 100644
index 0000000..2f25cd2
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
@@ -0,0 +1,30 @@
+* Neonode infrared touchscreen controller
+
+Required properties:
+- compatible: must be "neonode,zforce"
+- reg: I2C address of the chip
+- interrupts: interrupt to which the chip is connected
+- gpios: gpios the chip is connected to
+ first one is the interrupt gpio and second one the reset gpio
+- x-size: horizontal resolution of touchscreen
+- y-size: vertical resolution of touchscreen
+
+Example:
+
+ i2c@00000000 {
+ /* ... */
+
+ zforce_ts@50 {
+ compatible = "neonode,zforce";
+ reg = <0x50>;
+ interrupts = <2 0>;
+
+ gpios = <&gpio5 6 0>, /* INT */
+ <&gpio5 9 0>; /* RST */
+
+ x-size = <800>;
+ y-size = <600>;
+ };
+
+ /* ... */
+ };
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index b458760..e0b15b4 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -53,6 +53,7 @@ maxim Maxim Integrated Products
microchip Microchip Technology Inc.
mosaixtech Mosaix Technologies, Inc.
national National Semiconductor
+neonode Neonode Inc.
nintendo Nintendo
nvidia NVIDIA
nxp NXP Semiconductors
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] Input: zforce: Use internal pdata pointer instead of dev_get_platdata
2014-01-09 21:19 [PATCH 0/3] Input: add dt support to zforce driver Heiko Stübner
2014-01-09 21:21 ` [PATCH 1/3] dt-bindings: bindings for zforce touchscreens Heiko Stübner
@ 2014-01-09 21:21 ` Heiko Stübner
2014-01-09 21:22 ` [PATCH 3/3] Input: zforce: add devicetree support Heiko Stübner
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Heiko Stübner @ 2014-01-09 21:21 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: Henrik Rydberg, linux-input
When the device is initialized from devicetree the platformdata is created
locally making dev_get_platdata return NULL.
Therefore directly use the internal pointer to the pdata instead.
Signed-off-by: Heiko Stuebner <heiko.stuebner@bqreaders.com>
---
drivers/input/touchscreen/zforce_ts.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index 2175f34..5a1a93b 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -255,7 +255,7 @@ static int zforce_setconfig(struct zforce_ts *ts, char b1)
static int zforce_start(struct zforce_ts *ts)
{
struct i2c_client *client = ts->client;
- const struct zforce_ts_platdata *pdata = dev_get_platdata(&client->dev);
+ const struct zforce_ts_platdata *pdata = ts->pdata;
int ret;
dev_dbg(&client->dev, "starting device\n");
@@ -326,7 +326,7 @@ static int zforce_stop(struct zforce_ts *ts)
static int zforce_touch_event(struct zforce_ts *ts, u8 *payload)
{
struct i2c_client *client = ts->client;
- const struct zforce_ts_platdata *pdata = dev_get_platdata(&client->dev);
+ const struct zforce_ts_platdata *pdata = ts->pdata;
struct zforce_point point;
int count, i, num = 0;
@@ -471,7 +471,7 @@ static irqreturn_t zforce_irq_thread(int irq, void *dev_id)
{
struct zforce_ts *ts = dev_id;
struct i2c_client *client = ts->client;
- const struct zforce_ts_platdata *pdata = dev_get_platdata(&client->dev);
+ const struct zforce_ts_platdata *pdata = ts->pdata;
int ret;
u8 payload_buffer[512];
u8 *payload;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] Input: zforce: add devicetree support
2014-01-09 21:19 [PATCH 0/3] Input: add dt support to zforce driver Heiko Stübner
2014-01-09 21:21 ` [PATCH 1/3] dt-bindings: bindings for zforce touchscreens Heiko Stübner
2014-01-09 21:21 ` [PATCH 2/3] Input: zforce: Use internal pdata pointer instead of dev_get_platdata Heiko Stübner
@ 2014-01-09 21:22 ` Heiko Stübner
2014-01-28 6:45 ` [PATCH 0/3] Input: add dt support to zforce driver Dmitry Torokhov
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Heiko Stübner @ 2014-01-09 21:22 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: Henrik Rydberg, linux-input
This makes the zforce driver usable on devicetree-based platforms too.
Signed-off-by: Heiko Stuebner <heiko.stuebner@bqreaders.com>
---
drivers/input/touchscreen/zforce_ts.c | 57 +++++++++++++++++++++++++++++++--
1 file changed, 55 insertions(+), 2 deletions(-)
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index 5a1a93b..a33e173 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -29,6 +29,8 @@
#include <linux/sysfs.h>
#include <linux/input/mt.h>
#include <linux/platform_data/zforce_ts.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
#define WAIT_TIMEOUT msecs_to_jiffies(1000)
@@ -684,6 +686,45 @@ static void zforce_reset(void *data)
gpio_set_value(ts->pdata->gpio_rst, 0);
}
+static struct zforce_ts_platdata *zforce_parse_dt(struct device *dev)
+{
+ struct zforce_ts_platdata *pdata;
+ struct device_node *np = dev->of_node;
+
+ if (!np)
+ return ERR_PTR(-ENOENT);
+
+ pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata) {
+ dev_err(dev, "failed to allocate platform data\n");
+ return ERR_PTR(-ENOMEM);
+ }
+
+ pdata->gpio_int = of_get_gpio(np, 0);
+ if (!gpio_is_valid(pdata->gpio_int)) {
+ dev_err(dev, "failed to get interrupt gpio\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ pdata->gpio_rst = of_get_gpio(np, 1);
+ if (!gpio_is_valid(pdata->gpio_rst)) {
+ dev_err(dev, "failed to get reset gpio\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ if (of_property_read_u32(np, "x-size", &pdata->x_max)) {
+ dev_err(dev, "failed to get x-size property\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ if (of_property_read_u32(np, "y-size", &pdata->y_max)) {
+ dev_err(dev, "failed to get y-size property\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ return pdata;
+}
+
static int zforce_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -692,8 +733,11 @@ static int zforce_probe(struct i2c_client *client,
struct input_dev *input_dev;
int ret;
- if (!pdata)
- return -EINVAL;
+ if (!pdata) {
+ pdata = zforce_parse_dt(&client->dev);
+ if (IS_ERR(pdata))
+ return PTR_ERR(pdata);
+ }
ts = devm_kzalloc(&client->dev, sizeof(struct zforce_ts), GFP_KERNEL);
if (!ts)
@@ -829,11 +873,20 @@ static struct i2c_device_id zforce_idtable[] = {
};
MODULE_DEVICE_TABLE(i2c, zforce_idtable);
+#ifdef CONFIG_OF
+static struct of_device_id zforce_dt_idtable[] = {
+ { .compatible = "neonode,zforce" },
+ {},
+};
+MODULE_DEVICE_TABLE(of, zforce_dt_idtable);
+#endif
+
static struct i2c_driver zforce_driver = {
.driver = {
.owner = THIS_MODULE,
.name = "zforce-ts",
.pm = &zforce_pm_ops,
+ .of_match_table = of_match_ptr(zforce_dt_idtable),
},
.probe = zforce_probe,
.id_table = zforce_idtable,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] Input: add dt support to zforce driver
2014-01-09 21:19 [PATCH 0/3] Input: add dt support to zforce driver Heiko Stübner
` (2 preceding siblings ...)
2014-01-09 21:22 ` [PATCH 3/3] Input: zforce: add devicetree support Heiko Stübner
@ 2014-01-28 6:45 ` Dmitry Torokhov
2014-04-22 19:19 ` [PATCH] input: zforce: add regulator handling Heiko Stübner
2014-07-21 15:20 ` [PATCH RESEND] " Heiko Stübner
5 siblings, 0 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2014-01-28 6:45 UTC (permalink / raw)
To: Heiko Stübner; +Cc: Henrik Rydberg, linux-input
Hi Heiko,
On Thu, Jan 09, 2014 at 10:19:15PM +0100, Heiko Stübner wrote:
> This adds the binding documentation and necessary parsing code to make
> zforce based touchscreen usable on devicetree platforms.
>
> Heiko Stuebner (3):
> dt-bindings: bindings for zforce touchscreens
> Input: zforce: Use internal pdata pointer instead of dev_get_platdata
> Input: zforce: add devicetree support
>
> .../bindings/input/touchscreen/zforce_ts.txt | 30 ++++++++++
> .../devicetree/bindings/vendor-prefixes.txt | 1 +
> drivers/input/touchscreen/zforce_ts.c | 63 ++++++++++++++++++--
> 3 files changed, 89 insertions(+), 5 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
>
I applied the 2nd one and then folded parts of 1st into the 3rd, leaving
changes to devicetree/bindings/vendor-prefixes.txt out. Please resubmit
them to DT maintainers.
Thanks.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] input: zforce: add regulator handling
2014-01-09 21:19 [PATCH 0/3] Input: add dt support to zforce driver Heiko Stübner
` (3 preceding siblings ...)
2014-01-28 6:45 ` [PATCH 0/3] Input: add dt support to zforce driver Dmitry Torokhov
@ 2014-04-22 19:19 ` Heiko Stübner
2014-05-23 7:51 ` Heiko Stübner
2014-07-21 15:20 ` [PATCH RESEND] " Heiko Stübner
5 siblings, 1 reply; 9+ messages in thread
From: Heiko Stübner @ 2014-04-22 19:19 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Henrik Rydberg, linux-input, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, devicetree
From: Heiko Stuebner <heiko.stuebner@bq.com>
It's possible that the controller has an individually switchable power supply.
Therefore add support to control a supplying regulator.
As this is not always the case, the regulator is requested as optional.
Signed-off-by: Heiko Stuebner <heiko.stuebner@bq.com>
---
.../bindings/input/touchscreen/zforce_ts.txt | 4 +++
drivers/input/touchscreen/zforce_ts.c | 30 ++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
index 2faf1f1..80c37df 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
@@ -9,6 +9,9 @@ Required properties:
- x-size: horizontal resolution of touchscreen
- y-size: vertical resolution of touchscreen
+Optional properties:
+- vdd-supply: Regulator controlling the controller supply
+
Example:
i2c@00000000 {
@@ -18,6 +21,7 @@ Example:
compatible = "neonode,zforce";
reg = <0x50>;
interrupts = <2 0>;
+ vdd-supply = <®_zforce_vdd>;
gpios = <&gpio5 6 0>, /* INT */
<&gpio5 9 0>; /* RST */
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index 01d30ce..39ca962 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -29,6 +29,8 @@
#include <linux/sysfs.h>
#include <linux/input/mt.h>
#include <linux/platform_data/zforce_ts.h>
+#include <linux/regulator/consumer.h>
+#include <linux/delay.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
@@ -117,6 +119,8 @@ struct zforce_ts {
const struct zforce_ts_platdata *pdata;
char phys[32];
+ struct regulator *reg_vdd;
+
bool suspending;
bool suspended;
bool boot_complete;
@@ -690,6 +694,11 @@ static void zforce_reset(void *data)
struct zforce_ts *ts = data;
gpio_set_value(ts->pdata->gpio_rst, 0);
+
+ udelay(10);
+
+ if (!IS_ERR(ts->reg_vdd))
+ regulator_disable(ts->reg_vdd);
}
static struct zforce_ts_platdata *zforce_parse_dt(struct device *dev)
@@ -765,10 +774,31 @@ static int zforce_probe(struct i2c_client *client,
return ret;
}
+ ts->reg_vdd = devm_regulator_get_optional(&client->dev, "vdd");
+ if (IS_ERR(ts->reg_vdd) && PTR_ERR(ts->reg_vdd) == -EPROBE_DEFER)
+ return PTR_ERR(ts->reg_vdd);
+
+ if (!IS_ERR(ts->reg_vdd)) {
+ ret = regulator_enable(ts->reg_vdd);
+ if (ret)
+ return ret;
+
+ /*
+ * according to datasheet add 100us grace time after regular
+ * regulator enable delay.
+ */
+ udelay(100);
+ }
+
ret = devm_add_action(&client->dev, zforce_reset, ts);
if (ret) {
dev_err(&client->dev, "failed to register reset action, %d\n",
ret);
+
+ /* hereafter the regulator will be disabled by the action */
+ if (!IS_ERR(ts->reg_vdd))
+ regulator_disable(ts->reg_vdd);
+
return ret;
}
--
1.9.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] input: zforce: add regulator handling
2014-04-22 19:19 ` [PATCH] input: zforce: add regulator handling Heiko Stübner
@ 2014-05-23 7:51 ` Heiko Stübner
0 siblings, 0 replies; 9+ messages in thread
From: Heiko Stübner @ 2014-05-23 7:51 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Henrik Rydberg, linux-input, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, devicetree
Hi Dmitry,
Am Dienstag, 22. April 2014, 21:19:57 schrieb Heiko Stübner:
> From: Heiko Stuebner <heiko.stuebner@bq.com>
>
> It's possible that the controller has an individually switchable power
> supply. Therefore add support to control a supplying regulator.
>
> As this is not always the case, the regulator is requested as optional.
>
> Signed-off-by: Heiko Stuebner <heiko.stuebner@bq.com>
ping?
Thanks
Heiko
> ---
> .../bindings/input/touchscreen/zforce_ts.txt | 4 +++
> drivers/input/touchscreen/zforce_ts.c | 30
> ++++++++++++++++++++++ 2 files changed, 34 insertions(+)
>
> diff --git
> a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
> b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt index
> 2faf1f1..80c37df 100644
> --- a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
> +++ b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
> @@ -9,6 +9,9 @@ Required properties:
> - x-size: horizontal resolution of touchscreen
> - y-size: vertical resolution of touchscreen
>
> +Optional properties:
> +- vdd-supply: Regulator controlling the controller supply
> +
> Example:
>
> i2c@00000000 {
> @@ -18,6 +21,7 @@ Example:
> compatible = "neonode,zforce";
> reg = <0x50>;
> interrupts = <2 0>;
> + vdd-supply = <®_zforce_vdd>;
>
> gpios = <&gpio5 6 0>, /* INT */
> <&gpio5 9 0>; /* RST */
> diff --git a/drivers/input/touchscreen/zforce_ts.c
> b/drivers/input/touchscreen/zforce_ts.c index 01d30ce..39ca962 100644
> --- a/drivers/input/touchscreen/zforce_ts.c
> +++ b/drivers/input/touchscreen/zforce_ts.c
> @@ -29,6 +29,8 @@
> #include <linux/sysfs.h>
> #include <linux/input/mt.h>
> #include <linux/platform_data/zforce_ts.h>
> +#include <linux/regulator/consumer.h>
> +#include <linux/delay.h>
> #include <linux/of.h>
> #include <linux/of_gpio.h>
>
> @@ -117,6 +119,8 @@ struct zforce_ts {
> const struct zforce_ts_platdata *pdata;
> char phys[32];
>
> + struct regulator *reg_vdd;
> +
> bool suspending;
> bool suspended;
> bool boot_complete;
> @@ -690,6 +694,11 @@ static void zforce_reset(void *data)
> struct zforce_ts *ts = data;
>
> gpio_set_value(ts->pdata->gpio_rst, 0);
> +
> + udelay(10);
> +
> + if (!IS_ERR(ts->reg_vdd))
> + regulator_disable(ts->reg_vdd);
> }
>
> static struct zforce_ts_platdata *zforce_parse_dt(struct device *dev)
> @@ -765,10 +774,31 @@ static int zforce_probe(struct i2c_client *client,
> return ret;
> }
>
> + ts->reg_vdd = devm_regulator_get_optional(&client->dev, "vdd");
> + if (IS_ERR(ts->reg_vdd) && PTR_ERR(ts->reg_vdd) == -EPROBE_DEFER)
> + return PTR_ERR(ts->reg_vdd);
> +
> + if (!IS_ERR(ts->reg_vdd)) {
> + ret = regulator_enable(ts->reg_vdd);
> + if (ret)
> + return ret;
> +
> + /*
> + * according to datasheet add 100us grace time after regular
> + * regulator enable delay.
> + */
> + udelay(100);
> + }
> +
> ret = devm_add_action(&client->dev, zforce_reset, ts);
> if (ret) {
> dev_err(&client->dev, "failed to register reset action, %d\n",
> ret);
> +
> + /* hereafter the regulator will be disabled by the action */
> + if (!IS_ERR(ts->reg_vdd))
> + regulator_disable(ts->reg_vdd);
> +
> return ret;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH RESEND] input: zforce: add regulator handling
2014-01-09 21:19 [PATCH 0/3] Input: add dt support to zforce driver Heiko Stübner
` (4 preceding siblings ...)
2014-04-22 19:19 ` [PATCH] input: zforce: add regulator handling Heiko Stübner
@ 2014-07-21 15:20 ` Heiko Stübner
2014-07-21 17:42 ` Dmitry Torokhov
5 siblings, 1 reply; 9+ messages in thread
From: Heiko Stübner @ 2014-07-21 15:20 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Henrik Rydberg, linux-input, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, devicetree
From: Heiko Stuebner <heiko.stuebner@bq.com>
It's possible that the controller has an individually switchable power supply.
Therefore add support to control a supplying regulator.
As this is not always the case, the regulator is requested as optional.
Signed-off-by: Heiko Stuebner <heiko.stuebner@bq.com>
---
.../bindings/input/touchscreen/zforce_ts.txt | 4 +++
drivers/input/touchscreen/zforce_ts.c | 30 ++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
index 2faf1f1..80c37df 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
@@ -9,6 +9,9 @@ Required properties:
- x-size: horizontal resolution of touchscreen
- y-size: vertical resolution of touchscreen
+Optional properties:
+- vdd-supply: Regulator controlling the controller supply
+
Example:
i2c@00000000 {
@@ -18,6 +21,7 @@ Example:
compatible = "neonode,zforce";
reg = <0x50>;
interrupts = <2 0>;
+ vdd-supply = <®_zforce_vdd>;
gpios = <&gpio5 6 0>, /* INT */
<&gpio5 9 0>; /* RST */
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index 01d30ce..39ca962 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -29,6 +29,8 @@
#include <linux/sysfs.h>
#include <linux/input/mt.h>
#include <linux/platform_data/zforce_ts.h>
+#include <linux/regulator/consumer.h>
+#include <linux/delay.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
@@ -117,6 +119,8 @@ struct zforce_ts {
const struct zforce_ts_platdata *pdata;
char phys[32];
+ struct regulator *reg_vdd;
+
bool suspending;
bool suspended;
bool boot_complete;
@@ -690,6 +694,11 @@ static void zforce_reset(void *data)
struct zforce_ts *ts = data;
gpio_set_value(ts->pdata->gpio_rst, 0);
+
+ udelay(10);
+
+ if (!IS_ERR(ts->reg_vdd))
+ regulator_disable(ts->reg_vdd);
}
static struct zforce_ts_platdata *zforce_parse_dt(struct device *dev)
@@ -765,10 +774,31 @@ static int zforce_probe(struct i2c_client *client,
return ret;
}
+ ts->reg_vdd = devm_regulator_get_optional(&client->dev, "vdd");
+ if (IS_ERR(ts->reg_vdd) && PTR_ERR(ts->reg_vdd) == -EPROBE_DEFER)
+ return PTR_ERR(ts->reg_vdd);
+
+ if (!IS_ERR(ts->reg_vdd)) {
+ ret = regulator_enable(ts->reg_vdd);
+ if (ret)
+ return ret;
+
+ /*
+ * according to datasheet add 100us grace time after regular
+ * regulator enable delay.
+ */
+ udelay(100);
+ }
+
ret = devm_add_action(&client->dev, zforce_reset, ts);
if (ret) {
dev_err(&client->dev, "failed to register reset action, %d\n",
ret);
+
+ /* hereafter the regulator will be disabled by the action */
+ if (!IS_ERR(ts->reg_vdd))
+ regulator_disable(ts->reg_vdd);
+
return ret;
}
--
1.9.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH RESEND] input: zforce: add regulator handling
2014-07-21 15:20 ` [PATCH RESEND] " Heiko Stübner
@ 2014-07-21 17:42 ` Dmitry Torokhov
0 siblings, 0 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2014-07-21 17:42 UTC (permalink / raw)
To: Heiko Stübner
Cc: Henrik Rydberg, linux-input, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, devicetree
On Mon, Jul 21, 2014 at 05:20:11PM +0200, Heiko Stübner wrote:
> From: Heiko Stuebner <heiko.stuebner@bq.com>
>
> It's possible that the controller has an individually switchable power supply.
> Therefore add support to control a supplying regulator.
>
> As this is not always the case, the regulator is requested as optional.
>
> Signed-off-by: Heiko Stuebner <heiko.stuebner@bq.com>
Applied (with minimal edits to avoid repeated IS_ERR/PTR_ERR), thank
you.
> ---
> .../bindings/input/touchscreen/zforce_ts.txt | 4 +++
> drivers/input/touchscreen/zforce_ts.c | 30 ++++++++++++++++++++++
> 2 files changed, 34 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
> index 2faf1f1..80c37df 100644
> --- a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
> +++ b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
> @@ -9,6 +9,9 @@ Required properties:
> - x-size: horizontal resolution of touchscreen
> - y-size: vertical resolution of touchscreen
>
> +Optional properties:
> +- vdd-supply: Regulator controlling the controller supply
> +
> Example:
>
> i2c@00000000 {
> @@ -18,6 +21,7 @@ Example:
> compatible = "neonode,zforce";
> reg = <0x50>;
> interrupts = <2 0>;
> + vdd-supply = <®_zforce_vdd>;
>
> gpios = <&gpio5 6 0>, /* INT */
> <&gpio5 9 0>; /* RST */
> diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
> index 01d30ce..39ca962 100644
> --- a/drivers/input/touchscreen/zforce_ts.c
> +++ b/drivers/input/touchscreen/zforce_ts.c
> @@ -29,6 +29,8 @@
> #include <linux/sysfs.h>
> #include <linux/input/mt.h>
> #include <linux/platform_data/zforce_ts.h>
> +#include <linux/regulator/consumer.h>
> +#include <linux/delay.h>
> #include <linux/of.h>
> #include <linux/of_gpio.h>
>
> @@ -117,6 +119,8 @@ struct zforce_ts {
> const struct zforce_ts_platdata *pdata;
> char phys[32];
>
> + struct regulator *reg_vdd;
> +
> bool suspending;
> bool suspended;
> bool boot_complete;
> @@ -690,6 +694,11 @@ static void zforce_reset(void *data)
> struct zforce_ts *ts = data;
>
> gpio_set_value(ts->pdata->gpio_rst, 0);
> +
> + udelay(10);
> +
> + if (!IS_ERR(ts->reg_vdd))
> + regulator_disable(ts->reg_vdd);
> }
>
> static struct zforce_ts_platdata *zforce_parse_dt(struct device *dev)
> @@ -765,10 +774,31 @@ static int zforce_probe(struct i2c_client *client,
> return ret;
> }
>
> + ts->reg_vdd = devm_regulator_get_optional(&client->dev, "vdd");
> + if (IS_ERR(ts->reg_vdd) && PTR_ERR(ts->reg_vdd) == -EPROBE_DEFER)
> + return PTR_ERR(ts->reg_vdd);
> +
> + if (!IS_ERR(ts->reg_vdd)) {
> + ret = regulator_enable(ts->reg_vdd);
> + if (ret)
> + return ret;
> +
> + /*
> + * according to datasheet add 100us grace time after regular
> + * regulator enable delay.
> + */
> + udelay(100);
> + }
> +
> ret = devm_add_action(&client->dev, zforce_reset, ts);
> if (ret) {
> dev_err(&client->dev, "failed to register reset action, %d\n",
> ret);
> +
> + /* hereafter the regulator will be disabled by the action */
> + if (!IS_ERR(ts->reg_vdd))
> + regulator_disable(ts->reg_vdd);
> +
> return ret;
> }
>
> --
> 1.9.0
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-07-21 17:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-09 21:19 [PATCH 0/3] Input: add dt support to zforce driver Heiko Stübner
2014-01-09 21:21 ` [PATCH 1/3] dt-bindings: bindings for zforce touchscreens Heiko Stübner
2014-01-09 21:21 ` [PATCH 2/3] Input: zforce: Use internal pdata pointer instead of dev_get_platdata Heiko Stübner
2014-01-09 21:22 ` [PATCH 3/3] Input: zforce: add devicetree support Heiko Stübner
2014-01-28 6:45 ` [PATCH 0/3] Input: add dt support to zforce driver Dmitry Torokhov
2014-04-22 19:19 ` [PATCH] input: zforce: add regulator handling Heiko Stübner
2014-05-23 7:51 ` Heiko Stübner
2014-07-21 15:20 ` [PATCH RESEND] " Heiko Stübner
2014-07-21 17:42 ` Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.