Skip to content

Commit 10fec20

Browse files
committed
Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
* 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: tc6393 cleanup and update mfd: have TMIO drivers and subdevices depend on ARM mfd: TMIO MMC driver mfd: driver for the TMIO NAND controller mfd: t7l66 MMC platform data mfd: tc6387 MMC platform data mfd: Fix 7l66 and 6387 according to the new mfd-core API mfd: Fix tc6393 according to the new tmio.h mfd: driver for the TC6387XB TMIO controller. mfd: driver for the T7L66XB TMIO SoC mfd: TMIO MMC structures and accessors.
2 parents 29bb1bd + 25d6cbd commit 10fec20

File tree

16 files changed

+2249
-76
lines changed

16 files changed

+2249
-76
lines changed

drivers/mfd/Kconfig

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,31 @@ config HTC_PASIC3
5050
HTC Magician devices, respectively. Actual functionality is
5151
handled by the leds-pasic3 and ds1wm drivers.
5252

53+
config MFD_TMIO
54+
bool
55+
default n
56+
57+
config MFD_T7L66XB
58+
bool "Support Toshiba T7L66XB"
59+
depends on ARM
60+
select MFD_CORE
61+
select MFD_TMIO
62+
help
63+
Support for Toshiba Mobile IO Controller T7L66XB
64+
65+
config MFD_TC6387XB
66+
bool "Support Toshiba TC6387XB"
67+
depends on ARM
68+
select MFD_CORE
69+
select MFD_TMIO
70+
help
71+
Support for Toshiba Mobile IO Controller TC6387XB
72+
5373
config MFD_TC6393XB
5474
bool "Support Toshiba TC6393XB"
5575
depends on GPIOLIB && ARM
5676
select MFD_CORE
77+
select MFD_TMIO
5778
help
5879
Support for Toshiba Mobile IO Controller TC6393XB
5980

drivers/mfd/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ obj-$(CONFIG_MFD_ASIC3) += asic3.o
88
obj-$(CONFIG_HTC_EGPIO) += htc-egpio.o
99
obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o
1010

11+
obj-$(CONFIG_MFD_T7L66XB) += t7l66xb.o
12+
obj-$(CONFIG_MFD_TC6387XB) += tc6387xb.o
1113
obj-$(CONFIG_MFD_TC6393XB) += tc6393xb.o
1214

1315
obj-$(CONFIG_MFD_CORE) += mfd-core.o

0 commit comments

Comments
 (0)