From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: Re: [PATCHv5][ 1/4] Input: tsc2007: Add device tree support. Date: Wed, 23 Oct 2013 17:18:27 -0500 Message-ID: <52684B33.6040109@gmail.com> References: <1382530220-27881-1-git-send-email-denis@eukrea.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1382530220-27881-1-git-send-email-denis@eukrea.com> Sender: linux-input-owner@vger.kernel.org To: Denis Carikli , Sascha Hauer Cc: Mark Rutland , devicetree@vger.kernel.org, Dmitry Torokhov , Pawel Moll , Stephen Warren , Ian Campbell , Rob Herring , Thierry Reding , =?UTF-8?B?RXJpYyBCw6luYXJk?= , linux-input@vger.kernel.org, Shawn Guo , linux-arm-kernel@lists.infradead.org, =?UTF-8?B?TG90aGFyIFdhw59tYW5u?= List-Id: devicetree@vger.kernel.org On 10/23/2013 07:10 AM, Denis Carikli wrote: > Cc: Rob Herring > Cc: Pawel Moll > Cc: Mark Rutland > Cc: Stephen Warren > Cc: Ian Campbell > Cc: devicetree@vger.kernel.org > Cc: Dmitry Torokhov > Cc: linux-input@vger.kernel.org > Cc: Sascha Hauer > Cc: linux-arm-kernel@lists.infradead.org > Cc: Lothar Wa=C3=9Fmann > Cc: Eric B=C3=A9nard > Signed-off-by: Denis Carikli > --- > ChangeLog v4->v5: > - Most of the "if (ts->of)" were replaced by wrapping them in the > tsc2007_is_pen_down_valid and tsc2007_is_pen_down functions. > - Some whitespace cleanups. > - The devm_kzalloc call was fixed to make it compile. > --- > .../bindings/input/touchscreen/tsc2007.txt | 44 +++++ > drivers/input/touchscreen/tsc2007.c | 194 ++++++++++= +++++----- > 2 files changed, 197 insertions(+), 41 deletions(-) > create mode 100644 Documentation/devicetree/bindings/input/touchscre= en/tsc2007.txt >=20 > diff --git a/Documentation/devicetree/bindings/input/touchscreen/tsc2= 007.txt b/Documentation/devicetree/bindings/input/touchscreen/tsc2007.t= xt > new file mode 100644 > index 0000000..fadd3f6 > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt > @@ -0,0 +1,44 @@ > +* Texas Instruments tsc2007 touchscreen controller > + > +Required properties: > +- compatible: must be "ti,tsc2007". > +- reg: I2C address of the chip. > +- pinctrl-0: Should specify pin control groups used for this control= ler > + (see pinctrl bindings[0]). > +- pinctrl-names: Should contain only one value - "default" > + (see pinctrl bindings[0]). I'm confused why an i2c slave needs pinctl binding? > +- interrupt-parent: the phandle for the interrupt controller > + (see interrupt binding[1]). > +- interrupts: interrupt to which the chip is connected > + (see interrupt binding[1]). > +- ti,x-plate-ohms: X-plate resistance in ohms. > + > +Optional properties: > +- gpios: the interrupt gpio the chip is connected to (trough the pen= irq pin) > + (see GPIO binding[2] for more details). > +- max-rt: maximum pressure. > +- fuzzy: specifies the fuzz value that is used to filter noise from = the event > + stream. > +- poll-period: how much time to wait(in millisecond) before reading = again the > + values from the tsc2007. > + > +[0]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt > +[1]: Documentation/devicetree/bindings/interrupt-controller/interrup= ts.txt > +[2]: Documentation/devicetree/bindings/gpio/gpio.txt > + > +Example: > + &i2c1 { > + /* ... */ > + tsc2007@49 { > + compatible =3D "ti,tsc2007"; > + reg =3D <0x49>; > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&pinctrl_tsc2007_1>; > + interrupt-parent =3D <&gpio4>; > + interrupts =3D <0x0 0x8>; > + gpios =3D <&gpio4 0 0>; > + ti,x-plate-ohms =3D <180>; > + }; > + > + /* ... */ > + }; > diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touc= hscreen/tsc2007.c > index 0b67ba4..0625fe1 100644 > --- a/drivers/input/touchscreen/tsc2007.c > +++ b/drivers/input/touchscreen/tsc2007.c > @@ -26,6 +26,9 @@ > #include > #include > #include > +#include > +#include > +#include > =20 > #define TSC2007_MEASURE_TEMP0 (0x0 << 4) > #define TSC2007_MEASURE_AUX (0x2 << 4) > @@ -74,7 +77,10 @@ struct tsc2007 { > u16 max_rt; > unsigned long poll_delay; > unsigned long poll_period; > + int fuzzy; > + char of; > =20 > + unsigned gpio; > int irq; > =20 > wait_queue_head_t wait; > @@ -84,6 +90,11 @@ struct tsc2007 { > void (*clear_penirq)(void); > }; > =20 > +static int tsc2007_get_pendown_state_dt(struct tsc2007 *ts) > +{ > + return !gpio_get_value(ts->gpio); > +} > + > static inline int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd) > { > s32 data; > @@ -142,6 +153,14 @@ static u32 tsc2007_calculate_pressure(struct tsc= 2007 *tsc, struct ts_event *tc) > return rt; > } > =20 > +static bool tsc2007_is_pen_down_valid(struct tsc2007 *ts) > +{ > + if (ts->of) > + return gpio_is_valid(ts->gpio); > + else > + return ts->get_pendown_state ? true : false; > +} > + > static bool tsc2007_is_pen_down(struct tsc2007 *ts) > { > /* > @@ -158,10 +177,13 @@ static bool tsc2007_is_pen_down(struct tsc2007 = *ts) > * to fall back on the pressure reading. > */ > =20 > - if (!ts->get_pendown_state) > + if (!tsc2007_is_pen_down_valid(ts)) > return true; > =20 > - return ts->get_pendown_state(); > + if (ts->of) > + return tsc2007_get_pendown_state_dt(ts); > + else > + return ts->get_pendown_state(); > } > =20 > static irqreturn_t tsc2007_soft_irq(int irq, void *handle) > @@ -178,7 +200,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void= *handle) > =20 > rt =3D tsc2007_calculate_pressure(ts, &tc); > =20 > - if (rt =3D=3D 0 && !ts->get_pendown_state) { > + if(!rt && !tsc2007_is_pen_down_valid(ts)) { > /* > * If pressure reported is 0 and we don't have > * callback to check pendown state, we have to > @@ -228,7 +250,7 @@ static irqreturn_t tsc2007_hard_irq(int irq, void= *handle) > { > struct tsc2007 *ts =3D handle; > =20 > - if (!ts->get_pendown_state || likely(ts->get_pendown_state())) > + if (tsc2007_is_pen_down(ts)) > return IRQ_WAKE_THREAD; > =20 > if (ts->clear_penirq) > @@ -273,34 +295,65 @@ static void tsc2007_close(struct input_dev *inp= ut_dev) > tsc2007_stop(ts); > } > =20 > -static int tsc2007_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +#ifdef CONFIG_OF > +static int tsc2007_probe_dt(struct i2c_client *client, struct tsc200= 7 *ts, > + struct device_node *np) > { > - struct tsc2007 *ts; > - struct tsc2007_platform_data *pdata =3D client->dev.platform_data; > - struct input_dev *input_dev; > - int err; > - > - if (!pdata) { > - dev_err(&client->dev, "platform data is required!\n"); > + int err =3D 0; > + u32 val32; > + u64 val64; > + > + if (!of_property_read_u32(np, "max-rt", &val32)) > + ts->max_rt =3D val32; > + else > + ts->max_rt =3D MAX_12BIT; These functions don't overwrite the value if the property isn't present= =2E So you can set the values to the defaults and just pass the variable (i.e. ts->max_rt) to of_property_read_u32 directly. Rob -- 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