From: Michal Suchanek <msuchanek@suse.de>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Michal Suchanek <msuchanek@suse.de>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH] macintosh: move mac_hid driver to input/mouse.
Date: Tue, 9 May 2017 21:14:18 +0200 [thread overview]
Message-ID: <20170509191418.10144-1-msuchanek@suse.de> (raw)
There is nothing mac-specific about this driver. Non-mac hardware with
suboptimal built-in pointer devices exists.
This makes it possible to use this emulation not only on x86 and ppc
notebooks but also on arm and mips.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
drivers/input/mouse/Kconfig | 20 ++++++++++++++++++++
drivers/input/mouse/Makefile | 1 +
drivers/{macintosh => input/mouse}/mac_hid.c | 0
drivers/macintosh/Kconfig | 17 -----------------
drivers/macintosh/Makefile | 1 -
5 files changed, 21 insertions(+), 18 deletions(-)
rename drivers/{macintosh => input/mouse}/mac_hid.c (100%)
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 89ebb8f39fee..5533fd3a113f 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -12,6 +12,26 @@ menuconfig INPUT_MOUSE
if INPUT_MOUSE
+config MAC_EMUMOUSEBTN
+ tristate "Support for mouse button 2+3 emulation"
+ depends on SYSCTL && INPUT
+ help
+ This provides generic support for emulating the 2nd and 3rd mouse
+ button with keypresses. If you say Y here, the emulation is still
+ disabled by default. The emulation is controlled by these sysctl
+ entries:
+ /proc/sys/dev/mac_hid/mouse_button_emulation
+ /proc/sys/dev/mac_hid/mouse_button2_keycode
+ /proc/sys/dev/mac_hid/mouse_button3_keycode
+
+ If you have an Apple machine with a 1-button mouse, say Y here.
+
+ This emulation can be useful on notebooks with suboptimal touchpad
+ hardware as well.
+
+ To compile this driver as a module, choose M here: the
+ module will be called mac_hid.
+
config MOUSE_PS2
tristate "PS/2 mouse"
default y
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index 56bf0ad877c6..dfaad1dd8857 100644
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -4,6 +4,7 @@
# Each configuration option enables a list of files.
+obj-$(CONFIG_MAC_EMUMOUSEBTN) += mac_hid.o
obj-$(CONFIG_MOUSE_AMIGA) += amimouse.o
obj-$(CONFIG_MOUSE_APPLETOUCH) += appletouch.o
obj-$(CONFIG_MOUSE_ATARI) += atarimouse.o
diff --git a/drivers/macintosh/mac_hid.c b/drivers/input/mouse/mac_hid.c
similarity index 100%
rename from drivers/macintosh/mac_hid.c
rename to drivers/input/mouse/mac_hid.c
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 97a420c11eed..011df09c5167 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -159,23 +159,6 @@ config INPUT_ADBHID
If unsure, say Y.
-config MAC_EMUMOUSEBTN
- tristate "Support for mouse button 2+3 emulation"
- depends on SYSCTL && INPUT
- help
- This provides generic support for emulating the 2nd and 3rd mouse
- button with keypresses. If you say Y here, the emulation is still
- disabled by default. The emulation is controlled by these sysctl
- entries:
- /proc/sys/dev/mac_hid/mouse_button_emulation
- /proc/sys/dev/mac_hid/mouse_button2_keycode
- /proc/sys/dev/mac_hid/mouse_button3_keycode
-
- If you have an Apple machine with a 1-button mouse, say Y here.
-
- To compile this driver as a module, choose M here: the
- module will be called mac_hid.
-
config THERM_WINDTUNNEL
tristate "Support for thermal management on Windtunnel G4s"
depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
index 516eb65bcacc..ab8b1e74d160 100644
--- a/drivers/macintosh/Makefile
+++ b/drivers/macintosh/Makefile
@@ -7,7 +7,6 @@
obj-$(CONFIG_PPC_PMAC) += macio_asic.o macio_sysfs.o
obj-$(CONFIG_PMAC_MEDIABAY) += mediabay.o
-obj-$(CONFIG_MAC_EMUMOUSEBTN) += mac_hid.o
obj-$(CONFIG_INPUT_ADBHID) += adbhid.o
obj-$(CONFIG_ANSLCD) += ans-lcd.o
--
2.10.2
next reply other threads:[~2017-05-09 19:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-09 19:14 Michal Suchanek [this message]
2017-05-10 0:43 ` [PATCH] macintosh: move mac_hid driver to input/mouse Dmitry Torokhov
2017-05-10 10:44 ` Michal Suchánek
2017-05-28 9:47 ` Michal Suchanek
2017-05-28 13:26 ` Bastien Nocera
2017-05-28 17:55 ` Dmitry Torokhov
2017-05-29 18:03 ` Michal Suchánek
2017-05-30 5:06 ` Dmitry Torokhov
2017-05-30 9:34 ` Michal Suchánek
2017-05-30 10:33 ` Benjamin Tissoires
2017-05-30 11:32 ` Michal Suchánek
2017-05-30 12:02 ` Benjamin Tissoires
2017-05-30 12:56 ` Michal Suchánek
2017-05-31 4:26 ` Peter Hutterer
2017-06-07 12:29 ` Michal Suchánek
2017-06-07 16:53 ` Michal Suchánek
2017-06-07 17:16 ` Dmitry Torokhov
2017-06-07 19:17 ` Michal Suchánek
2017-06-07 23:13 ` Peter Hutterer
2017-06-08 13:18 ` Michal Suchánek
2017-06-08 23:07 ` Peter Hutterer
2017-06-08 23:18 ` Dmitry Torokhov
2017-06-09 11:39 ` Michal Suchánek
2017-06-10 2:00 ` Peter Hutterer
2017-06-12 11:40 ` Michal Suchánek
2017-06-12 13:27 ` Michal Suchánek
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=20170509191418.10144-1-msuchanek@suse.de \
--to=msuchanek@suse.de \
--cc=benh@kernel.crashing.org \
--cc=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.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).