Commit 65c6ea33 authored by Hans de Goede's avatar Hans de Goede
Browse files

Merge remote-tracking branch 'pdx86/platform-drivers-x86-simatic-ipc' into review-hans

parents 3f8587cb f0ced885

MAINTAINERS

+26 −0
Original line number Diff line number Diff line
@@ -19397,6 +19397,32 @@ F: drivers/media/mmc/siano/ 
F:	drivers/media/usb/siano/

F:	drivers/media/usb/siano/









SIEMENS IPC LED DRIVERS









M:	Gerd Haeussler <gerd.haeussler.ext@siemens.com>









M:	Xing Tong Wu <xingtong.wu@siemens.com>









M:	Tobias Schaffner <tobias.schaffner@siemens.com>









L:	linux-leds@vger.kernel.org









S:	Maintained









F:	drivers/leds/simple/

















SIEMENS IPC PLATFORM DRIVERS









M:	Gerd Haeussler <gerd.haeussler.ext@siemens.com>









M:	Xing Tong Wu <xingtong.wu@siemens.com>









M:	Tobias Schaffner <tobias.schaffner@siemens.com>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









F:	drivers/platform/x86/siemens/









F:	include/linux/platform_data/x86/simatic-ipc-base.h









F:	include/linux/platform_data/x86/simatic-ipc.h

















SIEMENS IPC WATCHDOG DRIVERS









M:	Gerd Haeussler <gerd.haeussler.ext@siemens.com>









M:	Xing Tong Wu <xingtong.wu@siemens.com>









M:	Tobias Schaffner <tobias.schaffner@siemens.com>









L:	linux-watchdog@vger.kernel.org









S:	Maintained









F:	drivers/watchdog/simatic-ipc-wdt.c

















SIFIVE DRIVERS









M:	Palmer Dabbelt <palmer@dabbelt.com>









M:	Paul Walmsley <paul.walmsley@sifive.com>

























drivers/platform/x86/siemens/simatic-ipc-batt.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -194,11 +194,12 @@ int simatic_ipc_batt_probe(struct platform_device *pdev, struct gpiod_lookup_tab

















	if (table->table[2].key) {









		flags = GPIOD_OUT_HIGH;









		if (priv.devmode == SIMATIC_IPC_DEVICE_BX_21A || SIMATIC_IPC_DEVICE_BX_59A)









		if (priv.devmode == SIMATIC_IPC_DEVICE_BX_21A ||









		    priv.devmode == SIMATIC_IPC_DEVICE_BX_59A)









			flags = GPIOD_OUT_LOW;









		priv.gpios[2] = devm_gpiod_get_index(dev, "CMOSBattery meter", 2, flags);









		if (IS_ERR(priv.gpios[2])) {









			err = PTR_ERR(priv.gpios[1]);









			err = PTR_ERR(priv.gpios[2]);









			priv.gpios[2] = NULL;









			goto out;









		}
































drivers/platform/x86/siemens/simatic-ipc.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -129,7 +129,7 @@ static int register_platform_devices(u32 station_id)







		pdevname = KBUILD_MODNAME "_leds";









		if (ledmode == SIMATIC_IPC_DEVICE_127E)









			pdevname = KBUILD_MODNAME "_leds_gpio_apollolake";









		if (ledmode == SIMATIC_IPC_DEVICE_227G || SIMATIC_IPC_DEVICE_BX_59A)









		if (ledmode == SIMATIC_IPC_DEVICE_227G || ledmode == SIMATIC_IPC_DEVICE_BX_59A)









			pdevname = KBUILD_MODNAME "_leds_gpio_f7188x";









		if (ledmode == SIMATIC_IPC_DEVICE_BX_21A)









			pdevname = KBUILD_MODNAME "_leds_gpio_elkhartlake";
































drivers/watchdog/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -1680,7 +1680,7 @@ config NIC7018_WDT

















config SIEMENS_SIMATIC_IPC_WDT









	tristate "Siemens Simatic IPC Watchdog"









	depends on SIEMENS_SIMATIC_IPC









	depends on SIEMENS_SIMATIC_IPC && PCI









	default y









	select WATCHDOG_CORE









	select P2SB