linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff LaBundy <jeff@labundy.com>
To: dmitry.torokhov@gmail.com, robh+dt@kernel.org
Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org,
	Jeff LaBundy <jeff@labundy.com>
Subject: [PATCH v3 1/4] Input: touchscreen - move helper functions to core
Date: Mon,  1 Mar 2021 17:49:25 -0600	[thread overview]
Message-ID: <20210301234928.4298-2-jeff@labundy.com> (raw)
In-Reply-To: <20210301234928.4298-1-jeff@labundy.com>

Some devices outside of drivers/input/touchscreen/ can still make
use of the touchscreen helper functions. Therefore, it was agreed
in [1] to move them outside of drivers/input/touchscreen/ so that
other devices can call them without INPUT_TOUCHSCREEN being set.

As part of this change, 'of' is dropped from the filename because
the helpers no longer actually use OF. No changes are made to the
file contents whatsoever.

Based on the feedback in [2], the corresponding binding documents
(touchscreen.yaml and touchscreen.txt) are left in their original
locations.

[1] https://patchwork.kernel.org/patch/11924029/
[2] https://patchwork.kernel.org/patch/12042037/

Signed-off-by: Jeff LaBundy <jeff@labundy.com>
---
Changes in v3:
 - Updated the commit message to reference the discussion over the bindings

Changes in v2:
 - Added this patch to the series

 drivers/input/Makefile                                        | 1 +
 drivers/input/{touchscreen/of_touchscreen.c => touchscreen.c} | 0
 drivers/input/touchscreen/Kconfig                             | 4 ----
 drivers/input/touchscreen/Makefile                            | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)
 rename drivers/input/{touchscreen/of_touchscreen.c => touchscreen.c} (100%)

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index d8f5310e22ba..037cc595106c 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -7,6 +7,7 @@

 obj-$(CONFIG_INPUT)		+= input-core.o
 input-core-y := input.o input-compat.o input-mt.o input-poller.o ff-core.o
+input-core-y += touchscreen.o

 obj-$(CONFIG_INPUT_FF_MEMLESS)	+= ff-memless.o
 obj-$(CONFIG_INPUT_SPARSEKMAP)	+= sparse-keymap.o
diff --git a/drivers/input/touchscreen/of_touchscreen.c b/drivers/input/touchscreen.c
similarity index 100%
rename from drivers/input/touchscreen/of_touchscreen.c
rename to drivers/input/touchscreen.c
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 529614d364fe..aead3ad6ba6a 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -12,10 +12,6 @@ menuconfig INPUT_TOUCHSCREEN

 if INPUT_TOUCHSCREEN

-config TOUCHSCREEN_PROPERTIES
-	def_tristate INPUT
-	depends on INPUT
-
 config TOUCHSCREEN_88PM860X
 	tristate "Marvell 88PM860x touchscreen"
 	depends on MFD_88PM860X
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 6233541e9173..80cd241b4c1b 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -7,7 +7,6 @@

 wm97xx-ts-y := wm97xx-core.o

-obj-$(CONFIG_TOUCHSCREEN_PROPERTIES)	+= of_touchscreen.o
 obj-$(CONFIG_TOUCHSCREEN_88PM860X)	+= 88pm860x-ts.o
 obj-$(CONFIG_TOUCHSCREEN_AD7877)	+= ad7877.o
 obj-$(CONFIG_TOUCHSCREEN_AD7879)	+= ad7879.o
--
2.17.1


  reply	other threads:[~2021-03-02 12:53 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-01 23:49 [PATCH v3 0/4] Add support for Azoteq IQS626A Jeff LaBundy
2021-03-01 23:49 ` Jeff LaBundy [this message]
2021-03-22 23:46   ` [PATCH v3 1/4] Input: touchscreen - move helper functions to core Dmitry Torokhov
2021-03-01 23:49 ` [PATCH v3 2/4] Input: touchscreen - broaden use-cases described in comments Jeff LaBundy
2021-03-22 23:46   ` Dmitry Torokhov
2021-03-01 23:49 ` [PATCH v3 3/4] dt-bindings: input: Add bindings for Azoteq IQS626A Jeff LaBundy
2021-03-22 23:47   ` Dmitry Torokhov
2021-03-01 23:49 ` [PATCH v3 4/4] Input: Add support " Jeff LaBundy
2021-03-22 23:47   ` Dmitry Torokhov

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=20210301234928.4298-2-jeff@labundy.com \
    --to=jeff@labundy.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=robh+dt@kernel.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).