mirror of https://gitee.com/openkylin/linux.git
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 (commit 1a49e2ac9651: "EHCI: centralize controller initialization") that clashed with commit |
||
|---|---|---|
| .. | ||
| 88pm80x_onkey.c | ||
| 88pm860x_onkey.c | ||
| Kconfig | ||
| Makefile | ||
| ab8500-ponkey.c | ||
| ad714x-i2c.c | ||
| ad714x-spi.c | ||
| ad714x.c | ||
| ad714x.h | ||
| adxl34x-i2c.c | ||
| adxl34x-spi.c | ||
| adxl34x.c | ||
| adxl34x.h | ||
| apanel.c | ||
| ati_remote2.c | ||
| atlas_btns.c | ||
| bfin_rotary.c | ||
| bma150.c | ||
| cm109.c | ||
| cma3000_d0x.c | ||
| cma3000_d0x.h | ||
| cma3000_d0x_i2c.c | ||
| cobalt_btns.c | ||
| da9052_onkey.c | ||
| dm355evm_keys.c | ||
| gp2ap002a00f.c | ||
| gpio_tilt_polled.c | ||
| hp_sdc_rtc.c | ||
| ixp4xx-beeper.c | ||
| keyspan_remote.c | ||
| kxtj9.c | ||
| m68kspkr.c | ||
| max8925_onkey.c | ||
| max8997_haptic.c | ||
| mc13783-pwrbutton.c | ||
| mma8450.c | ||
| mpu3050.c | ||
| pcap_keys.c | ||
| pcf8574_keypad.c | ||
| pcf50633-input.c | ||
| pcspkr.c | ||
| pm8xxx-vibrator.c | ||
| pmic8xxx-pwrkey.c | ||
| powermate.c | ||
| pwm-beeper.c | ||
| rb532_button.c | ||
| rotary_encoder.c | ||
| sgi_btns.c | ||
| sparcspkr.c | ||
| twl4030-pwrbutton.c | ||
| twl4030-vibra.c | ||
| twl6040-vibra.c | ||
| uinput.c | ||
| wistron_btns.c | ||
| wm831x-on.c | ||
| xen-kbdfront.c | ||
| yealink.c | ||
| yealink.h | ||