mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
3e701cdfe6
We have support for a few new drivers: - Samsung s2mps11 - Wolfson Microelectronics wm5102 and wm5110 - Marvell 88PM800 and 88PM805 - TI twl6041 We also have our regular driver improvements: - Device tree and IRQ domain support for STE AB8500 - Regmap and devm_* API conversion for TI tps6586x - Device tree support for Samsung max77686 - devm_* API conversion for STE AB3100 Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910, tps65090, da9052 and twl-core. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQFpGVAAoJEIqAPN1PVmxKFNoP/1dkYngrxxV6cxdyLJ74APhG lVKPgaDxQhdgfwCZJmMeZK1UphZo80cWnEXG6sTHZUEQdTaslSJu5SuPfUM+fo7e 52/dU0nx0ZE04pwPQLHbidS4TmHlbLg9oM2kmIf9RO5rg34GodwVgRL/4+k1qvhz aWYJt9erFhQOpqaSX66mXHSuhvzHypbcE7d2B2Ykmh3NoYiH2w9H9KmIbbb+ZLq8 +Bp/i5Ys/vfooo+8IE2w6KZfIzMwsmmtWjjr/38yuQJaKZCh/zn23DM9HsdrVf++ RzfniRF4YBxmeKi7zi8MFIYys8filTCXA9dXbGSAKCuUCT37yZRnUxTeN1bn7Bux A7KRpG7pUKQKVKqCTndvK5LcQKlT33XyW2ZzV1wVWX2JkCJ+gilPeykb8IabNvGX nIp0STEGR/WdCLEAKo8pJF7Usn0RuUzAug02SG/mQ6dpnLoZqp0Od5W7gRhT7M7h hXr/xKJ6cG5YwicpAdy5kJJ0dRgQrtaHwxrF0B68AXZ7CmAtkPuEGCYhUCFnGQUH XJ0CodAqqVBRyYiQS4zIpIh2nqhIdsgv4OC1+kVLbubQk+PR88zG9Jvg6i1HQi/A OHi7N5Wite3YUrs3sBzDKnEc/Il2YRhVaz2SLVNfZR0PS7hywHN3rK/tVFINTgei jNEz1H6hu7ToNLfs0UzP =c28c -----END PGP SIGNATURE----- Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 Pull MFD bits from Samuel Ortiz: "We have support for a few new drivers: - Samsung s2mps11 - Wolfson Microelectronics wm5102 and wm5110 - Marvell 88PM800 and 88PM805 - TI twl6041 We also have our regular driver improvements: - Device tree and IRQ domain support for STE AB8500 - Regmap and devm_* API conversion for TI tps6586x - Device tree support for Samsung max77686 - devm_* API conversion for STE AB3100 Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910, tps65090, da9052 and twl-core." Fix up mostly trivial conflicts, with the exception of drivers/usb/host/ehci-omap.c in particular, which had some re-organization of the reset sequence (commit1a49e2ac96: "EHCI: centralize controller initialization") that clashed with commit2761a63945("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix issues"). In particular, commit2761a63945moved the usb_add_hcd() to the *middle* of the reset sequence, which clashes fairly badly with the reset sequence re-organization (although it could have been done inside the new omap_ehci_init() function). I left that part of commit2761a63945just undone. * tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (110 commits) mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core mfd: Arizone core should select MFD_CORE mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ mfd: Add debug trace on entering and leaving arizone runtime suspend mfd: Correct tps65090 cell names mfd: Remove gpio support from tps6586x core driver ARM: tegra: defconfig: Enable tps6586x gpio gpio: tps6586x: Add gpio support through platform driver mfd: Cache tps6586x register through regmap mfd: Use regmap for tps6586x register access. mfd: Use devm managed resources for tps6586x input: Add onkey support for 88PM80X PMIC mfd: Add support for twl6041 mfd: Fix twl6040 revision information mfd: Matches should be NULL when populate anatop child devices input: ab8500-ponkey: Create AB8500 domain IRQ mapping mfd: Add missing out of memory check for pcf50633 Documentation: Describe the AB8500 Device Tree bindings mfd: Add tps65910 32-kHz-crystal-input init mfd: Drop modifying mc13xxx driver's id_table in probe ...
51 lines
1.6 KiB
Plaintext
51 lines
1.6 KiB
Plaintext
menuconfig EXTCON
|
|
tristate "External Connector Class (extcon) support"
|
|
help
|
|
Say Y here to enable external connector class (extcon) support.
|
|
This allows monitoring external connectors by userspace
|
|
via sysfs and uevent and supports external connectors with
|
|
multiple states; i.e., an extcon that may have multiple
|
|
cables attached. For example, an external connector of a device
|
|
may be used to connect an HDMI cable and a AC adaptor, and to
|
|
host USB ports. Many of 30-pin connectors including PDMI are
|
|
also good examples.
|
|
|
|
if EXTCON
|
|
|
|
comment "Extcon Device Drivers"
|
|
|
|
config EXTCON_GPIO
|
|
tristate "GPIO extcon support"
|
|
depends on GENERIC_GPIO
|
|
help
|
|
Say Y here to enable GPIO based extcon support. Note that GPIO
|
|
extcon supports single state per extcon instance.
|
|
|
|
config EXTCON_MAX77693
|
|
tristate "MAX77693 EXTCON Support"
|
|
depends on MFD_MAX77693
|
|
select IRQ_DOMAIN
|
|
select REGMAP_I2C
|
|
help
|
|
If you say yes here you get support for the MUIC device of
|
|
Maxim MAX77693 PMIC. The MAX77693 MUIC is a USB port accessory
|
|
detector and switch.
|
|
|
|
config EXTCON_MAX8997
|
|
tristate "MAX8997 EXTCON Support"
|
|
depends on MFD_MAX8997 && IRQ_DOMAIN
|
|
help
|
|
If you say yes here you get support for the MUIC device of
|
|
Maxim MAX8997 PMIC. The MAX8997 MUIC is a USB port accessory
|
|
detector and switch.
|
|
|
|
config EXTCON_ARIZONA
|
|
tristate "Wolfson Arizona EXTCON support"
|
|
depends on MFD_ARIZONA
|
|
help
|
|
Say Y here to enable support for external accessory detection
|
|
with Wolfson Arizona devices. These are audio CODECs with
|
|
advanced audio accessory detection support.
|
|
|
|
endif # MULTISTATE_SWITCH
|