Commit 4c8c225a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux 

Pull GPIO changes from Grant Likely:
 "This branch contains the usual set of individual driver improvements
  and bug fixes, as well as updates to the core code.  The more notable
  changes include:

   - Internally add new API for referencing GPIOs by gpio_desc instead
     of number.  Eventually this will become a public API

   - ACPI GPIO binding support"

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux: (33 commits)
  arm64: select ARCH_WANT_OPTIONAL_GPIOLIB
  gpio: em: Use irq_domain_add_simple() to fix runtime error
  gpio: using common order: let 'static const' instead of 'const static'
  gpio/vt8500: memory cleanup missing
  gpiolib: Fix locking on gpio debugfs files
  gpiolib: let gpio_chip reference its descriptors
  gpiolib: use descriptors internally
  gpiolib: use gpio_chips list in gpiochip_find_base
  gpiolib: use gpio_chips list in sysfs ops
  gpiolib: use gpio_chips list in gpiochip_find
  gpiolib: use gpio_chips list in gpiolib_sysfs_init
  gpiolib: link all gpio_chips using a list
  gpio/langwell: cleanup driver
  gpio/langwell: Add Cloverview ids to pci device table
  gpio/lynxpoint: add chipset gpio driver.
  gpiolib: add missing braces in gpio_direction_show
  gpiolib-acpi: Fix error checks in interrupt requesting
  gpio: mpc8xxx: don't set IRQ_TYPE_NONE when creating irq mapping
  gpiolib: remove gpiochip_reserve()
  arm: pxa: tosa: do not use gpiochip_reserve()
  ...
parents 3eb05225 9170100e

arch/arm/mach-pxa/tosa.c

+0 −6
Original line number Diff line number Diff line
@@ -927,8 +927,6 @@ static void tosa_restart(char mode, const char *cmd) 


static void __init tosa_init(void)

{

	int dummy;



	pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_config));



	pxa_set_ffuart_info(NULL);
@@ -947,10 +945,6 @@ static void __init tosa_init(void) 
	/* enable batt_fault */

	PMCR = 0x01;



	dummy = gpiochip_reserve(TOSA_SCOOP_GPIO_BASE, 12);

	dummy = gpiochip_reserve(TOSA_SCOOP_JC_GPIO_BASE, 12);

	dummy = gpiochip_reserve(TOSA_TC6393XB_GPIO_BASE, 16);



	pxa_set_mci_info(&tosa_mci_platform_data);

	pxa_set_ficp_info(&tosa_ficp_platform_data);

	pxa_set_i2c_info(NULL);

arch/arm64/Kconfig

+2 −1
Original line number Diff line number Diff line 
config ARM64

	def_bool y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select ARCH_WANT_FRAME_POINTERS

	select ARM_AMBA
@@ -93,7 +94,7 @@ config IOMMU_HELPER 
	def_bool SWIOTLB



config GENERIC_GPIO

	def_bool y

	bool



source "init/Kconfig"

drivers/gpio/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ config ARCH_REQUIRE_GPIOLIB 
	  Selecting this from the architecture code will cause the gpiolib

	  code to always get built in.



config GPIO_DEVRES

	def_bool y

	depends on HAS_IOMEM





menuconfig GPIOLIB
@@ -298,6 +301,14 @@ config GPIO_GE_FPGA 
	  and write pin state) for GPIO implemented in a number of GE single

	  board computers.



config GPIO_LYNXPOINT

	bool "Intel Lynxpoint GPIO support"

	depends on ACPI

	select IRQ_DOMAIN

	help

	  driver for GPIO functionality on Intel Lynxpoint PCH chipset

	  Requires ACPI device enumeration code to set up a platform device.



comment "I2C GPIO expanders:"



config GPIO_ARIZONA

drivers/gpio/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 


ccflags-$(CONFIG_DEBUG_GPIO)	+= -DDEBUG



obj-$(CONFIG_GPIOLIB)		+= gpiolib.o devres.o

obj-$(CONFIG_GPIO_DEVRES)	+= devres.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib.o

obj-$(CONFIG_OF_GPIO)		+= gpiolib-of.o

obj-$(CONFIG_GPIO_ACPI)		+= gpiolib-acpi.o
@@ -30,6 +31,7 @@ obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o 
obj-$(CONFIG_ARCH_KS8695)	+= gpio-ks8695.o

obj-$(CONFIG_GPIO_LANGWELL)	+= gpio-langwell.o

obj-$(CONFIG_ARCH_LPC32XX)	+= gpio-lpc32xx.o

obj-$(CONFIG_GPIO_LYNXPOINT)	+= gpio-lynxpoint.o

obj-$(CONFIG_GPIO_MAX730X)	+= gpio-max730x.o

obj-$(CONFIG_GPIO_MAX7300)	+= gpio-max7300.o

obj-$(CONFIG_GPIO_MAX7301)	+= gpio-max7301.o

drivers/gpio/gpio-em.c

+2 −1
Original line number Diff line number Diff line
@@ -299,8 +299,9 @@ static int em_gio_probe(struct platform_device *pdev) 
	irq_chip->irq_set_type = em_gio_irq_set_type;

	irq_chip->flags	= IRQCHIP_SKIP_SET_WAKE;



	p->irq_domain = irq_domain_add_linear(pdev->dev.of_node,

	p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,

					      pdata->number_of_pins,

					      pdata->irq_base,

					      &em_gio_irq_domain_ops, p);

	if (!p->irq_domain) {

		ret = -ENXIO;

CRA Git | Maintained and supported by SUSTech CRA and CCSE