Commit a40f530e authored by Hans de Goede's avatar Hans de Goede
Browse files

Merge tag 'ib-drm-gpio-pdx86-rtc-wdt-v5.12-1' into for-next 

ib-drm-gpio-pdx86-rtc-wdt for v5.12-1

First part of Intel MID outdated platforms removal.

The following is an automated git shortlog grouped by driver:

drm/gma500:
 -  Get rid of duplicate NULL checks
 -  Convert to use new SCU IPC API

gpio:
 -  msic: Remove driver for deprecated platform
 -  intel-mid: Remove driver for deprecated platform

intel_mid_powerbtn:
 -  Remove driver for deprecated platform

intel_mid_thermal:
 -  Remove driver for deprecated platform

intel_scu_wdt:
 -  Get rid of custom x86 model comparison
 -  Drop SCU notification
 -  Move driver from arch/x86

rtc:
 -  mrst: Remove driver for deprecated platform

watchdog:
 -  intel-mid_wdt: Postpone IRQ handler registration till SCU is ready
 -  intel_scu_watchdog: Remove driver for deprecated platform
parents fa707a58 a507e5d9

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -8940,7 +8940,6 @@ L: linux-gpio@vger.kernel.org 
S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git

F:	drivers/gpio/gpio-ich.c

F:	drivers/gpio/gpio-intel-mid.c

F:	drivers/gpio/gpio-merrifield.c

F:	drivers/gpio/gpio-ml-ioh.c

F:	drivers/gpio/gpio-pch.c
@@ -9099,7 +9098,6 @@ M: Andy Shevchenko <andy@kernel.org> 
S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git

F:	drivers/gpio/gpio-*cove.c

F:	drivers/gpio/gpio-msic.c









INTEL PMIC MULTIFUNCTION DEVICE DRIVERS









M:	Andy Shevchenko <andy@kernel.org>
































arch/x86/platform/intel-mid/device_libs/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -30,4 +30,3 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o







obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o









obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_mrfld_power_btn.o









obj-$(subst m,y,$(CONFIG_RTC_DRV_CMOS)) += platform_mrfld_rtc.o








obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_mrfld_wdt.o
























drivers/gpio/Kconfig



+0
−14






























Original line number
Diff line number
Diff line







@@ -1249,13 +1249,6 @@ config GPIO_MAX77650







	  GPIO driver for MAX77650/77651 PMIC from Maxim Semiconductor.









	  These chips have a single pin that can be configured as GPIO.



















config GPIO_MSIC









	bool "Intel MSIC mixed signal gpio support"









	depends on (X86 || COMPILE_TEST) && MFD_INTEL_MSIC









	help









	  Enable support for GPIO on intel MSIC controllers found in









	  intel MID devices



















config GPIO_PALMAS









	bool "TI PALMAS series PMICs GPIO"









	depends on MFD_PALMAS








@@ -1451,13 +1444,6 @@ config GPIO_BT8XX

















	  If unsure, say N.



















config GPIO_INTEL_MID









	bool "Intel MID GPIO support"









	depends on X86_INTEL_MID









	select GPIOLIB_IRQCHIP









	help









	  Say Y here to support Intel MID GPIO.



















config GPIO_MERRIFIELD









	tristate "Intel Merrifield GPIO support"









	depends on X86_INTEL_MID
































drivers/gpio/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -67,7 +67,6 @@ obj-$(CONFIG_GPIO_HISI)                 += gpio-hisi.o







obj-$(CONFIG_GPIO_HLWD)			+= gpio-hlwd.o









obj-$(CONFIG_HTC_EGPIO)			+= gpio-htc-egpio.o









obj-$(CONFIG_GPIO_ICH)			+= gpio-ich.o









obj-$(CONFIG_GPIO_INTEL_MID)		+= gpio-intel-mid.o









obj-$(CONFIG_GPIO_IOP)			+= gpio-iop.o









obj-$(CONFIG_GPIO_IT87)			+= gpio-it87.o









obj-$(CONFIG_GPIO_IXP4XX)		+= gpio-ixp4xx.o
































drivers/gpio/TODO



+1
−1






























Original line number
Diff line number
Diff line







@@ -101,7 +101,7 @@ for a few GPIOs. Those should stay where they are.

















At the same time it makes sense to get rid of code duplication in existing or









new coming drivers. For example, gpio-ml-ioh should be incorporated into









gpio-pch. In similar way gpio-intel-mid into gpio-pxa.









gpio-pch.





























Generic MMIO GPIO