From: Hans de Goede <hdegoede@redhat.com>
To: Henning Schild <henning.schild@siemens.com>,
Lee Jones <lee@kernel.org>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org,
platform-driver-x86@vger.kernel.org,
linux-watchdog@vger.kernel.org
Cc: Pavel Machek <pavel@ucw.cz>, Mark Gross <markgross@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Tobias Schaffner <tobias.schaffner@siemens.com>
Subject: Re: [PATCH v2 3/3] platform/x86: Move all simatic ipc drivers to the subdirectory siemens
Date: Mon, 31 Jul 2023 12:46:56 +0200 [thread overview]
Message-ID: <befb4205-2457-1e9f-1722-c583642a6607@redhat.com> (raw)
In-Reply-To: <20230719153518.13073-4-henning.schild@siemens.com>
Hi,
On 7/19/23 17:35, Henning Schild wrote:
> With more files around move everything to a subdirectory. Users will
> only see the several options once they enable the main one.
>
> Suggested-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
Thank you, I have merged this entire series into
the platform-drivers-x86-simatic-ipc branch now:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=platform-drivers-x86-simatic-ipc
I did make 2 small changes to patch 3/3 while merging:
1. Only decend into the siemens subdir if CONFIG_SIEMENS_SIMATIC_IPC is set:
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -131,7 +131,7 @@ obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o
obj-$(CONFIG_X86_INTEL_LPSS) += pmc_atom.o
# Siemens Simatic Industrial PCs
-obj-y += siemens/
+obj-$(CONFIG_SIEMENS_SIMATIC_IPC) += siemens/
# Winmate
obj-$(CONFIG_WINMATE_FM07_KEYS) += winmate-fm07-keys.o
2. Move the "default SIEMENS_SIMATIC_IPC*" lines to directly under
the "tristate ..." lines as suggested by Andy.
Note it will show up there once I've pushed my
local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be
merged into the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.
Regards,
Hans
> ---
> drivers/platform/x86/Kconfig | 59 +----------------
> drivers/platform/x86/Makefile | 6 +-
> drivers/platform/x86/siemens/Kconfig | 63 +++++++++++++++++++
> drivers/platform/x86/siemens/Makefile | 11 ++++
> .../simatic-ipc-batt-apollolake.c | 0
> .../simatic-ipc-batt-elkhartlake.c | 0
> .../{ => siemens}/simatic-ipc-batt-f7188x.c | 0
> .../x86/{ => siemens}/simatic-ipc-batt.c | 0
> .../x86/{ => siemens}/simatic-ipc-batt.h | 0
> .../platform/x86/{ => siemens}/simatic-ipc.c | 0
> 10 files changed, 76 insertions(+), 63 deletions(-)
> create mode 100644 drivers/platform/x86/siemens/Kconfig
> create mode 100644 drivers/platform/x86/siemens/Makefile
> rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt-apollolake.c (100%)
> rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt-elkhartlake.c (100%)
> rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt-f7188x.c (100%)
> rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt.c (100%)
> rename drivers/platform/x86/{ => siemens}/simatic-ipc-batt.h (100%)
> rename drivers/platform/x86/{ => siemens}/simatic-ipc.c (100%)
>
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 487d3d8f4da9..f5fcb1ca1b63 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1074,64 +1074,7 @@ config INTEL_SCU_IPC_UTIL
> low level access for debug work and updating the firmware. Say
> N unless you will be doing this on an Intel MID platform.
>
> -config SIEMENS_SIMATIC_IPC
> - tristate "Siemens Simatic IPC Class driver"
> - help
> - This Simatic IPC class driver is the central of several drivers. It
> - is mainly used for system identification, after which drivers in other
> - classes will take care of driving specifics of those machines.
> - i.e. LEDs and watchdog.
> -
> - To compile this driver as a module, choose M here: the module
> - will be called simatic-ipc.
> -
> -config SIEMENS_SIMATIC_IPC_BATT
> - tristate "CMOS battery driver for Siemens Simatic IPCs"
> - depends on HWMON
> - depends on SIEMENS_SIMATIC_IPC
> - default SIEMENS_SIMATIC_IPC
> - help
> - This option enables support for monitoring the voltage of the CMOS
> - batteries of several Industrial PCs from Siemens.
> -
> - To compile this driver as a module, choose M here: the module
> - will be called simatic-ipc-batt.
> -
> -config SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE
> - tristate "CMOS Battery monitoring for Simatic IPCs based on Apollo Lake GPIO"
> - depends on PINCTRL_BROXTON
> - depends on SIEMENS_SIMATIC_IPC_BATT
> - default SIEMENS_SIMATIC_IPC_BATT
> - help
> - This option enables CMOS battery monitoring for Simatic Industrial PCs
> - from Siemens based on Apollo Lake GPIO.
> -
> - To compile this driver as a module, choose M here: the module
> - will be called simatic-ipc-batt-apollolake.
> -
> -config SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE
> - tristate "CMOS Battery monitoring for Simatic IPCs based on Elkhart Lake GPIO"
> - depends on PINCTRL_ELKHARTLAKE
> - depends on SIEMENS_SIMATIC_IPC_BATT
> - default SIEMENS_SIMATIC_IPC_BATT
> - help
> - This option enables CMOS battery monitoring for Simatic Industrial PCs
> - from Siemens based on Elkhart Lake GPIO.
> -
> - To compile this driver as a module, choose M here: the module
> - will be called simatic-ipc-batt-elkhartlake.
> -
> -config SIEMENS_SIMATIC_IPC_BATT_F7188X
> - tristate "CMOS Battery monitoring for Simatic IPCs based on Nuvoton GPIO"
> - depends on GPIO_F7188X
> - depends on SIEMENS_SIMATIC_IPC_BATT
> - default SIEMENS_SIMATIC_IPC_BATT
> - help
> - This option enables CMOS battery monitoring for Simatic Industrial PCs
> - from Siemens based on Nuvoton GPIO.
> -
> - To compile this driver as a module, choose M here: the module
> - will be called simatic-ipc-batt-elkhartlake.
> +source "drivers/platform/x86/siemens/Kconfig"
>
> config WINMATE_FM07_KEYS
> tristate "Winmate FM07/FM07P front-panel keys driver"
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 522da0d1584d..d4a6c18d0dde 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -131,11 +131,7 @@ obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o
> obj-$(CONFIG_X86_INTEL_LPSS) += pmc_atom.o
>
> # Siemens Simatic Industrial PCs
> -obj-$(CONFIG_SIEMENS_SIMATIC_IPC) += simatic-ipc.o
> -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT) += simatic-ipc-batt.o
> -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE) += simatic-ipc-batt-apollolake.o
> -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE) += simatic-ipc-batt-elkhartlake.o
> -obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X) += simatic-ipc-batt-f7188x.o
> +obj-y += siemens/
>
> # Winmate
> obj-$(CONFIG_WINMATE_FM07_KEYS) += winmate-fm07-keys.o
> diff --git a/drivers/platform/x86/siemens/Kconfig b/drivers/platform/x86/siemens/Kconfig
> new file mode 100644
> index 000000000000..8e78dc609a38
> --- /dev/null
> +++ b/drivers/platform/x86/siemens/Kconfig
> @@ -0,0 +1,63 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Siemens X86 Platform Specific Drivers
> +#
> +
> +config SIEMENS_SIMATIC_IPC
> + tristate "Siemens Simatic IPC Class driver"
> + help
> + This Simatic IPC class driver is the central of several drivers. It
> + is mainly used for system identification, after which drivers in other
> + classes will take care of driving specifics of those machines.
> + i.e. LEDs and watchdog.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called simatic-ipc.
> +
> +config SIEMENS_SIMATIC_IPC_BATT
> + tristate "CMOS battery driver for Siemens Simatic IPCs"
> + depends on HWMON
> + depends on SIEMENS_SIMATIC_IPC
> + default SIEMENS_SIMATIC_IPC
> + help
> + This option enables support for monitoring the voltage of the CMOS
> + batteries of several Industrial PCs from Siemens.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called simatic-ipc-batt.
> +
> +config SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE
> + tristate "CMOS Battery monitoring for Simatic IPCs based on Apollo Lake GPIO"
> + depends on PINCTRL_BROXTON
> + depends on SIEMENS_SIMATIC_IPC_BATT
> + default SIEMENS_SIMATIC_IPC_BATT
> + help
> + This option enables CMOS battery monitoring for Simatic Industrial PCs
> + from Siemens based on Apollo Lake GPIO.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called simatic-ipc-batt-apollolake.
> +
> +config SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE
> + tristate "CMOS Battery monitoring for Simatic IPCs based on Elkhart Lake GPIO"
> + depends on PINCTRL_ELKHARTLAKE
> + depends on SIEMENS_SIMATIC_IPC_BATT
> + default SIEMENS_SIMATIC_IPC_BATT
> + help
> + This option enables CMOS battery monitoring for Simatic Industrial PCs
> + from Siemens based on Elkhart Lake GPIO.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called simatic-ipc-batt-elkhartlake.
> +
> +config SIEMENS_SIMATIC_IPC_BATT_F7188X
> + tristate "CMOS Battery monitoring for Simatic IPCs based on Nuvoton GPIO"
> + depends on GPIO_F7188X
> + depends on SIEMENS_SIMATIC_IPC_BATT
> + default SIEMENS_SIMATIC_IPC_BATT
> + help
> + This option enables CMOS battery monitoring for Simatic Industrial PCs
> + from Siemens based on Nuvoton GPIO.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called simatic-ipc-batt-elkhartlake.
> diff --git a/drivers/platform/x86/siemens/Makefile b/drivers/platform/x86/siemens/Makefile
> new file mode 100644
> index 000000000000..2b384b4cb8ba
> --- /dev/null
> +++ b/drivers/platform/x86/siemens/Makefile
> @@ -0,0 +1,11 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Makefile for linux/drivers/platform/x86/siemens
> +# Siemens x86 Platform-Specific Drivers
> +#
> +
> +obj-$(CONFIG_SIEMENS_SIMATIC_IPC) += simatic-ipc.o
> +obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT) += simatic-ipc-batt.o
> +obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE) += simatic-ipc-batt-apollolake.o
> +obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE) += simatic-ipc-batt-elkhartlake.o
> +obj-$(CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X) += simatic-ipc-batt-f7188x.o
> diff --git a/drivers/platform/x86/simatic-ipc-batt-apollolake.c b/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c
> similarity index 100%
> rename from drivers/platform/x86/simatic-ipc-batt-apollolake.c
> rename to drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c
> diff --git a/drivers/platform/x86/simatic-ipc-batt-elkhartlake.c b/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c
> similarity index 100%
> rename from drivers/platform/x86/simatic-ipc-batt-elkhartlake.c
> rename to drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c
> diff --git a/drivers/platform/x86/simatic-ipc-batt-f7188x.c b/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c
> similarity index 100%
> rename from drivers/platform/x86/simatic-ipc-batt-f7188x.c
> rename to drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c
> diff --git a/drivers/platform/x86/simatic-ipc-batt.c b/drivers/platform/x86/siemens/simatic-ipc-batt.c
> similarity index 100%
> rename from drivers/platform/x86/simatic-ipc-batt.c
> rename to drivers/platform/x86/siemens/simatic-ipc-batt.c
> diff --git a/drivers/platform/x86/simatic-ipc-batt.h b/drivers/platform/x86/siemens/simatic-ipc-batt.h
> similarity index 100%
> rename from drivers/platform/x86/simatic-ipc-batt.h
> rename to drivers/platform/x86/siemens/simatic-ipc-batt.h
> diff --git a/drivers/platform/x86/simatic-ipc.c b/drivers/platform/x86/siemens/simatic-ipc.c
> similarity index 100%
> rename from drivers/platform/x86/simatic-ipc.c
> rename to drivers/platform/x86/siemens/simatic-ipc.c
next prev parent reply other threads:[~2023-07-31 10:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 15:35 [PATCH v2 0/3] platform/x86: move simatic drivers into subdir Henning Schild
2023-07-19 15:35 ` [PATCH v2 1/3] watchdog: make Siemens Simatic watchdog driver default on platform Henning Schild
2023-07-19 16:33 ` Guenter Roeck
2023-07-19 15:35 ` [PATCH v2 2/3] leds: simatic-ipc-leds: default config switch to platform switch Henning Schild
2023-07-24 9:17 ` Lee Jones
2023-07-19 15:35 ` [PATCH v2 3/3] platform/x86: Move all simatic ipc drivers to the subdirectory siemens Henning Schild
2023-07-31 10:46 ` Hans de Goede [this message]
2023-07-19 16:06 ` [PATCH v2 0/3] platform/x86: move simatic drivers into subdir Andy Shevchenko
2023-07-25 14:27 ` Hans de Goede
2023-07-27 9:26 ` Lee Jones
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=befb4205-2457-1e9f-1722-c583642a6607@redhat.com \
--to=hdegoede@redhat.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=henning.schild@siemens.com \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=markgross@kernel.org \
--cc=pavel@ucw.cz \
--cc=platform-driver-x86@vger.kernel.org \
--cc=tobias.schaffner@siemens.com \
--cc=wim@linux-watchdog.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