Commit f0967377 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

Merge tag 'intel-gpio-v6.4-2' of... 

Merge tag 'intel-gpio-v6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next

intel-gpio for v6.4-2

* Fixed suspend issue on Clevo NL5xNU
* Split a new Intel Tangier (library) driver for current and new platforms
* Introduced a new driver for Intel Elkhart Lake PSE GPIO (see also above)
* Contained a few fixes for the previous of_gpio.h cleanup
* Miscellaneous cleanups here and there

The following is an automated git shortlog grouped by driver:

elkhartlake:
 -  Introduce Intel Elkhart Lake PSE GPIO

gpiolib:
 -  acpi: Add a ignore wakeup quirk for Clevo NL5xNU
 -  acpi: Move ACPI device NULL check to acpi_get_driver_gpio_data()
 -  acpi: use the fwnode in acpi_gpiochip_find()

ich:
 -  Use devm_gpiochip_add_data() to simplify remove path

merrifield:
 -  Utilise temporary variable for struct device
 -  Use dev_err_probe()
 -  Adapt to Intel Tangier GPIO driver

mips:
 -  ar7: include linux/gpio/driver.h

mm-lantiq:
 -  Fix typo in the newly added header filename

powerpc/40x:
 -  Add missing select OF_GPIO_MM_GPIOCHIP

sh:
 -  mach-x3proto: Add missing #include <linux/gpio/driver.h>

tangier:
 -  Introduce Intel Tangier GPIO driver
parents 7b59bdbc 782eea0c

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -10281,12 +10281,14 @@ M: Andy Shevchenko <andy@kernel.org> 
L:	linux-gpio@vger.kernel.org

S:	Supported

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

F:	drivers/gpio/gpio-elkhartlake.c

F:	drivers/gpio/gpio-ich.c

F:	drivers/gpio/gpio-merrifield.c

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

F:	drivers/gpio/gpio-pch.c

F:	drivers/gpio/gpio-sch.c

F:	drivers/gpio/gpio-sodaville.c

F:	drivers/gpio/gpio-tangier.c









INTEL GVT-g DRIVERS (Intel GPU Virtualization)









M:	Zhenyu Wang <zhenyuw@linux.intel.com>
































arch/mips/ar7/gpio.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -7,7 +7,7 @@

















#include <linux/init.h>









#include <linux/export.h>









#include <linux/gpio.h>









#include <linux/gpio/driver.h>



















#include <asm/mach-ar7/ar7.h>










































arch/powerpc/platforms/40x/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -65,6 +65,7 @@ config PPC4xx_GPIO







	bool "PPC4xx GPIO support"









	depends on 40x









	select GPIOLIB









	select OF_GPIO_MM_GPIOCHIP









	help









	  Enable gpiolib support for ppc40x based boards










































arch/sh/boards/mach-x3proto/setup.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -16,7 +16,7 @@







#include <linux/input.h>









#include <linux/usb/r8a66597.h>









#include <linux/usb/m66592.h>









#include <linux/gpio.h>









#include <linux/gpio/driver.h>









#include <linux/gpio_keys.h>









#include <mach/ilsel.h>









#include <mach/hardware.h>
































drivers/gpio/Kconfig



+23
−1






























Original line number
Diff line number
Diff line







@@ -623,6 +623,17 @@ config GPIO_SYSCON







	help









	  Say yes here to support GPIO functionality though SYSCON driver.



















config GPIO_TANGIER









	tristate









	select GPIOLIB_IRQCHIP









	help









	  GPIO support for Intel Tangier and compatible platforms.









	  Currently supported:









	   - Elkhart Lake









	   - Merrifield



















	  If built as a module its name will be gpio-tangier.



















config GPIO_TB10X









	bool









	select GPIO_GENERIC








@@ -1252,6 +1263,17 @@ config HTC_EGPIO







	  several HTC phones.  It provides basic support for input









	  pins, output pins, and IRQs.



















config GPIO_ELKHARTLAKE









	tristate "Intel Elkhart Lake PSE GPIO support"









	depends on X86 || COMPILE_TEST









	select GPIO_TANGIER









	help









	  Select this option to enable GPIO support for Intel Elkhart Lake









	  PSE GPIO IP.



















	  To compile this driver as a module, choose M here: the module will









	  be called gpio-elkhartlake.



















config GPIO_JANZ_TTL









	tristate "Janz VMOD-TTL Digital IO Module"









	depends on MFD_JANZ_CMODIO








@@ -1530,7 +1552,7 @@ config GPIO_BT8XX







config GPIO_MERRIFIELD









	tristate "Intel Merrifield GPIO support"









	depends on X86_INTEL_MID









	select GPIOLIB_IRQCHIP









	select GPIO_TANGIER









	help









	  Say Y here to support Intel Merrifield GPIO.