From: Jiada Wang <jiada_wang@mentor.com>
To: <jikos@kernel.org>, <benjamin.tissoires@redhat.com>,
<rydberg@bitmath.org>, <dmitry.torokhov@gmail.com>,
<nick@shmanahar.org>, <bsz@semihalf.com>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<erosca@de.adit-jv.com>, <Andrew_Gabbasov@mentor.com>,
<jiada_wang@mentor.com>
Subject: [PATCH v7 17/48] Input: atmel_mxt_ts - allow input name to be specified in platform data
Date: Wed, 12 Feb 2020 00:41:47 -0800 [thread overview]
Message-ID: <20200212084218.32344-18-jiada_wang@mentor.com> (raw)
In-Reply-To: <20200212084218.32344-1-jiada_wang@mentor.com>
From: Nick Dyer <nick.dyer@itdev.co.uk>
Android systems identify the input device and map to IDC file by using the
input device name. To avoid unnecessary deltas to the driver file, allow
this to be set from the platform data.
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
(cherry picked from ndyer/linux/for-upstream commit cbf94a7bda754d2e1899d9f50313a0bccc91422d)
[gdavis: Resolve forward port conflicts due to applying upstream
commit 96a938aa214e ("Input: atmel_mxt_ts - remove platform
data support").]
Signed-off-by: George G. Davis <george_davis@mentor.com>
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
.../devicetree/bindings/input/atmel,maxtouch.txt | 2 ++
drivers/input/touchscreen/atmel_mxt_ts.c | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
index 713ce870805c..d7db16920083 100644
--- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
+++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
@@ -40,6 +40,8 @@ Optional properties for main touchpad device:
- atmel,cfg_name: Provide name of configuration file in OBP_RAW format. This
will be downloaded from the firmware loader on probe to the device.
+- atmel,input_name: Override name of input device from the default.
+
Example:
touch@4b {
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 84ad8daef7d3..b0a07d077016 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -336,6 +336,7 @@ struct mxt_data {
char *fw_name;
char *cfg_name;
const char *pcfg_name;
+ const char *input_name;
/* Cached parameters from object table */
u16 T5_address;
@@ -2412,7 +2413,11 @@ static int mxt_initialize_input_device(struct mxt_data *data)
if (!input_dev)
return -ENOMEM;
- input_dev->name = "Atmel maXTouch Touchscreen";
+ if (data->input_name)
+ input_dev->name = data->input_name;
+ else
+ input_dev->name = "Atmel maXTouch Touchscreen";
+
input_dev->phys = data->phys;
input_dev->id.bustype = BUS_I2C;
input_dev->dev.parent = dev;
@@ -3653,6 +3658,8 @@ static int mxt_parse_device_properties(struct mxt_data *data)
device_property_read_string(dev, "atmel,cfg_name", &data->pcfg_name);
+ device_property_read_string(dev, "atmel,input_name", &data->input_name);
+
if (device_property_present(dev, keymap_property)) {
n_keys = device_property_count_u32(dev, keymap_property);
if (n_keys <= 0) {
--
2.17.1
next prev parent reply other threads:[~2020-02-12 8:44 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 8:41 [PATCH v7 00/48] atmel_mxt_ts misc Jiada Wang
2020-02-12 8:41 ` [PATCH v7 01/48] Input: introduce input_mt_report_slot_inactive Jiada Wang
2020-02-12 8:41 ` [PATCH v7 02/48] Input: atmel_mxt_ts - rework sysfs init/remove Jiada Wang
2020-02-12 8:41 ` [PATCH v7 03/48] Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary Jiada Wang
2020-03-17 22:44 ` Dmitry Osipenko
2020-03-18 13:02 ` Wang, Jiada
2020-02-12 8:41 ` [PATCH v7 04/48] Input: atmel_mxt_ts - split large i2c transfers into blocks Jiada Wang
2020-02-12 8:41 ` [PATCH v7 05/48] Input: atmel_mxt_ts - output status from T48 Noise Supression Jiada Wang
2020-02-12 8:41 ` [PATCH v7 06/48] Input: atmel_mxt_ts - output status from T42 Touch Suppression Jiada Wang
2020-02-12 8:41 ` [PATCH v7 07/48] Input: atmel_mxt_ts - implement T9 vector/orientation support Jiada Wang
2020-02-12 8:41 ` [PATCH v7 08/48] Input: atmel_mxt_ts - implement T15 Key Array support Jiada Wang
2020-02-12 8:41 ` [PATCH v7 09/48] Input: atmel_mxt_ts - handle reports from T47 Stylus object Jiada Wang
2020-02-12 8:41 ` [PATCH v7 10/48] Input: atmel_mxt_ts - implement support for T107 active stylus Jiada Wang
2020-02-12 8:41 ` [PATCH v7 11/48] Input: atmel_mxt_ts - add debug for T92 gesture and T93 touch seq msgs Jiada Wang
2020-02-12 8:41 ` [PATCH v7 12/48] Input: atmel_mxt_ts - release touch state during suspend Jiada Wang
2020-02-12 8:41 ` [PATCH v7 13/48] Input: atmel_mxt_ts - add regulator control support Jiada Wang
2020-03-12 15:26 ` Dmitry Osipenko
2020-02-12 8:41 ` [PATCH v7 14/48] Input: atmel_mxt_ts - report failures in suspend/resume Jiada Wang
2020-02-12 8:41 ` [PATCH v7 15/48] Input: atmel_mxt_ts - allow specification of firmware file name Jiada Wang
2020-02-12 8:41 ` [PATCH v7 16/48] Input: atmel_mxt_ts - handle cfg filename via pdata/sysfs Jiada Wang
2020-02-12 8:41 ` Jiada Wang [this message]
2020-02-12 8:41 ` [PATCH v7 18/48] Input: atmel_mxt_ts - add config checksum attribute to sysfs Jiada Wang
2020-02-12 8:41 ` [PATCH v7 19/48] Input: atmel_mxt_ts - refactor firmware flash to extract context into struct Jiada Wang
2020-02-12 8:41 ` [PATCH v7 20/48] Input: atmel_mxt_ts - refactor code to enter bootloader into separate func Jiada Wang
2020-02-12 8:41 ` [PATCH v7 21/48] Input: atmel_mxt_ts - combine bootloader version query with probe Jiada Wang
2020-02-12 8:41 ` [PATCH v7 22/48] Input: atmel_mxt_ts - improve bootloader state machine handling Jiada Wang
2020-03-12 15:28 ` Dmitry Osipenko
2020-02-12 8:41 ` [PATCH v7 23/48] Input: atmel_mxt_ts - rename bl_completion to chg_completion Jiada Wang
2020-02-12 8:41 ` [PATCH v7 24/48] Input: atmel_mxt_ts - make bootloader interrupt driven Jiada Wang
2020-02-12 8:41 ` [PATCH v7 25/48] Input: atmel_mxt_ts - delay enabling IRQ when not using regulators Jiada Wang
2020-02-12 8:41 ` [PATCH v7 26/48] Input: atmel_mxt_ts - implement I2C retries Jiada Wang
2020-02-12 8:41 ` [PATCH v7 27/48] Input: atmel_mxt_ts - orientation is not present in hover Jiada Wang
2020-02-12 8:41 ` [PATCH v7 28/48] Input: atmel_mxt_ts - implement debug output for messages Jiada Wang
2020-02-12 8:41 ` [PATCH v7 29/48] Input: atmel_mxt_ts - implement improved debug message interface Jiada Wang
2020-02-12 8:42 ` [PATCH v7 30/48] Input: atmel_mxt_ts - eliminate data->raw_info_block Jiada Wang
2020-02-12 8:42 ` [PATCH v7 31/48] Input: atmel_mxt_ts - Change call-points of mxt_free_* functions Jiada Wang
2020-02-12 8:42 ` [PATCH v7 32/48] Input: atmel_mxt_ts - rely on calculated_crc rather than file config_crc Jiada Wang
2020-02-12 8:42 ` [PATCH v7 33/48] input: atmel_mxt_ts: export GPIO reset line via sysfs Jiada Wang
2020-02-12 8:42 ` [PATCH v7 34/48] input: atmel_mxt_ts: Add Missing Delay for reset handling of Atmel touch panel controller in detachable displays Jiada Wang
2020-02-12 8:42 ` [PATCH v7 35/48] Input: atmel_mxt_ts: Add support for run self-test routine Jiada Wang
2020-02-12 8:42 ` [PATCH v7 36/48] Input: atmel_mxt_ts: Limit the max bytes transferred in an i2c transaction Jiada Wang
2020-02-12 8:42 ` [PATCH v7 37/48] Input: atmel_mxt_ts: return error from mxt_process_messages_until_invalid() Jiada Wang
2020-02-12 8:42 ` [PATCH v7 38/48] Input: Atmel: improve error handling in mxt_start() Jiada Wang
2020-02-12 8:42 ` [PATCH v7 39/48] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
2020-02-12 8:42 ` [PATCH v7 40/48] Input: Atmel: improve error handling in mxt_update_cfg() Jiada Wang
2020-02-12 8:42 ` [PATCH v7 41/48] Input: Atmel: Improve error handling in mxt_initialize_input_device() Jiada Wang
2020-02-12 8:42 ` [PATCH v7 42/48] Input: Atmel: handle ReportID "0x00" while processing T5 messages Jiada Wang
2020-02-12 8:42 ` [PATCH v7 43/48] Input: Atmel: use T44 object to process " Jiada Wang
2020-02-12 8:42 ` [PATCH v7 44/48] Input: atmel_mxt_ts: use gpiod_set_value_cansleep for reset pin Jiada Wang
2020-02-12 8:42 ` [PATCH v7 45/48] input: touchscreen: atmel_mxt_ts: Added sysfs entry for touchscreen status Jiada Wang
2020-02-12 8:42 ` [PATCH v7 46/48] input: atmel_mxt_ts: added sysfs interface to update atmel T38 data Jiada Wang
2020-02-12 8:42 ` [PATCH v7 47/48] Input: atmel_mxt_ts: Implement synchronization during various operation Jiada Wang
2020-02-12 8:42 ` [PATCH v7 48/48] Input: atmel_mxt_ts - Fix compilation warning Jiada Wang
2020-03-11 1:09 ` [PATCH v7 00/48] atmel_mxt_ts misc Wang, Jiada
2020-03-12 15:21 ` Dmitry Osipenko
2020-03-16 6:50 ` Wang, Jiada
2020-03-20 3:37 ` Wang, Jiada
2020-03-20 15:53 ` Dmitry Osipenko
2020-03-23 2:25 ` Wang, Jiada
2020-03-24 14:54 ` Dmitry Osipenko
2020-03-24 15:03 ` Dmitry Osipenko
2020-03-25 12:13 ` Wang, Jiada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200212084218.32344-18-jiada_wang@mentor.com \
--to=jiada_wang@mentor.com \
--cc=Andrew_Gabbasov@mentor.com \
--cc=benjamin.tissoires@redhat.com \
--cc=bsz@semihalf.com \
--cc=dmitry.torokhov@gmail.com \
--cc=erosca@de.adit-jv.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nick@shmanahar.org \
--cc=rydberg@bitmath.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).