mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 08:31: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 ...
195 lines
4.4 KiB
Plaintext
195 lines
4.4 KiB
Plaintext
CONFIG_EXPERIMENTAL=y
|
|
CONFIG_NO_HZ=y
|
|
CONFIG_HIGH_RES_TIMERS=y
|
|
CONFIG_IKCONFIG=y
|
|
CONFIG_IKCONFIG_PROC=y
|
|
CONFIG_CGROUPS=y
|
|
CONFIG_CGROUP_DEBUG=y
|
|
CONFIG_CGROUP_FREEZER=y
|
|
CONFIG_CGROUP_CPUACCT=y
|
|
CONFIG_RESOURCE_COUNTERS=y
|
|
CONFIG_CGROUP_SCHED=y
|
|
CONFIG_RT_GROUP_SCHED=y
|
|
CONFIG_BLK_DEV_INITRD=y
|
|
# CONFIG_ELF_CORE is not set
|
|
CONFIG_EMBEDDED=y
|
|
CONFIG_PERF_EVENTS=y
|
|
CONFIG_SLAB=y
|
|
CONFIG_MODULES=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
CONFIG_MODULE_FORCE_UNLOAD=y
|
|
# CONFIG_BLK_DEV_BSG is not set
|
|
CONFIG_PARTITION_ADVANCED=y
|
|
CONFIG_EFI_PARTITION=y
|
|
# CONFIG_IOSCHED_DEADLINE is not set
|
|
# CONFIG_IOSCHED_CFQ is not set
|
|
CONFIG_ARCH_TEGRA=y
|
|
CONFIG_ARCH_TEGRA_2x_SOC=y
|
|
CONFIG_ARCH_TEGRA_3x_SOC=y
|
|
CONFIG_MACH_HARMONY=y
|
|
CONFIG_MACH_PAZ00=y
|
|
CONFIG_MACH_TRIMSLICE=y
|
|
CONFIG_TEGRA_EMC_SCALING_ENABLE=y
|
|
CONFIG_SMP=y
|
|
CONFIG_PREEMPT=y
|
|
CONFIG_AEABI=y
|
|
# CONFIG_OABI_COMPAT is not set
|
|
CONFIG_HIGHMEM=y
|
|
CONFIG_ZBOOT_ROM_TEXT=0x0
|
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
|
CONFIG_AUTO_ZRELADDR=y
|
|
CONFIG_CPU_FREQ=y
|
|
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
|
|
CONFIG_CPU_IDLE=y
|
|
CONFIG_VFP=y
|
|
CONFIG_PM_RUNTIME=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_NET_KEY=y
|
|
CONFIG_INET=y
|
|
CONFIG_IP_PNP=y
|
|
CONFIG_IP_PNP_DHCP=y
|
|
CONFIG_IP_PNP_BOOTP=y
|
|
CONFIG_IP_PNP_RARP=y
|
|
CONFIG_INET_ESP=y
|
|
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
|
|
# CONFIG_INET_XFRM_MODE_BEET is not set
|
|
# CONFIG_INET_LRO is not set
|
|
# CONFIG_INET_DIAG is not set
|
|
CONFIG_IPV6=y
|
|
CONFIG_IPV6_PRIVACY=y
|
|
CONFIG_IPV6_ROUTER_PREF=y
|
|
CONFIG_IPV6_OPTIMISTIC_DAD=y
|
|
CONFIG_INET6_AH=y
|
|
CONFIG_INET6_ESP=y
|
|
CONFIG_INET6_IPCOMP=y
|
|
CONFIG_IPV6_MIP6=y
|
|
CONFIG_IPV6_TUNNEL=y
|
|
CONFIG_IPV6_MULTIPLE_TABLES=y
|
|
# CONFIG_WIRELESS is not set
|
|
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
|
CONFIG_PROC_DEVICETREE=y
|
|
CONFIG_BLK_DEV_LOOP=y
|
|
CONFIG_AD525X_DPOT=y
|
|
CONFIG_AD525X_DPOT_I2C=y
|
|
CONFIG_ICS932S401=y
|
|
CONFIG_APDS9802ALS=y
|
|
CONFIG_ISL29003=y
|
|
CONFIG_SCSI=y
|
|
CONFIG_BLK_DEV_SD=y
|
|
CONFIG_BLK_DEV_SR=y
|
|
# CONFIG_SCSI_LOWLEVEL is not set
|
|
CONFIG_NETDEVICES=y
|
|
CONFIG_DUMMY=y
|
|
CONFIG_R8169=y
|
|
CONFIG_USB_PEGASUS=y
|
|
CONFIG_USB_USBNET=y
|
|
CONFIG_USB_NET_SMSC75XX=y
|
|
CONFIG_USB_NET_SMSC95XX=y
|
|
# CONFIG_WLAN is not set
|
|
CONFIG_INPUT_EVDEV=y
|
|
CONFIG_INPUT_MISC=y
|
|
CONFIG_INPUT_MPU3050=y
|
|
# CONFIG_VT is not set
|
|
# CONFIG_LEGACY_PTYS is not set
|
|
# CONFIG_DEVKMEM is not set
|
|
CONFIG_SERIAL_8250=y
|
|
CONFIG_SERIAL_8250_CONSOLE=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
CONFIG_I2C=y
|
|
# CONFIG_I2C_COMPAT is not set
|
|
CONFIG_I2C_MUX=y
|
|
CONFIG_I2C_MUX_PINCTRL=y
|
|
CONFIG_I2C_TEGRA=y
|
|
CONFIG_SPI=y
|
|
CONFIG_SPI_TEGRA=y
|
|
CONFIG_GPIO_TPS65910=y
|
|
CONFIG_GPIO_TPS6586X=y
|
|
CONFIG_POWER_SUPPLY=y
|
|
CONFIG_BATTERY_SBS=y
|
|
CONFIG_SENSORS_LM90=y
|
|
CONFIG_MFD_TPS6586X=y
|
|
CONFIG_MFD_TPS65910=y
|
|
CONFIG_REGULATOR=y
|
|
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
|
CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
|
|
CONFIG_REGULATOR_GPIO=y
|
|
CONFIG_REGULATOR_TPS62360=y
|
|
CONFIG_REGULATOR_TPS6586X=y
|
|
CONFIG_REGULATOR_TPS65910=y
|
|
CONFIG_SOUND=y
|
|
CONFIG_SND=y
|
|
# CONFIG_SND_SUPPORT_OLD_API is not set
|
|
# CONFIG_SND_DRIVERS is not set
|
|
# CONFIG_SND_PCI is not set
|
|
# CONFIG_SND_ARM is not set
|
|
# CONFIG_SND_SPI is not set
|
|
# CONFIG_SND_USB is not set
|
|
CONFIG_SND_SOC=y
|
|
CONFIG_SND_SOC_TEGRA=y
|
|
CONFIG_SND_SOC_TEGRA_WM8753=y
|
|
CONFIG_SND_SOC_TEGRA_WM8903=y
|
|
CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
|
|
CONFIG_SND_SOC_TEGRA_ALC5632=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_TEGRA=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_MMC=y
|
|
CONFIG_MMC_BLOCK_MINORS=16
|
|
CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_PLTFM=y
|
|
CONFIG_MMC_SDHCI_TEGRA=y
|
|
CONFIG_RTC_CLASS=y
|
|
CONFIG_RTC_DRV_EM3027=y
|
|
CONFIG_RTC_DRV_TEGRA=y
|
|
CONFIG_STAGING=y
|
|
CONFIG_SENSORS_ISL29018=y
|
|
CONFIG_SENSORS_ISL29028=y
|
|
CONFIG_SENSORS_AK8975=y
|
|
CONFIG_MFD_NVEC=y
|
|
CONFIG_KEYBOARD_NVEC=y
|
|
CONFIG_SERIO_NVEC_PS2=y
|
|
CONFIG_TEGRA_IOMMU_GART=y
|
|
CONFIG_TEGRA_IOMMU_SMMU=y
|
|
CONFIG_MEMORY=y
|
|
CONFIG_IIO=y
|
|
CONFIG_EXT2_FS=y
|
|
CONFIG_EXT2_FS_XATTR=y
|
|
CONFIG_EXT2_FS_POSIX_ACL=y
|
|
CONFIG_EXT2_FS_SECURITY=y
|
|
CONFIG_EXT3_FS=y
|
|
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
|
|
CONFIG_EXT3_FS_POSIX_ACL=y
|
|
CONFIG_EXT3_FS_SECURITY=y
|
|
CONFIG_EXT4_FS=y
|
|
# CONFIG_DNOTIFY is not set
|
|
CONFIG_VFAT_FS=y
|
|
CONFIG_TMPFS=y
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_NLS_CODEPAGE_437=y
|
|
CONFIG_NLS_ISO8859_1=y
|
|
CONFIG_PRINTK_TIME=y
|
|
CONFIG_MAGIC_SYSRQ=y
|
|
CONFIG_DEBUG_FS=y
|
|
CONFIG_DETECT_HUNG_TASK=y
|
|
CONFIG_SCHEDSTATS=y
|
|
CONFIG_TIMER_STATS=y
|
|
CONFIG_DEBUG_SLAB=y
|
|
# CONFIG_DEBUG_PREEMPT is not set
|
|
CONFIG_DEBUG_MUTEXES=y
|
|
CONFIG_DEBUG_INFO=y
|
|
CONFIG_DEBUG_VM=y
|
|
CONFIG_DEBUG_SG=y
|
|
CONFIG_DEBUG_LL=y
|
|
CONFIG_EARLY_PRINTK=y
|
|
CONFIG_CRYPTO_ECB=y
|
|
CONFIG_CRYPTO_ARC4=y
|
|
CONFIG_CRYPTO_TWOFISH=y
|
|
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
|
CONFIG_CRYPTO_DEV_TEGRA_AES=y
|
|
CONFIG_CRC_CCITT=y
|