From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Lee Jones <lee.jones@linaro.org>,
linux-kernel@vger.kernel.org,
Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 2/4] mfd: intel/lpc/sch: move driver to dedicated folder
Date: Thu, 11 Dec 2014 17:53:54 +0200 [thread overview]
Message-ID: <1418313236-10764-3-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1418313236-10764-1-git-send-email-andriy.shevchenko@linux.intel.com>
Move the lpc_sch.c module to the dedicated folder.
There is no functional change.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/mfd/Kconfig | 8 --------
drivers/mfd/Makefile | 1 -
drivers/mfd/intel/Kconfig | 2 ++
drivers/mfd/intel/Makefile | 1 +
drivers/mfd/intel/lpc/Kconfig | 7 +++++++
drivers/mfd/intel/lpc/Makefile | 1 +
drivers/mfd/{lpc_sch.c => intel/lpc/sch.c} | 2 +-
7 files changed, 12 insertions(+), 10 deletions(-)
create mode 100644 drivers/mfd/intel/lpc/Kconfig
create mode 100644 drivers/mfd/intel/lpc/Makefile
rename drivers/mfd/{lpc_sch.c => intel/lpc/sch.c} (99%)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 729e9cd..e78450f 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -281,14 +281,6 @@ config LPC_ICH
other drivers to control these functions, currently GPIO and
watchdog.
-config LPC_SCH
- tristate "Intel SCH LPC"
- depends on PCI
- select MFD_CORE
- help
- LPC bridge function of the Intel SCH provides support for
- System Management Bus and General Purpose I/O.
-
config INTEL_SOC_PMIC
bool "Support for Intel Atom SoC PMIC"
depends on I2C=y
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 11e1945e..fa2fa72 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -138,7 +138,6 @@ obj-$(CONFIG_AB8500_CORE) += ab8500-core.o ab8500-sysctrl.o
obj-$(CONFIG_MFD_TIMBERDALE) += timberdale.o
obj-$(CONFIG_PMIC_ADP5520) += adp5520.o
obj-$(CONFIG_MFD_KEMPLD) += kempld-core.o
-obj-$(CONFIG_LPC_SCH) += lpc_sch.o
obj-$(CONFIG_LPC_ICH) += lpc_ich.o
obj-$(CONFIG_MFD_RDC321X) += rdc321x-southbridge.o
obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o
diff --git a/drivers/mfd/intel/Kconfig b/drivers/mfd/intel/Kconfig
index 9e376b0..5d2341f 100644
--- a/drivers/mfd/intel/Kconfig
+++ b/drivers/mfd/intel/Kconfig
@@ -3,3 +3,5 @@
#
source "drivers/mfd/intel/mid/Kconfig"
+
+source "drivers/mfd/intel/lpc/Kconfig"
diff --git a/drivers/mfd/intel/Makefile b/drivers/mfd/intel/Makefile
index 8d6b43b..8264a26 100644
--- a/drivers/mfd/intel/Makefile
+++ b/drivers/mfd/intel/Makefile
@@ -3,3 +3,4 @@
#
obj-y += mid/
+obj-y += lpc/
diff --git a/drivers/mfd/intel/lpc/Kconfig b/drivers/mfd/intel/lpc/Kconfig
new file mode 100644
index 0000000..f131f96
--- /dev/null
+++ b/drivers/mfd/intel/lpc/Kconfig
@@ -0,0 +1,7 @@
+config LPC_SCH
+ tristate "Intel SCH LPC"
+ depends on PCI
+ select MFD_CORE
+ help
+ LPC bridge function of the Intel SCH provides support for
+ System Management Bus and General Purpose I/O.
diff --git a/drivers/mfd/intel/lpc/Makefile b/drivers/mfd/intel/lpc/Makefile
new file mode 100644
index 0000000..7503137
--- /dev/null
+++ b/drivers/mfd/intel/lpc/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_LPC_SCH) += sch.o
diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/intel/lpc/sch.c
similarity index 99%
rename from drivers/mfd/lpc_sch.c
rename to drivers/mfd/intel/lpc/sch.c
index 5c38df3..1829959 100644
--- a/drivers/mfd/lpc_sch.c
+++ b/drivers/mfd/intel/lpc/sch.c
@@ -1,5 +1,5 @@
/*
- * lpc_sch.c - LPC interface for Intel Poulsbo SCH
+ * sch.c - LPC interface for Intel Poulsbo SCH
*
* LPC bridge function of the Intel SCH contains many other
* functional units, such as Interrupt controllers, Timers,
--
2.1.3
next prev parent reply other threads:[~2014-12-11 15:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-11 15:53 [PATCH v1 0/4] mfd: reorganize Intel drivers Andy Shevchenko
2014-12-11 15:53 ` [PATCH v1 1/4] mfd: change a layout for the Intel related drivers Andy Shevchenko
2015-01-20 12:33 ` Andy Shevchenko
2014-12-11 15:53 ` Andy Shevchenko [this message]
2014-12-11 15:53 ` [PATCH v1 3/4] mfd: intel/lpc/ich: move driver to dedicated folder Andy Shevchenko
2014-12-11 15:53 ` [PATCH v1 4/4] mfd: intel/pmic: " Andy Shevchenko
2014-12-11 16:06 ` [PATCH v1 0/4] mfd: reorganize Intel drivers Joe Perches
2014-12-12 10:10 ` Andy Shevchenko
2014-12-12 10:15 ` Joe Perches
2014-12-30 19:29 ` Andy Shevchenko
2015-01-20 13:48 ` Lee Jones
2015-01-20 14:16 ` Andy Shevchenko
2015-01-20 15:46 ` Lee Jones
2015-01-20 16:15 ` 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=1418313236-10764-3-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@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).