From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-gpio@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Linus Walleij <linus.walleij@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 1/8] pinctrl: lynxpoint: Move GPIO driver to pin controller folder
Date: Wed, 6 Nov 2019 16:48:22 +0200 [thread overview]
Message-ID: <20191106144829.32275-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20191106144829.32275-1-andriy.shevchenko@linux.intel.com>
Move Lynxpoint GPIO driver under Intel pin control umbrella
for further transformation to a real pin control driver.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
MAINTAINERS | 1 -
drivers/gpio/Kconfig | 8 --------
drivers/gpio/Makefile | 1 -
drivers/pinctrl/intel/Kconfig | 10 ++++++++++
drivers/pinctrl/intel/Makefile | 1 +
.../intel/pinctrl-lynxpoint.c} | 0
6 files changed, 11 insertions(+), 10 deletions(-)
rename drivers/{gpio/gpio-lynxpoint.c => pinctrl/intel/pinctrl-lynxpoint.c} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1378491c223c..9b71250e3014 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8325,7 +8325,6 @@ S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
F: drivers/gpio/gpio-ich.c
F: drivers/gpio/gpio-intel-mid.c
-F: drivers/gpio/gpio-lynxpoint.c
F: drivers/gpio/gpio-merrifield.c
F: drivers/gpio/gpio-ml-ioh.c
F: drivers/gpio/gpio-pch.c
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 8adffd42f8cb..6923142fd874 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -335,14 +335,6 @@ config GPIO_LPC32XX
Select this option to enable GPIO driver for
NXP LPC32XX devices.
-config GPIO_LYNXPOINT
- tristate "Intel Lynxpoint GPIO support"
- depends on ACPI && X86
- select GPIOLIB_IRQCHIP
- help
- driver for GPIO functionality on Intel Lynxpoint PCH chipset
- Requires ACPI device enumeration code to set up a platform device.
-
config GPIO_MB86S7X
tristate "GPIO support for Fujitsu MB86S7x Platforms"
help
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 34eb8b2b12dd..55b2b645391e 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -76,7 +76,6 @@ obj-$(CONFIG_GPIO_LP873X) += gpio-lp873x.o
obj-$(CONFIG_GPIO_LP87565) += gpio-lp87565.o
obj-$(CONFIG_GPIO_LPC18XX) += gpio-lpc18xx.o
obj-$(CONFIG_GPIO_LPC32XX) += gpio-lpc32xx.o
-obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o
obj-$(CONFIG_GPIO_MADERA) += gpio-madera.o
obj-$(CONFIG_GPIO_MAX3191X) += gpio-max3191x.o
obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o
diff --git a/drivers/pinctrl/intel/Kconfig b/drivers/pinctrl/intel/Kconfig
index c091eb2f0aeb..260193c453b0 100644
--- a/drivers/pinctrl/intel/Kconfig
+++ b/drivers/pinctrl/intel/Kconfig
@@ -42,6 +42,16 @@ config PINCTRL_MERRIFIELD
interface that allows configuring of SoC pins and using them as
GPIOs.
+config PINCTRL_LYNXPOINT
+ tristate "Intel Lynxpoint pinctrl and GPIO driver"
+ depends on ACPI
+ select GPIOLIB
+ select GPIOLIB_IRQCHIP
+ help
+ Lynxpoint is the PCH of Intel Haswell. This pinctrl driver
+ provides an interface that allows configuring of PCH pins and
+ using them as GPIOs.
+
config PINCTRL_INTEL
tristate
select PINMUX
diff --git a/drivers/pinctrl/intel/Makefile b/drivers/pinctrl/intel/Makefile
index 5e92aba018ac..541b94cfe398 100644
--- a/drivers/pinctrl/intel/Makefile
+++ b/drivers/pinctrl/intel/Makefile
@@ -13,5 +13,6 @@ obj-$(CONFIG_PINCTRL_ELKHARTLAKE) += pinctrl-elkhartlake.o
obj-$(CONFIG_PINCTRL_GEMINILAKE) += pinctrl-geminilake.o
obj-$(CONFIG_PINCTRL_ICELAKE) += pinctrl-icelake.o
obj-$(CONFIG_PINCTRL_LEWISBURG) += pinctrl-lewisburg.o
+obj-$(CONFIG_PINCTRL_LYNXPOINT) += pinctrl-lynxpoint.o
obj-$(CONFIG_PINCTRL_SUNRISEPOINT) += pinctrl-sunrisepoint.o
obj-$(CONFIG_PINCTRL_TIGERLAKE) += pinctrl-tigerlake.o
diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
similarity index 100%
rename from drivers/gpio/gpio-lynxpoint.c
rename to drivers/pinctrl/intel/pinctrl-lynxpoint.c
--
2.24.0.rc1
next prev parent reply other threads:[~2019-11-06 14:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 14:48 [PATCH v1 0/8] pinctrl: intel: Move Lynxpoint to pin control umbrella Andy Shevchenko
2019-11-06 14:48 ` Andy Shevchenko [this message]
2019-11-07 13:48 ` [PATCH v1 1/8] pinctrl: lynxpoint: Move GPIO driver to pin controller folder Mika Westerberg
2019-11-07 14:47 ` Andy Shevchenko
2019-11-13 9:54 ` Linus Walleij
2019-11-13 13:40 ` Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 2/8] pinctrl: lynxpoint: Use raw_spinlock for locking Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 3/8] pinctrl: lynxpoint: Correct amount of pins Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 4/8] pinctrl: lynxpoint: Keep pointer to struct device instead of its container Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 5/8] pinctrl: lynxpoint: Use %pR to print IO resource Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 6/8] pinctrl: lynxpoint: Switch to memory mapped IO accessors Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 7/8] pinctrl: lynxpoint: Convert unsigned to unsigned int Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 8/8] pinctrl: lynxpoint: Move ->remove closer to ->probe() Andy Shevchenko
2019-11-13 9:54 ` [PATCH v1 0/8] pinctrl: intel: Move Lynxpoint to pin control umbrella Linus Walleij
2019-11-25 12:02 ` Andy Shevchenko
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=20191106144829.32275-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
/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).