* [PATCH v1 1/4] mfd: change a layout for the Intel related drivers
2014-12-11 15:53 [PATCH v1 0/4] mfd: reorganize Intel drivers Andy Shevchenko
@ 2014-12-11 15:53 ` Andy Shevchenko
2015-01-20 12:33 ` Andy Shevchenko
2014-12-11 15:53 ` [PATCH v1 2/4] mfd: intel/lpc/sch: move driver to dedicated folder Andy Shevchenko
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Andy Shevchenko @ 2014-12-11 15:53 UTC (permalink / raw)
To: Lee Jones, linux-kernel, Mika Westerberg; +Cc: Andy Shevchenko
Instead of keeping everything in one folder with long prefixes let us to reoder
files in the tree by moving them in the dedicated folder. Currently we have
drivers for Intel MID platforms, LPC, and few more are coming.
This patch creates a new layout and moves intel_msic driver to it.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/platform/intel-mid/device_libs/platform_msic.c | 2 +-
.../x86/platform/intel-mid/device_libs/platform_msic_audio.c | 2 +-
.../platform/intel-mid/device_libs/platform_msic_battery.c | 2 +-
arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c | 2 +-
arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c | 2 +-
.../platform/intel-mid/device_libs/platform_msic_power_btn.c | 2 +-
.../platform/intel-mid/device_libs/platform_msic_thermal.c | 2 +-
drivers/gpio/gpio-msic.c | 2 +-
drivers/mfd/Kconfig | 12 +++---------
drivers/mfd/Makefile | 3 ++-
drivers/mfd/intel/Kconfig | 5 +++++
drivers/mfd/intel/Makefile | 5 +++++
drivers/mfd/intel/mid/Kconfig | 8 ++++++++
drivers/mfd/intel/mid/Makefile | 1 +
drivers/mfd/{intel_msic.c => intel/mid/msic.c} | 2 +-
drivers/platform/x86/intel_mid_powerbtn.c | 2 +-
drivers/platform/x86/intel_mid_thermal.c | 2 +-
include/linux/mfd/{intel_msic.h => intel/msic.h} | 2 +-
18 files changed, 36 insertions(+), 22 deletions(-)
create mode 100644 drivers/mfd/intel/Kconfig
create mode 100644 drivers/mfd/intel/Makefile
create mode 100644 drivers/mfd/intel/mid/Kconfig
create mode 100644 drivers/mfd/intel/mid/Makefile
rename drivers/mfd/{intel_msic.c => intel/mid/msic.c} (99%)
rename include/linux/mfd/{intel_msic.h => intel/msic.h} (99%)
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic.c b/arch/x86/platform/intel-mid/device_libs/platform_msic.c
index 9f4a775..21ec3ee 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_msic.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic.c
@@ -15,7 +15,7 @@
#include <linux/scatterlist.h>
#include <linux/init.h>
#include <linux/sfi.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
#include <asm/intel_scu_ipc.h>
#include <asm/intel-mid.h>
#include "platform_msic.h"
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c
index 2962939..45e1c493 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c
@@ -16,7 +16,7 @@
#include <linux/init.h>
#include <linux/sfi.h>
#include <linux/platform_device.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
#include <asm/intel-mid.h>
#include "platform_msic.h"
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c
index f446c33..8a6ce11 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c
@@ -15,7 +15,7 @@
#include <linux/scatterlist.h>
#include <linux/init.h>
#include <linux/sfi.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
#include <asm/intel-mid.h>
#include "platform_msic.h"
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c
index 2a4f7b1..1c0e957 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c
@@ -16,7 +16,7 @@
#include <linux/sfi.h>
#include <linux/init.h>
#include <linux/gpio.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
#include <asm/intel-mid.h>
#include "platform_msic.h"
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c
index 6497111..52bb772 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c
@@ -16,7 +16,7 @@
#include <linux/sfi.h>
#include <linux/init.h>
#include <linux/gpio.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
#include <asm/intel-mid.h>
#include "platform_msic.h"
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
index 83a3459..d3633709 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
@@ -14,7 +14,7 @@
#include <linux/scatterlist.h>
#include <linux/sfi.h>
#include <linux/init.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
#include <asm/intel-mid.h>
#include "platform_msic.h"
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c
index a351878..3c7c7b2 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c
@@ -15,7 +15,7 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/platform_device.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
#include <asm/intel-mid.h>
#include "platform_msic.h"
diff --git a/drivers/gpio/gpio-msic.c b/drivers/gpio/gpio-msic.c
index 01acf0a..bfcae0f 100644
--- a/drivers/gpio/gpio-msic.c
+++ b/drivers/gpio/gpio-msic.c
@@ -27,7 +27,7 @@
#include <linux/init.h>
#include <linux/gpio.h>
#include <linux/platform_device.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
/* the offset for the mapping of global gpio pin to irq */
#define MSIC_GPIO_IRQ_OFFSET 0x100
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 2e6b731..729e9cd 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -301,15 +301,6 @@ config INTEL_SOC_PMIC
thermal, charger and related power management functions
on these systems.
-config MFD_INTEL_MSIC
- bool "Intel MSIC"
- depends on INTEL_SCU_IPC
- select MFD_CORE
- help
- Select this option to enable access to Intel MSIC (Avatele
- Passage) chip. This chip embeds audio, battery, GPIO, etc.
- devices used in Intel Medfield platforms.
-
config MFD_IPAQ_MICRO
bool "Atmel Micro ASIC (iPAQ h3100/h3600/h3700) Support"
depends on SA1100_H3100 || SA1100_H3600
@@ -1376,4 +1367,7 @@ config MFD_VEXPRESS_SYSREG
on the ARM Ltd. Versatile Express board.
endmenu
+
+source "drivers/mfd/intel/Kconfig"
+
endif
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 53467e2..11e1945e 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -158,7 +158,6 @@ obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o
obj-$(CONFIG_MFD_TPS65090) += tps65090.o
obj-$(CONFIG_MFD_AAT2870_CORE) += aat2870-core.o
obj-$(CONFIG_MFD_ATMEL_HLCDC) += atmel-hlcdc.o
-obj-$(CONFIG_MFD_INTEL_MSIC) += intel_msic.o
obj-$(CONFIG_MFD_PALMAS) += palmas.o
obj-$(CONFIG_MFD_VIPERBOARD) += viperboard.o
obj-$(CONFIG_MFD_RC5T583) += rc5t583.o rc5t583-irq.o
@@ -177,5 +176,7 @@ obj-$(CONFIG_MFD_MENF21BMC) += menf21bmc.o
obj-$(CONFIG_MFD_HI6421_PMIC) += hi6421-pmic-core.o
obj-$(CONFIG_MFD_DLN2) += dln2.o
+obj-y += intel/
+
intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
diff --git a/drivers/mfd/intel/Kconfig b/drivers/mfd/intel/Kconfig
new file mode 100644
index 0000000..9e376b0
--- /dev/null
+++ b/drivers/mfd/intel/Kconfig
@@ -0,0 +1,5 @@
+#
+# Multifunction devices found on Intel platforms
+#
+
+source "drivers/mfd/intel/mid/Kconfig"
diff --git a/drivers/mfd/intel/Makefile b/drivers/mfd/intel/Makefile
new file mode 100644
index 0000000..8d6b43b
--- /dev/null
+++ b/drivers/mfd/intel/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for multifunction devices found on Intel platforms
+#
+
+obj-y += mid/
diff --git a/drivers/mfd/intel/mid/Kconfig b/drivers/mfd/intel/mid/Kconfig
new file mode 100644
index 0000000..a212f62
--- /dev/null
+++ b/drivers/mfd/intel/mid/Kconfig
@@ -0,0 +1,8 @@
+config MFD_INTEL_MSIC
+ bool "Intel MSIC"
+ depends on INTEL_SCU_IPC
+ select MFD_CORE
+ help
+ Select this option to enable access to Intel MSIC (Avatele
+ Passage) chip. This chip embeds audio, battery, GPIO, etc.
+ devices used in Intel Medfield platforms.
diff --git a/drivers/mfd/intel/mid/Makefile b/drivers/mfd/intel/mid/Makefile
new file mode 100644
index 0000000..e36bfa3
--- /dev/null
+++ b/drivers/mfd/intel/mid/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_MFD_INTEL_MSIC) += msic.o
diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel/mid/msic.c
similarity index 99%
rename from drivers/mfd/intel_msic.c
rename to drivers/mfd/intel/mid/msic.c
index 25d486c..7ef98b4 100644
--- a/drivers/mfd/intel_msic.c
+++ b/drivers/mfd/intel/mid/msic.c
@@ -14,7 +14,7 @@
#include <linux/io.h>
#include <linux/module.h>
#include <linux/mfd/core.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
index 22606d6..b701f88 100644
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -23,7 +23,7 @@
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/input.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
#define DRIVER_NAME "msic_power_btn"
diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c
index 0944e83..d9dc468 100644
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@ -33,7 +33,7 @@
#include <linux/slab.h>
#include <linux/pm.h>
#include <linux/thermal.h>
-#include <linux/mfd/intel_msic.h>
+#include <linux/mfd/intel/msic.h>
/* Number of thermal sensors */
#define MSIC_THERMAL_SENSORS 4
diff --git a/include/linux/mfd/intel_msic.h b/include/linux/mfd/intel/msic.h
similarity index 99%
rename from include/linux/mfd/intel_msic.h
rename to include/linux/mfd/intel/msic.h
index 439a7a6..04c1925 100644
--- a/include/linux/mfd/intel_msic.h
+++ b/include/linux/mfd/intel/msic.h
@@ -1,5 +1,5 @@
/*
- * include/linux/mfd/intel_msic.h - Core interface for Intel MSIC
+ * include/linux/mfd/intel/msic.h - Core interface for Intel MSIC
*
* Copyright (C) 2011, Intel Corporation
* Author: Mika Westerberg <mika.westerberg@linux.intel.com>
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v1 1/4] mfd: change a layout for the Intel related drivers
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
0 siblings, 0 replies; 14+ messages in thread
From: Andy Shevchenko @ 2015-01-20 12:33 UTC (permalink / raw)
To: Lee Jones; +Cc: linux-kernel, Mika Westerberg
On Thu, 2014-12-11 at 17:53 +0200, Andy Shevchenko wrote:
> Instead of keeping everything in one folder with long prefixes let us to reoder
> files in the tree by moving them in the dedicated folder. Currently we have
> drivers for Intel MID platforms, LPC, and few more are coming.
>
> This patch creates a new layout and moves intel_msic driver to it.
>
[]
> @@ -1376,4 +1367,7 @@ config MFD_VEXPRESS_SYSREG
> on the ARM Ltd. Versatile Express board.
>
> endmenu
> +
> +source "drivers/mfd/intel/Kconfig"
> +
> endif
Mika reported that this change should go inside the menu-endmenu block.
--
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v1 2/4] mfd: intel/lpc/sch: move driver to dedicated folder
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
@ 2014-12-11 15:53 ` Andy Shevchenko
2014-12-11 15:53 ` [PATCH v1 3/4] mfd: intel/lpc/ich: " Andy Shevchenko
` (4 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Andy Shevchenko @ 2014-12-11 15:53 UTC (permalink / raw)
To: Lee Jones, linux-kernel, Mika Westerberg; +Cc: Andy Shevchenko
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
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v1 3/4] mfd: intel/lpc/ich: move driver to dedicated folder
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
2014-12-11 15:53 ` [PATCH v1 2/4] mfd: intel/lpc/sch: move driver to dedicated folder Andy Shevchenko
@ 2014-12-11 15:53 ` Andy Shevchenko
2014-12-11 15:53 ` [PATCH v1 4/4] mfd: intel/pmic: " Andy Shevchenko
` (3 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Andy Shevchenko @ 2014-12-11 15:53 UTC (permalink / raw)
To: Lee Jones, linux-kernel, Mika Westerberg; +Cc: Andy Shevchenko
Move the lpc_ich.c module to the dedicated folder. While here, remove the FSF
address since it's subject to change from time to time.
There is no functional change.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/gpio/gpio-ich.c | 2 +-
drivers/mfd/Kconfig | 10 ----------
drivers/mfd/Makefile | 1 -
drivers/mfd/intel/lpc/Kconfig | 10 ++++++++++
drivers/mfd/intel/lpc/Makefile | 1 +
drivers/mfd/{lpc_ich.c => intel/lpc/ich.c} | 10 +++-------
drivers/watchdog/iTCO_wdt.c | 2 +-
include/linux/mfd/{lpc_ich.h => intel/ich.h} | 6 +-----
8 files changed, 17 insertions(+), 25 deletions(-)
rename drivers/mfd/{lpc_ich.c => intel/lpc/ich.c} (98%)
rename include/linux/mfd/{lpc_ich.h => intel/ich.h} (81%)
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
index 7818cd1..0e8532e 100644
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
@@ -24,7 +24,7 @@
#include <linux/pci.h>
#include <linux/gpio.h>
#include <linux/platform_device.h>
-#include <linux/mfd/lpc_ich.h>
+#include <linux/mfd/intel/ich.h>
#define DRV_NAME "gpio_ich"
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e78450f..c8dd9bf 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -271,16 +271,6 @@ config HTC_I2CPLD
This device provides input and output GPIOs through an I2C
interface to one or more sub-chips.
-config LPC_ICH
- tristate "Intel ICH LPC"
- depends on PCI
- select MFD_CORE
- help
- The LPC bridge function of the Intel ICH provides support for
- many functional units. This driver provides needed support for
- other drivers to control these functions, currently GPIO and
- watchdog.
-
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 fa2fa72..63f43ec 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_ICH) += lpc_ich.o
obj-$(CONFIG_MFD_RDC321X) += rdc321x-southbridge.o
obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o
obj-$(CONFIG_MFD_JZ4740_ADC) += jz4740-adc.o
diff --git a/drivers/mfd/intel/lpc/Kconfig b/drivers/mfd/intel/lpc/Kconfig
index f131f96..0949f4a 100644
--- a/drivers/mfd/intel/lpc/Kconfig
+++ b/drivers/mfd/intel/lpc/Kconfig
@@ -5,3 +5,13 @@ config LPC_SCH
help
LPC bridge function of the Intel SCH provides support for
System Management Bus and General Purpose I/O.
+
+config LPC_ICH
+ tristate "Intel ICH LPC"
+ depends on PCI
+ select MFD_CORE
+ help
+ The LPC bridge function of the Intel ICH provides support for
+ many functional units. This driver provides needed support for
+ other drivers to control these functions, currently GPIO and
+ watchdog.
diff --git a/drivers/mfd/intel/lpc/Makefile b/drivers/mfd/intel/lpc/Makefile
index 7503137..710cd7d 100644
--- a/drivers/mfd/intel/lpc/Makefile
+++ b/drivers/mfd/intel/lpc/Makefile
@@ -1 +1,2 @@
obj-$(CONFIG_LPC_SCH) += sch.o
+obj-$(CONFIG_LPC_ICH) += ich.o
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/intel/lpc/ich.c
similarity index 98%
rename from drivers/mfd/lpc_ich.c
rename to drivers/mfd/intel/lpc/ich.c
index f35d428..2b47dbc 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/intel/lpc/ich.c
@@ -1,12 +1,12 @@
/*
- * lpc_ich.c - LPC interface for Intel ICH
+ * ich.c - LPC interface for Intel ICH
*
* LPC bridge function of the Intel ICH contains many other
* functional units, such as Interrupt controllers, Timers,
* Power Management, System Management, GPIO, RTC, and LPC
* Configuration Registers.
*
- * This driver is derived from lpc_sch.
+ * This driver is derived from sch.
* Copyright (c) 2011 Extreme Engineering Solution, Inc.
* Author: Aaron Sierra <asierra@xes-inc.com>
@@ -20,10 +20,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
* This driver supports the following I/O Controller hubs:
* (See the intel documentation on http://developer.intel.com.)
* document number 290655-003, 290677-014: 82801AA (ICH), 82801AB (ICHO)
@@ -65,7 +61,7 @@
#include <linux/acpi.h>
#include <linux/pci.h>
#include <linux/mfd/core.h>
-#include <linux/mfd/lpc_ich.h>
+#include <linux/mfd/intel/ich.h>
#define ACPIBASE 0x40
#define ACPIBASE_GPE_OFF 0x28
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 05ee0bf..250843b 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -66,7 +66,7 @@
#include <linux/uaccess.h> /* For copy_to_user/put_user/... */
#include <linux/io.h> /* For inb/outb/... */
#include <linux/mfd/core.h>
-#include <linux/mfd/lpc_ich.h>
+#include <linux/mfd/intel/ich.h>
#include "iTCO_vendor.h"
diff --git a/include/linux/mfd/lpc_ich.h b/include/linux/mfd/intel/ich.h
similarity index 81%
rename from include/linux/mfd/lpc_ich.h
rename to include/linux/mfd/intel/ich.h
index 8feac78..0d09695 100644
--- a/include/linux/mfd/lpc_ich.h
+++ b/include/linux/mfd/intel/ich.h
@@ -1,5 +1,5 @@
/*
- * linux/drivers/mfd/lpc_ich.h
+ * linux/drivers/mfd/intel/ich.h
*
* Copyright (c) 2012 Extreme Engineering Solution, Inc.
* Author: Aaron Sierra <asierra@xes-inc.com>
@@ -12,10 +12,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef LPC_ICH_H
#define LPC_ICH_H
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v1 4/4] mfd: intel/pmic: move driver to dedicated folder
2014-12-11 15:53 [PATCH v1 0/4] mfd: reorganize Intel drivers Andy Shevchenko
` (2 preceding siblings ...)
2014-12-11 15:53 ` [PATCH v1 3/4] mfd: intel/lpc/ich: " Andy Shevchenko
@ 2014-12-11 15:53 ` Andy Shevchenko
2014-12-11 16:06 ` [PATCH v1 0/4] mfd: reorganize Intel drivers Joe Perches
` (2 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Andy Shevchenko @ 2014-12-11 15:53 UTC (permalink / raw)
To: Lee Jones, linux-kernel, Mika Westerberg; +Cc: Andy Shevchenko
Move the intel_soc_pmic_*.c files to the dedicated folder and rename.
There is no functional change.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/acpi/pmic/intel_pmic_crc.c | 2 +-
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/mfd/Kconfig | 12 ------------
drivers/mfd/Makefile | 3 ---
drivers/mfd/intel/Kconfig | 12 ++++++++++++
drivers/mfd/intel/Makefile | 3 +++
drivers/mfd/{intel_soc_pmic_core.c => intel/pmic_core.c} | 7 ++++---
drivers/mfd/{intel_soc_pmic_core.h => intel/pmic_core.h} | 2 +-
drivers/mfd/{intel_soc_pmic_crc.c => intel/pmic_crc.c} | 7 ++++---
include/linux/mfd/{intel_soc_pmic.h => intel/pmic.h} | 0
10 files changed, 26 insertions(+), 24 deletions(-)
rename drivers/mfd/{intel_soc_pmic_core.c => intel/pmic_core.c} (97%)
rename drivers/mfd/{intel_soc_pmic_core.h => intel/pmic_core.h} (94%)
rename drivers/mfd/{intel_soc_pmic_crc.c => intel/pmic_crc.c} (96%)
rename include/linux/mfd/{intel_soc_pmic.h => intel/pmic.h} (100%)
diff --git a/drivers/acpi/pmic/intel_pmic_crc.c b/drivers/acpi/pmic/intel_pmic_crc.c
index ef7d8ff..f146fc2 100644
--- a/drivers/acpi/pmic/intel_pmic_crc.c
+++ b/drivers/acpi/pmic/intel_pmic_crc.c
@@ -15,7 +15,7 @@
#include <linux/module.h>
#include <linux/acpi.h>
-#include <linux/mfd/intel_soc_pmic.h>
+#include <linux/mfd/intel/pmic.h>
#include <linux/regmap.h>
#include <linux/platform_device.h>
#include "intel_pmic.h"
diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcove.c
index 55d4803..6ecddb4 100644
--- a/drivers/gpio/gpio-crystalcove.c
+++ b/drivers/gpio/gpio-crystalcove.c
@@ -21,7 +21,7 @@
#include <linux/seq_file.h>
#include <linux/bitops.h>
#include <linux/regmap.h>
-#include <linux/mfd/intel_soc_pmic.h>
+#include <linux/mfd/intel/pmic.h>
#define CRYSTALCOVE_GPIO_NUM 16
#define CRYSTALCOVE_VGPIO_NUM 94
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index c8dd9bf..0d9d508 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -271,18 +271,6 @@ config HTC_I2CPLD
This device provides input and output GPIOs through an I2C
interface to one or more sub-chips.
-config INTEL_SOC_PMIC
- bool "Support for Intel Atom SoC PMIC"
- depends on I2C=y
- select MFD_CORE
- select REGMAP_I2C
- select REGMAP_IRQ
- help
- Select this option to enable support for the PMIC device
- on some Intel SoC systems. The PMIC provides ADC, GPIO,
- thermal, charger and related power management functions
- on these systems.
-
config MFD_IPAQ_MICRO
bool "Atmel Micro ASIC (iPAQ h3100/h3600/h3700) Support"
depends on SA1100_H3100 || SA1100_H3600
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 63f43ec..0979a73 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -175,6 +175,3 @@ obj-$(CONFIG_MFD_HI6421_PMIC) += hi6421-pmic-core.o
obj-$(CONFIG_MFD_DLN2) += dln2.o
obj-y += intel/
-
-intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
-obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
diff --git a/drivers/mfd/intel/Kconfig b/drivers/mfd/intel/Kconfig
index 5d2341f..5e86f3a 100644
--- a/drivers/mfd/intel/Kconfig
+++ b/drivers/mfd/intel/Kconfig
@@ -5,3 +5,15 @@
source "drivers/mfd/intel/mid/Kconfig"
source "drivers/mfd/intel/lpc/Kconfig"
+
+config INTEL_SOC_PMIC
+ bool "Support for Intel Atom SoC PMIC"
+ depends on I2C=y
+ select MFD_CORE
+ select REGMAP_I2C
+ select REGMAP_IRQ
+ help
+ Select this option to enable support for the PMIC device
+ on some Intel SoC systems. The PMIC provides ADC, GPIO,
+ thermal, charger and related power management functions
+ on these systems.
diff --git a/drivers/mfd/intel/Makefile b/drivers/mfd/intel/Makefile
index 8264a26..a9ab8f1 100644
--- a/drivers/mfd/intel/Makefile
+++ b/drivers/mfd/intel/Makefile
@@ -4,3 +4,6 @@
obj-y += mid/
obj-y += lpc/
+
+intel-soc-pmic-objs := pmic_core.o pmic_crc.o
+obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel/pmic_core.c
similarity index 97%
rename from drivers/mfd/intel_soc_pmic_core.c
rename to drivers/mfd/intel/pmic_core.c
index df7b064..c6e4f2b 100644
--- a/drivers/mfd/intel_soc_pmic_core.c
+++ b/drivers/mfd/intel/pmic_core.c
@@ -1,5 +1,5 @@
/*
- * intel_soc_pmic_core.c - Intel SoC PMIC MFD Driver
+ * pmic_core.c - Intel SoC PMIC MFD Driver
*
* Copyright (C) 2013, 2014 Intel Corporation. All rights reserved.
*
@@ -23,8 +23,9 @@
#include <linux/gpio/consumer.h>
#include <linux/acpi.h>
#include <linux/regmap.h>
-#include <linux/mfd/intel_soc_pmic.h>
-#include "intel_soc_pmic_core.h"
+#include <linux/mfd/intel/pmic.h>
+
+#include "pmic_core.h"
/*
* On some boards the PMIC interrupt may come from a GPIO line.
diff --git a/drivers/mfd/intel_soc_pmic_core.h b/drivers/mfd/intel/pmic_core.h
similarity index 94%
rename from drivers/mfd/intel_soc_pmic_core.h
rename to drivers/mfd/intel/pmic_core.h
index 33aacd9..f6535b0 100644
--- a/drivers/mfd/intel_soc_pmic_core.h
+++ b/drivers/mfd/intel/pmic_core.h
@@ -1,5 +1,5 @@
/*
- * intel_soc_pmic_core.h - Intel SoC PMIC MFD Driver
+ * pmic_core.h - Intel SoC PMIC MFD Driver
*
* Copyright (C) 2012-2014 Intel Corporation. All rights reserved.
*
diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel/pmic_crc.c
similarity index 96%
rename from drivers/mfd/intel_soc_pmic_crc.c
rename to drivers/mfd/intel/pmic_crc.c
index c85e2ec..888216c 100644
--- a/drivers/mfd/intel_soc_pmic_crc.c
+++ b/drivers/mfd/intel/pmic_crc.c
@@ -1,5 +1,5 @@
/*
- * intel_soc_pmic_crc.c - Device access for Crystal Cove PMIC
+ * pmic_crc.c - Device access for Crystal Cove PMIC
*
* Copyright (C) 2013, 2014 Intel Corporation. All rights reserved.
*
@@ -19,8 +19,9 @@
#include <linux/mfd/core.h>
#include <linux/interrupt.h>
#include <linux/regmap.h>
-#include <linux/mfd/intel_soc_pmic.h>
-#include "intel_soc_pmic_core.h"
+#include <linux/mfd/intel/pmic.h>
+
+#include "pmic_core.h"
#define CRYSTAL_COVE_MAX_REGISTER 0xC6
diff --git a/include/linux/mfd/intel_soc_pmic.h b/include/linux/mfd/intel/pmic.h
similarity index 100%
rename from include/linux/mfd/intel_soc_pmic.h
rename to include/linux/mfd/intel/pmic.h
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v1 0/4] mfd: reorganize Intel drivers
2014-12-11 15:53 [PATCH v1 0/4] mfd: reorganize Intel drivers Andy Shevchenko
` (3 preceding siblings ...)
2014-12-11 15:53 ` [PATCH v1 4/4] mfd: intel/pmic: " Andy Shevchenko
@ 2014-12-11 16:06 ` Joe Perches
2014-12-12 10:10 ` Andy Shevchenko
2014-12-30 19:29 ` Andy Shevchenko
2015-01-20 13:48 ` Lee Jones
6 siblings, 1 reply; 14+ messages in thread
From: Joe Perches @ 2014-12-11 16:06 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Lee Jones, linux-kernel, Mika Westerberg
On Thu, 2014-12-11 at 17:53 +0200, Andy Shevchenko wrote:
> This patchset creates a new folder under drivers/mfd and moves there Intel
> related drivers.
Missing update of MAINTAINERS?
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v1 0/4] mfd: reorganize Intel drivers
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
0 siblings, 1 reply; 14+ messages in thread
From: Andy Shevchenko @ 2014-12-12 10:10 UTC (permalink / raw)
To: Joe Perches; +Cc: Lee Jones, linux-kernel, Mika Westerberg
On Thu, 2014-12-11 at 08:06 -0800, Joe Perches wrote:
> On Thu, 2014-12-11 at 17:53 +0200, Andy Shevchenko wrote:
> > This patchset creates a new folder under drivers/mfd and moves there Intel
> > related drivers.
>
> Missing update of MAINTAINERS?
Oh, right. I could send a follow up patch or update each patch in the
series. What is the best approach here?
Will wait for more comments, especially from Lee.
--
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v1 0/4] mfd: reorganize Intel drivers
2014-12-12 10:10 ` Andy Shevchenko
@ 2014-12-12 10:15 ` Joe Perches
0 siblings, 0 replies; 14+ messages in thread
From: Joe Perches @ 2014-12-12 10:15 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Lee Jones, linux-kernel, Mika Westerberg
On Fri, 2014-12-12 at 12:10 +0200, Andy Shevchenko wrote:
> On Thu, 2014-12-11 at 08:06 -0800, Joe Perches wrote:
> > On Thu, 2014-12-11 at 17:53 +0200, Andy Shevchenko wrote:
> > > This patchset creates a new folder under drivers/mfd and moves there Intel
> > > related drivers.
> >
> > Missing update of MAINTAINERS?
>
> Oh, right. I could send a follow up patch or update each patch in the
> series. What is the best approach here?
I think it'd be fine to send another patch later on
if/after this is applied.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v1 0/4] mfd: reorganize Intel drivers
2014-12-11 15:53 [PATCH v1 0/4] mfd: reorganize Intel drivers Andy Shevchenko
` (4 preceding siblings ...)
2014-12-11 16:06 ` [PATCH v1 0/4] mfd: reorganize Intel drivers Joe Perches
@ 2014-12-30 19:29 ` Andy Shevchenko
2015-01-20 13:48 ` Lee Jones
6 siblings, 0 replies; 14+ messages in thread
From: Andy Shevchenko @ 2014-12-30 19:29 UTC (permalink / raw)
To: Lee Jones; +Cc: linux-kernel, Mika Westerberg
On Thu, 2014-12-11 at 17:53 +0200, Andy Shevchenko wrote:
> This patchset creates a new folder under drivers/mfd and moves there Intel
> related drivers.
>
> There is no functional change. The names of the kernel configuration variables
> are kept the same.
Lee, gentle ping for this series. What do you think besides the
necessity of updating MAINTAINERS file?
>
> Andy Shevchenko (4):
> mfd: change a layout for the Intel related drivers
> mfd: intel/lpc/sch: move driver to dedicated folder
> mfd: intel/lpc/ich: move driver to dedicated folder
> mfd: intel/pmic: move driver to dedicated folder
>
> .../platform/intel-mid/device_libs/platform_msic.c | 2 +-
> .../intel-mid/device_libs/platform_msic_audio.c | 2 +-
> .../intel-mid/device_libs/platform_msic_battery.c | 2 +-
> .../intel-mid/device_libs/platform_msic_gpio.c | 2 +-
> .../intel-mid/device_libs/platform_msic_ocd.c | 2 +-
> .../device_libs/platform_msic_power_btn.c | 2 +-
> .../intel-mid/device_libs/platform_msic_thermal.c | 2 +-
> drivers/acpi/pmic/intel_pmic_crc.c | 2 +-
> drivers/gpio/gpio-crystalcove.c | 2 +-
> drivers/gpio/gpio-ich.c | 2 +-
> drivers/gpio/gpio-msic.c | 2 +-
> drivers/mfd/Kconfig | 42 ++--------------------
> drivers/mfd/Makefile | 6 +---
> drivers/mfd/intel/Kconfig | 19 ++++++++++
> drivers/mfd/intel/Makefile | 9 +++++
> drivers/mfd/intel/lpc/Kconfig | 17 +++++++++
> drivers/mfd/intel/lpc/Makefile | 2 ++
> drivers/mfd/{lpc_ich.c => intel/lpc/ich.c} | 10 ++----
> drivers/mfd/{lpc_sch.c => intel/lpc/sch.c} | 2 +-
> drivers/mfd/intel/mid/Kconfig | 8 +++++
> drivers/mfd/intel/mid/Makefile | 1 +
> drivers/mfd/{intel_msic.c => intel/mid/msic.c} | 2 +-
> .../{intel_soc_pmic_core.c => intel/pmic_core.c} | 7 ++--
> .../{intel_soc_pmic_core.h => intel/pmic_core.h} | 2 +-
> .../mfd/{intel_soc_pmic_crc.c => intel/pmic_crc.c} | 7 ++--
> drivers/platform/x86/intel_mid_powerbtn.c | 2 +-
> drivers/platform/x86/intel_mid_thermal.c | 2 +-
> drivers/watchdog/iTCO_wdt.c | 2 +-
> include/linux/mfd/{lpc_ich.h => intel/ich.h} | 6 +---
> include/linux/mfd/{intel_msic.h => intel/msic.h} | 2 +-
> .../linux/mfd/{intel_soc_pmic.h => intel/pmic.h} | 0
> 31 files changed, 90 insertions(+), 80 deletions(-)
> create mode 100644 drivers/mfd/intel/Kconfig
> create mode 100644 drivers/mfd/intel/Makefile
> create mode 100644 drivers/mfd/intel/lpc/Kconfig
> create mode 100644 drivers/mfd/intel/lpc/Makefile
> rename drivers/mfd/{lpc_ich.c => intel/lpc/ich.c} (98%)
> rename drivers/mfd/{lpc_sch.c => intel/lpc/sch.c} (99%)
> create mode 100644 drivers/mfd/intel/mid/Kconfig
> create mode 100644 drivers/mfd/intel/mid/Makefile
> rename drivers/mfd/{intel_msic.c => intel/mid/msic.c} (99%)
> rename drivers/mfd/{intel_soc_pmic_core.c => intel/pmic_core.c} (97%)
> rename drivers/mfd/{intel_soc_pmic_core.h => intel/pmic_core.h} (94%)
> rename drivers/mfd/{intel_soc_pmic_crc.c => intel/pmic_crc.c} (96%)
> rename include/linux/mfd/{lpc_ich.h => intel/ich.h} (81%)
> rename include/linux/mfd/{intel_msic.h => intel/msic.h} (99%)
> rename include/linux/mfd/{intel_soc_pmic.h => intel/pmic.h} (100%)
>
--
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v1 0/4] mfd: reorganize Intel drivers
2014-12-11 15:53 [PATCH v1 0/4] mfd: reorganize Intel drivers Andy Shevchenko
` (5 preceding siblings ...)
2014-12-30 19:29 ` Andy Shevchenko
@ 2015-01-20 13:48 ` Lee Jones
2015-01-20 14:16 ` Andy Shevchenko
6 siblings, 1 reply; 14+ messages in thread
From: Lee Jones @ 2015-01-20 13:48 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: linux-kernel, Mika Westerberg
On Thu, 11 Dec 2014, Andy Shevchenko wrote:
> This patchset creates a new folder under drivers/mfd and moves there Intel
> related drivers.
>
> There is no functional change. The names of the kernel configuration variables
> are kept the same.
Can you explain to me why you think the Intel drivers need their own
sub-directory please?
> Andy Shevchenko (4):
> mfd: change a layout for the Intel related drivers
> mfd: intel/lpc/sch: move driver to dedicated folder
> mfd: intel/lpc/ich: move driver to dedicated folder
> mfd: intel/pmic: move driver to dedicated folder
>
> .../platform/intel-mid/device_libs/platform_msic.c | 2 +-
> .../intel-mid/device_libs/platform_msic_audio.c | 2 +-
> .../intel-mid/device_libs/platform_msic_battery.c | 2 +-
> .../intel-mid/device_libs/platform_msic_gpio.c | 2 +-
> .../intel-mid/device_libs/platform_msic_ocd.c | 2 +-
> .../device_libs/platform_msic_power_btn.c | 2 +-
> .../intel-mid/device_libs/platform_msic_thermal.c | 2 +-
> drivers/acpi/pmic/intel_pmic_crc.c | 2 +-
> drivers/gpio/gpio-crystalcove.c | 2 +-
> drivers/gpio/gpio-ich.c | 2 +-
> drivers/gpio/gpio-msic.c | 2 +-
> drivers/mfd/Kconfig | 42 ++--------------------
> drivers/mfd/Makefile | 6 +---
> drivers/mfd/intel/Kconfig | 19 ++++++++++
> drivers/mfd/intel/Makefile | 9 +++++
> drivers/mfd/intel/lpc/Kconfig | 17 +++++++++
> drivers/mfd/intel/lpc/Makefile | 2 ++
> drivers/mfd/{lpc_ich.c => intel/lpc/ich.c} | 10 ++----
> drivers/mfd/{lpc_sch.c => intel/lpc/sch.c} | 2 +-
> drivers/mfd/intel/mid/Kconfig | 8 +++++
> drivers/mfd/intel/mid/Makefile | 1 +
> drivers/mfd/{intel_msic.c => intel/mid/msic.c} | 2 +-
> .../{intel_soc_pmic_core.c => intel/pmic_core.c} | 7 ++--
> .../{intel_soc_pmic_core.h => intel/pmic_core.h} | 2 +-
> .../mfd/{intel_soc_pmic_crc.c => intel/pmic_crc.c} | 7 ++--
> drivers/platform/x86/intel_mid_powerbtn.c | 2 +-
> drivers/platform/x86/intel_mid_thermal.c | 2 +-
> drivers/watchdog/iTCO_wdt.c | 2 +-
> include/linux/mfd/{lpc_ich.h => intel/ich.h} | 6 +---
> include/linux/mfd/{intel_msic.h => intel/msic.h} | 2 +-
> .../linux/mfd/{intel_soc_pmic.h => intel/pmic.h} | 0
> 31 files changed, 90 insertions(+), 80 deletions(-)
> create mode 100644 drivers/mfd/intel/Kconfig
> create mode 100644 drivers/mfd/intel/Makefile
> create mode 100644 drivers/mfd/intel/lpc/Kconfig
> create mode 100644 drivers/mfd/intel/lpc/Makefile
> rename drivers/mfd/{lpc_ich.c => intel/lpc/ich.c} (98%)
> rename drivers/mfd/{lpc_sch.c => intel/lpc/sch.c} (99%)
> create mode 100644 drivers/mfd/intel/mid/Kconfig
> create mode 100644 drivers/mfd/intel/mid/Makefile
> rename drivers/mfd/{intel_msic.c => intel/mid/msic.c} (99%)
> rename drivers/mfd/{intel_soc_pmic_core.c => intel/pmic_core.c} (97%)
> rename drivers/mfd/{intel_soc_pmic_core.h => intel/pmic_core.h} (94%)
> rename drivers/mfd/{intel_soc_pmic_crc.c => intel/pmic_crc.c} (96%)
> rename include/linux/mfd/{lpc_ich.h => intel/ich.h} (81%)
> rename include/linux/mfd/{intel_msic.h => intel/msic.h} (99%)
> rename include/linux/mfd/{intel_soc_pmic.h => intel/pmic.h} (100%)
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v1 0/4] mfd: reorganize Intel drivers
2015-01-20 13:48 ` Lee Jones
@ 2015-01-20 14:16 ` Andy Shevchenko
2015-01-20 15:46 ` Lee Jones
0 siblings, 1 reply; 14+ messages in thread
From: Andy Shevchenko @ 2015-01-20 14:16 UTC (permalink / raw)
To: Lee Jones; +Cc: linux-kernel, Mika Westerberg
On Tue, 2015-01-20 at 13:48 +0000, Lee Jones wrote:
> On Thu, 11 Dec 2014, Andy Shevchenko wrote:
>
> > This patchset creates a new folder under drivers/mfd and moves there Intel
> > related drivers.
> >
> > There is no functional change. The names of the kernel configuration variables
> > are kept the same.
>
> Can you explain to me why you think the Intel drivers need their own
> sub-directory please?
For me it seems logical. We have many drivers related to Intel specific
SoCs (in comparison the other mfd drivers that usually named in
according to some standard chip codename) and they meanwhile have long
awkward prefixes. Moreover they could share common dependencies like
X86.
--
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v1 0/4] mfd: reorganize Intel drivers
2015-01-20 14:16 ` Andy Shevchenko
@ 2015-01-20 15:46 ` Lee Jones
2015-01-20 16:15 ` Andy Shevchenko
0 siblings, 1 reply; 14+ messages in thread
From: Lee Jones @ 2015-01-20 15:46 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: linux-kernel, Mika Westerberg
On Tue, 20 Jan 2015, Andy Shevchenko wrote:
> On Tue, 2015-01-20 at 13:48 +0000, Lee Jones wrote:
> > On Thu, 11 Dec 2014, Andy Shevchenko wrote:
> >
> > > This patchset creates a new folder under drivers/mfd and moves there Intel
> > > related drivers.
> > >
> > > There is no functional change. The names of the kernel configuration variables
> > > are kept the same.
> >
> > Can you explain to me why you think the Intel drivers need their own
> > sub-directory please?
>
> For me it seems logical. We have many drivers related to Intel specific
> SoCs (in comparison the other mfd drivers that usually named in
> according to some standard chip codename) and they meanwhile have long
> awkward prefixes. Moreover they could share common dependencies like
> X86.
I'm not comfortable with it and am yet to see the need. What I would
suggest is to prefix 'intel-' or similar to the related files. From
there we can see how overbearing the files are becoming and make a
decision based on that.
If there are too many Intel related files, my first question(s) will
be a) why are there so many files b) are so many files required and c)
should they really live in MFD.
But as yet, this patch-set is the only indication that something needs
to be done at all.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v1 0/4] mfd: reorganize Intel drivers
2015-01-20 15:46 ` Lee Jones
@ 2015-01-20 16:15 ` Andy Shevchenko
0 siblings, 0 replies; 14+ messages in thread
From: Andy Shevchenko @ 2015-01-20 16:15 UTC (permalink / raw)
To: Lee Jones; +Cc: linux-kernel, Mika Westerberg
On Tue, 2015-01-20 at 15:46 +0000, Lee Jones wrote:
> On Tue, 20 Jan 2015, Andy Shevchenko wrote:
>
> > On Tue, 2015-01-20 at 13:48 +0000, Lee Jones wrote:
> > > On Thu, 11 Dec 2014, Andy Shevchenko wrote:
> > >
> > > > This patchset creates a new folder under drivers/mfd and moves there Intel
> > > > related drivers.
> > > >
> > > > There is no functional change. The names of the kernel configuration variables
> > > > are kept the same.
> > >
> > > Can you explain to me why you think the Intel drivers need their own
> > > sub-directory please?
> >
> > For me it seems logical. We have many drivers related to Intel specific
> > SoCs (in comparison the other mfd drivers that usually named in
> > according to some standard chip codename) and they meanwhile have long
> > awkward prefixes. Moreover they could share common dependencies like
> > X86.
>
> I'm not comfortable with it and am yet to see the need. What I would
> suggest is to prefix 'intel-' or similar to the related files. From
> there we can see how overbearing the files are becoming and make a
> decision based on that.
>
> If there are too many Intel related files, my first question(s) will
> be a) why are there so many files b) are so many files required and c)
> should they really live in MFD.
>
> But as yet, this patch-set is the only indication that something needs
> to be done at all.
>
Agreed. We will continue to use prefixes (intel_ for *.c, *.h files, and
module names, and intel- for resulting *.ko files) and simultaneously
think how we can arrange the files better.
--
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 14+ messages in thread