Commit 17ffe3a0 authored by Hans de Goede's avatar Hans de Goede
Browse files

Merge tag 'ib-pdx86-simatic-v6.6-2' into review-hans 

Immutable branch between pdx86 simatic branch and LED due for the v6.6 merge window

ib-pdx86-simatic-v6.6-2: v6.5-rc1 + ib-pdx86-simatic-v6.6 +
more recent pdx86 simatic-ipc patches for merging into
the LED subsystem for v6.6.
parents d4e695c0 c56beff2

drivers/leds/simple/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config LEDS_SIEMENS_SIMATIC_IPC

	tristate "LED driver for Siemens Simatic IPCs"

	depends on SIEMENS_SIMATIC_IPC

	default y

	help

	  This option enables support for the LEDs of several Industrial PCs

	  from Siemens.

drivers/platform/x86/Kconfig

+1 −58
Original line number Diff line number Diff line
@@ -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"

drivers/platform/x86/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -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-$(CONFIG_SIEMENS_SIMATIC_IPC)	+= siemens/



# Winmate

obj-$(CONFIG_WINMATE_FM07_KEYS)		+= winmate-fm07-keys.o

drivers/platform/x86/siemens/Kconfig

0 → 100644
+64 −0
Original line number Diff line number Diff line 
# 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"

	default SIEMENS_SIMATIC_IPC

	depends on HWMON

	depends on 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"

	default SIEMENS_SIMATIC_IPC_BATT

	depends on PINCTRL_BROXTON

	depends on 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"

	default SIEMENS_SIMATIC_IPC_BATT

	depends on PINCTRL_ELKHARTLAKE

	depends on 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"

	default SIEMENS_SIMATIC_IPC_BATT

	depends on GPIO_F7188X

	depends on PINCTRL_ALDERLAKE

	depends on 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-f7188x.

drivers/platform/x86/siemens/Makefile

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# 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