tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'ib-move-htc-egpio' into devel
+13
-13
+1
-1
arch/arm/mach-pxa/hx4700.c
+1
-1
arch/arm/mach-pxa/hx4700.c
···
24
24
#include <linux/input.h>
25
25
#include <linux/input/navpoint.h>
26
26
#include <linux/lcd.h>
27
-
#include <linux/mfd/htc-egpio.h>
28
27
#include <linux/mfd/asic3.h>
29
28
#include <linux/mtd/physmap.h>
30
29
#include <linux/pda_power.h>
30
+
#include <linux/platform_data/gpio-htc-egpio.h>
31
31
#include <linux/pwm.h>
32
32
#include <linux/pwm_backlight.h>
33
33
#include <linux/regulator/driver.h>
+1
-1
arch/arm/mach-pxa/magician.c
+1
-1
arch/arm/mach-pxa/magician.c
···
20
20
#include <linux/gpio.h>
21
21
#include <linux/gpio_keys.h>
22
22
#include <linux/input.h>
23
-
#include <linux/mfd/htc-egpio.h>
24
23
#include <linux/mfd/htc-pasic3.h>
25
24
#include <linux/mtd/physmap.h>
26
25
#include <linux/pda_power.h>
26
+
#include <linux/platform_data/gpio-htc-egpio.h>
27
27
#include <linux/pwm.h>
28
28
#include <linux/pwm_backlight.h>
29
29
#include <linux/regulator/driver.h>
+1
-1
arch/arm/mach-sa1100/h3xxx.c
+1
-1
arch/arm/mach-sa1100/h3xxx.c
···
14
14
#include <linux/gpio.h>
15
15
#include <linux/gpio_keys.h>
16
16
#include <linux/input.h>
17
-
#include <linux/mfd/htc-egpio.h>
18
17
#include <linux/mtd/mtd.h>
19
18
#include <linux/mtd/partitions.h>
19
+
#include <linux/platform_data/gpio-htc-egpio.h>
20
20
#include <linux/platform_data/sa11x0-serial.h>
21
21
#include <linux/platform_device.h>
22
22
#include <linux/serial_core.h>
+8
drivers/gpio/Kconfig
+8
drivers/gpio/Kconfig
···
873
873
This driver can also be built as a module. If so, the module
874
874
will be called gpio-dln2.
875
875
876
+
config HTC_EGPIO
877
+
bool "HTC EGPIO support"
878
+
depends on GPIOLIB && ARM
879
+
help
880
+
This driver supports the CPLD egpio chip present on
881
+
several HTC phones. It provides basic support for input
882
+
pins, output pins, and irqs.
883
+
876
884
config GPIO_JANZ_TTL
877
885
tristate "Janz VMOD-TTL Digital IO Module"
878
886
depends on MFD_JANZ_CMODIO
+1
drivers/gpio/Makefile
+1
drivers/gpio/Makefile
···
48
48
obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o
49
49
obj-$(CONFIG_GPIO_GPIO_MM) += gpio-gpio-mm.o
50
50
obj-$(CONFIG_GPIO_GRGPIO) += gpio-grgpio.o
51
+
obj-$(CONFIG_HTC_EGPIO) += gpio-htc-egpio.o
51
52
obj-$(CONFIG_GPIO_ICH) += gpio-ich.o
52
53
obj-$(CONFIG_GPIO_IOP) += gpio-iop.o
53
54
obj-$(CONFIG_GPIO_IT87) += gpio-it87.o
-8
drivers/mfd/Kconfig
-8
drivers/mfd/Kconfig
···
340
340
help
341
341
Select this option to enable Hisilicon hi655x series pmic driver.
342
342
343
-
config HTC_EGPIO
344
-
bool "HTC EGPIO support"
345
-
depends on GPIOLIB && ARM
346
-
help
347
-
This driver supports the CPLD egpio chip present on
348
-
several HTC phones. It provides basic support for input
349
-
pins, output pins, and irqs.
350
-
351
343
config HTC_PASIC3
352
344
tristate "HTC PASIC3 LED/DS1WM chip support"
353
345
select MFD_CORE
-1
drivers/mfd/Makefile
-1
drivers/mfd/Makefile
+1
-1
drivers/mfd/htc-egpio.c
drivers/gpio/gpio-htc-egpio.c
+1
-1
drivers/mfd/htc-egpio.c
drivers/gpio/gpio-htc-egpio.c
···
14
14
#include <linux/irq.h>
15
15
#include <linux/io.h>
16
16
#include <linux/spinlock.h>
17
+
#include <linux/platform_data/gpio-htc-egpio.h>
17
18
#include <linux/platform_device.h>
18
19
#include <linux/slab.h>
19
20
#include <linux/module.h>
20
-
#include <linux/mfd/htc-egpio.h>
21
21
22
22
struct egpio_chip {
23
23
int reg_start;
include/linux/mfd/htc-egpio.h
include/linux/platform_data/gpio-htc-egpio.h
include/linux/mfd/htc-egpio.h
include/linux/platform_data/gpio-htc-egpio.h