Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac2a8bca authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'ib-move-htc-egpio' into devel

parents a6a1cf3d 3c6e8d05

arch/arm/mach-pxa/hx4700.c

+1 −1
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <linux/input.h>

#include <linux/input/navpoint.h>

#include <linux/lcd.h>

#include <linux/mfd/htc-egpio.h>

#include <linux/mfd/asic3.h>

#include <linux/mtd/physmap.h>

#include <linux/pda_power.h>

#include <linux/platform_data/gpio-htc-egpio.h>

#include <linux/pwm.h>

#include <linux/pwm_backlight.h>

#include <linux/regulator/driver.h>

arch/arm/mach-pxa/magician.c

+1 −1
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
#include <linux/gpio.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/mfd/htc-egpio.h>

#include <linux/mfd/htc-pasic3.h>

#include <linux/mtd/physmap.h>

#include <linux/pda_power.h>

#include <linux/platform_data/gpio-htc-egpio.h>

#include <linux/pwm.h>

#include <linux/pwm_backlight.h>

#include <linux/regulator/driver.h>

arch/arm/mach-sa1100/h3xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
#include <linux/gpio.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/mfd/htc-egpio.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/platform_data/gpio-htc-egpio.h>

#include <linux/platform_data/sa11x0-serial.h>

#include <linux/platform_device.h>

#include <linux/serial_core.h>

drivers/gpio/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -873,6 +873,14 @@ config GPIO_DLN2 
	  This driver can also be built as a module. If so, the module

	  will be called gpio-dln2.



config HTC_EGPIO

	bool "HTC EGPIO support"

	depends on GPIOLIB && ARM

	help

	    This driver supports the CPLD egpio chip present on

	    several HTC phones.  It provides basic support for input

	    pins, output pins, and irqs.



config GPIO_JANZ_TTL

	tristate "Janz VMOD-TTL Digital IO Module"

	depends on MFD_JANZ_CMODIO

drivers/gpio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o 
obj-$(CONFIG_GPIO_GE_FPGA)	+= gpio-ge.o

obj-$(CONFIG_GPIO_GPIO_MM)	+= gpio-gpio-mm.o

obj-$(CONFIG_GPIO_GRGPIO)	+= gpio-grgpio.o

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

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

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

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