| Message ID | 20191112210148.3535-2-TheSven73@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cc12ba1872c6bf05b5f177fae5082bcbea335f2b |
| Headers | show |
| Series | [v2,1/2] Input: ili210x - add resolution to chip operations structure | expand |
On Tue, Nov 12, 2019 at 04:01:48PM -0500, Sven Van Asbroeck wrote: > Only show the 'calibrate' sysfs attribute on chip flavours > which support calibration by writing to a calibration register. > > Do this by adding a flag to the chip operations structure. > > Link: https://lore.kernel.org/lkml/20191111181657.GA57214@dtor-ws/ > Cc: Marek Vasut <marex@denx.de> > Cc: Adam Ford <aford173@gmail.com> > Cc: <linux-kernel@vger.kernel.org> > Cc: linux-input@vger.kernel.org > Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next > Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com> Applied, thank you. > --- > drivers/input/touchscreen/ili210x.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c > index 3b8e24815a1f..b0454cdacf38 100644 > --- a/drivers/input/touchscreen/ili210x.c > +++ b/drivers/input/touchscreen/ili210x.c > @@ -32,6 +32,7 @@ struct ili2xxx_chip { > bool (*continue_polling)(const u8 *data, bool touch); > unsigned int max_touches; > unsigned int resolution; > + bool has_calibrate_reg; > }; > > struct ili210x { > @@ -102,6 +103,7 @@ static const struct ili2xxx_chip ili210x_chip = { > .parse_touch_data = ili210x_touchdata_to_coords, > .continue_polling = ili210x_check_continue_polling, > .max_touches = 2, > + .has_calibrate_reg = true, > }; > > static int ili211x_read_touch_data(struct i2c_client *client, u8 *data) > @@ -227,6 +229,7 @@ static const struct ili2xxx_chip ili251x_chip = { > .parse_touch_data = ili251x_touchdata_to_coords, > .continue_polling = ili251x_check_continue_polling, > .max_touches = 10, > + .has_calibrate_reg = true, > }; > > static bool ili210x_report_events(struct ili210x *priv, u8 *touchdata) > @@ -310,8 +313,19 @@ static struct attribute *ili210x_attributes[] = { > NULL, > }; > > +static umode_t ili210x_calibrate_visible(struct kobject *kobj, > + struct attribute *attr, int index) > +{ > + struct device *dev = kobj_to_dev(kobj); > + struct i2c_client *client = to_i2c_client(dev); > + struct ili210x *priv = i2c_get_clientdata(client); > + > + return priv->chip->has_calibrate_reg; > +} > + > static const struct attribute_group ili210x_attr_group = { > .attrs = ili210x_attributes, > + .is_visible = ili210x_calibrate_visible, > }; > > static void ili210x_power_down(void *data) > -- > 2.17.1 >
diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c index 3b8e24815a1f..b0454cdacf38 100644 --- a/drivers/input/touchscreen/ili210x.c +++ b/drivers/input/touchscreen/ili210x.c @@ -32,6 +32,7 @@ struct ili2xxx_chip { bool (*continue_polling)(const u8 *data, bool touch); unsigned int max_touches; unsigned int resolution; + bool has_calibrate_reg; }; struct ili210x { @@ -102,6 +103,7 @@ static const struct ili2xxx_chip ili210x_chip = { .parse_touch_data = ili210x_touchdata_to_coords, .continue_polling = ili210x_check_continue_polling, .max_touches = 2, + .has_calibrate_reg = true, }; static int ili211x_read_touch_data(struct i2c_client *client, u8 *data) @@ -227,6 +229,7 @@ static const struct ili2xxx_chip ili251x_chip = { .parse_touch_data = ili251x_touchdata_to_coords, .continue_polling = ili251x_check_continue_polling, .max_touches = 10, + .has_calibrate_reg = true, }; static bool ili210x_report_events(struct ili210x *priv, u8 *touchdata) @@ -310,8 +313,19 @@ static struct attribute *ili210x_attributes[] = { NULL, }; +static umode_t ili210x_calibrate_visible(struct kobject *kobj, + struct attribute *attr, int index) +{ + struct device *dev = kobj_to_dev(kobj); + struct i2c_client *client = to_i2c_client(dev); + struct ili210x *priv = i2c_get_clientdata(client); + + return priv->chip->has_calibrate_reg; +} + static const struct attribute_group ili210x_attr_group = { .attrs = ili210x_attributes, + .is_visible = ili210x_calibrate_visible, }; static void ili210x_power_down(void *data)
Only show the 'calibrate' sysfs attribute on chip flavours which support calibration by writing to a calibration register. Do this by adding a flag to the chip operations structure. Link: https://lore.kernel.org/lkml/20191111181657.GA57214@dtor-ws/ Cc: Marek Vasut <marex@denx.de> Cc: Adam Ford <aford173@gmail.com> Cc: <linux-kernel@vger.kernel.org> Cc: linux-input@vger.kernel.org Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com> --- drivers/input/touchscreen/ili210x.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)