Skip to content

Commit b80c59a

Browse files
author
Bartosz Golaszewski
committed
Merge tag 'ib-mfd-gpio-hwmon-i2c-can-rtc-watchdog-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into gpio/for-next
Pull changes from the immutable branch between MFD, GPIO, HWMON, I2C, CAN, RTC and Watchdog trees containing GPIO support for Nuvoton NCT6694.
2 parents 0b1619c + d463bb1 commit b80c59a

23 files changed

Lines changed: 3669 additions & 0 deletions

File tree

MAINTAINERS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18111,6 +18111,18 @@ F: drivers/nubus/
1811118111
F: include/linux/nubus.h
1811218112
F: include/uapi/linux/nubus.h
1811318113

18114+
NUVOTON NCT6694 MFD DRIVER
18115+
M: Ming Yu <tmyu0@nuvoton.com>
18116+
S: Supported
18117+
F: drivers/gpio/gpio-nct6694.c
18118+
F: drivers/hwmon/nct6694-hwmon.c
18119+
F: drivers/i2c/busses/i2c-nct6694.c
18120+
F: drivers/mfd/nct6694.c
18121+
F: drivers/net/can/usb/nct6694_canfd.c
18122+
F: drivers/rtc/rtc-nct6694.c
18123+
F: drivers/watchdog/nct6694_wdt.c
18124+
F: include/linux/mfd/nct6694.h
18125+
1811418126
NUVOTON NCT7201 IIO DRIVER
1811518127
M: Eason Yang <j2anfernee@gmail.com>
1811618128
L: linux-iio@vger.kernel.org

drivers/gpio/Kconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,6 +1527,18 @@ config GPIO_MAX77759
15271527
This driver can also be built as a module. If so, the module will be
15281528
called gpio-max77759.
15291529

1530+
config GPIO_NCT6694
1531+
tristate "Nuvoton NCT6694 GPIO controller support"
1532+
depends on MFD_NCT6694
1533+
select GENERIC_IRQ_CHIP
1534+
select GPIOLIB_IRQCHIP
1535+
help
1536+
This driver supports 8 GPIO pins per bank that can all be interrupt
1537+
sources.
1538+
1539+
This driver can also be built as a module. If so, the module will be
1540+
called gpio-nct6694.
1541+
15301542
config GPIO_PALMAS
15311543
tristate "TI PALMAS series PMICs GPIO"
15321544
depends on MFD_PALMAS

drivers/gpio/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ obj-$(CONFIG_GPIO_MT7621) += gpio-mt7621.o
128128
obj-$(CONFIG_GPIO_MVEBU) += gpio-mvebu.o
129129
obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o
130130
obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o
131+
obj-$(CONFIG_GPIO_NCT6694) += gpio-nct6694.o
131132
obj-$(CONFIG_GPIO_NOMADIK) += gpio-nomadik.o
132133
obj-$(CONFIG_GPIO_NPCM_SGPIO) += gpio-npcm-sgpio.o
133134
obj-$(CONFIG_GPIO_OCTEON) += gpio-octeon.o

0 commit comments

Comments
 (0)