mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 11:21:33 +00:00
b4b50fd78b
This branch contains mostly additions and changes to platform enablement
and SoC-level drivers. Since there's sometimes a dependency on device-tree
changes, there's also a fair amount of those in this branch.
Pieces worth mentioning are:
- Mbus driver for Marvell platforms, allowing kernel configuration
and resource allocation of on-chip peripherals.
- Enablement of the mbus infrastructure from Marvell PCI-e drivers.
- Preparation of MSI support for Marvell platforms.
- Addition of new PCI-e host controller driver for Tegra platforms
- Some churn caused by sharing of macro names between i.MX 6Q and 6DL
platforms in the device tree sources and header files.
- Various suspend/PM updates for Tegra, including LP1 support.
- Versatile Express support for MCPM, part of big little support.
- Allwinner platform support for A20 and A31 SoCs (dual and quad Cortex-A7)
- OMAP2+ support for DRA7, a new Cortex-A15-based SoC.
The code that touches other architectures are patches moving
MSI arch-specific functions over to weak symbols and removal of
ARCH_SUPPORTS_MSI, acked by PCI maintainers.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSKhYmAAoJEIwa5zzehBx322AP/1ONYs8o8f7/Gzq6lZvTN6T3
0pBTApg6Jfioi3lwKvUAEIcsW82YKQ+UZkbW66GQH6+Ri4aZJKZHuz0+JPU67OJ4
LtSLuzVWrymy2VOOUvAnS/SXkOZw/pHhU4cLNHn1dMndhUL1Uqp9/XwuiHEQyFsP
uOkpcBtIu0EWElov0PKKZ5SWBg8JJs2vy5ydiViGelWHCrZvDDZkWzIsDcBQxJLQ
juzT4+JE+KOu7vKmfw78o6iHoCS2TBRAN9YUCajRb8Wl+out1hrTahHnDWaZ5Mce
EskcQNkJROqFbjD4k3ABN4XGTv2VDmrztIwFe0SEQ7Dz/9ypCrBGT69uI9xIqTXr
GwVRIwAUFTpMupK0gy93z1ajV3N0CXV79out9+jQNUQybYE+czp8QOyhmuc1tZx0
8fn9jlBQe9Vy6yrs39gEcE7nUwrayeyQ+6UvqqwsE2pWZabNAnCMSPX5+QIu+T/3
tQ7+jYmfFeserp1sIDOHOnxfhtW9EI6U9d1h/DUCwrsuFdkL9ha4M/vh9Pwgye98
tBdz0T4yE39AJQwwFWRkv1jcQKcGu6WqJanmvS4KRBksGwuLWxy+ewOnkz2ifS25
ZYSyxAryZRBvQRqlOK11rXPfRcbGcY0MG9lkKX96rGcyWEizgE1DdjxXD8HoIleN
R8heV6GX5OzlFLGX2tKK
=fJ5x
-----END PGP SIGNATURE-----
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform changes from Olof Johansson:
"This branch contains mostly additions and changes to platform
enablement and SoC-level drivers. Since there's sometimes a
dependency on device-tree changes, there's also a fair amount of
those in this branch.
Pieces worth mentioning are:
- Mbus driver for Marvell platforms, allowing kernel configuration
and resource allocation of on-chip peripherals.
- Enablement of the mbus infrastructure from Marvell PCI-e drivers.
- Preparation of MSI support for Marvell platforms.
- Addition of new PCI-e host controller driver for Tegra platforms
- Some churn caused by sharing of macro names between i.MX 6Q and 6DL
platforms in the device tree sources and header files.
- Various suspend/PM updates for Tegra, including LP1 support.
- Versatile Express support for MCPM, part of big little support.
- Allwinner platform support for A20 and A31 SoCs (dual and quad
Cortex-A7)
- OMAP2+ support for DRA7, a new Cortex-A15-based SoC.
The code that touches other architectures are patches moving MSI
arch-specific functions over to weak symbols and removal of
ARCH_SUPPORTS_MSI, acked by PCI maintainers"
* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (266 commits)
tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE
PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource
ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list
ARM: dts: vf610-twr: enable i2c0 device
ARM: dts: i.MX51: Add one more I2C2 pinmux entry
ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
ARM: dts: i.MX27: Disable AUDMUX in the template
ARM: dts: wandboard: Add support for SDIO bcm4329
ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
ARM: dts: imx53-qsb: Make USBH1 functional
ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module
ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
ARM: dts: imx6qdl-sabresd: Add touchscreen support
ARM: imx: add ocram clock for imx53
ARM: dts: imx: ocram size is different between imx6q and imx6dl
ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
ARM: dts: i.MX27: Remove clock name from CPU node
...
309 lines
6.9 KiB
Plaintext
309 lines
6.9 KiB
Plaintext
CONFIG_EXPERIMENTAL=y
|
|
CONFIG_SYSVIPC=y
|
|
CONFIG_POSIX_MQUEUE=y
|
|
CONFIG_BSD_PROCESS_ACCT=y
|
|
CONFIG_IKCONFIG=y
|
|
CONFIG_IKCONFIG_PROC=y
|
|
CONFIG_LOG_BUF_SHIFT=16
|
|
CONFIG_BLK_DEV_INITRD=y
|
|
CONFIG_EXPERT=y
|
|
# CONFIG_SYSCTL_SYSCALL is not set
|
|
CONFIG_KALLSYMS_EXTRA_PASS=y
|
|
CONFIG_SLAB=y
|
|
CONFIG_PROFILING=y
|
|
CONFIG_OPROFILE=y
|
|
CONFIG_KPROBES=y
|
|
CONFIG_MODULES=y
|
|
CONFIG_MODULE_FORCE_LOAD=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
CONFIG_MODULE_FORCE_UNLOAD=y
|
|
CONFIG_MODVERSIONS=y
|
|
CONFIG_MODULE_SRCVERSION_ALL=y
|
|
# CONFIG_BLK_DEV_BSG is not set
|
|
CONFIG_ARCH_MULTI_V6=y
|
|
CONFIG_ARCH_OMAP2PLUS=y
|
|
CONFIG_ARCH_OMAP2=y
|
|
CONFIG_ARCH_OMAP3=y
|
|
CONFIG_ARCH_OMAP4=y
|
|
CONFIG_SOC_AM33XX=y
|
|
CONFIG_OMAP_RESET_CLOCKS=y
|
|
CONFIG_OMAP_MUX_DEBUG=y
|
|
CONFIG_ARCH_VEXPRESS_CA9X4=y
|
|
CONFIG_ARM_THUMBEE=y
|
|
CONFIG_ARM_ERRATA_411920=y
|
|
CONFIG_NO_HZ=y
|
|
CONFIG_HIGH_RES_TIMERS=y
|
|
CONFIG_SMP=y
|
|
CONFIG_NR_CPUS=2
|
|
CONFIG_LEDS=y
|
|
CONFIG_ZBOOT_ROM_TEXT=0x0
|
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
|
CONFIG_ARM_APPENDED_DTB=y
|
|
CONFIG_ARM_ATAG_DTB_COMPAT=y
|
|
CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
|
|
CONFIG_KEXEC=y
|
|
CONFIG_FPE_NWFPE=y
|
|
CONFIG_BINFMT_MISC=y
|
|
CONFIG_PM_DEBUG=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_XFRM_USER=y
|
|
CONFIG_NET_KEY=y
|
|
CONFIG_NET_KEY_MIGRATE=y
|
|
CONFIG_INET=y
|
|
CONFIG_IP_MULTICAST=y
|
|
CONFIG_IP_PNP=y
|
|
CONFIG_IP_PNP_DHCP=y
|
|
CONFIG_IP_PNP_BOOTP=y
|
|
CONFIG_IP_PNP_RARP=y
|
|
# CONFIG_INET_LRO is not set
|
|
# CONFIG_IPV6 is not set
|
|
CONFIG_NETFILTER=y
|
|
CONFIG_CAN=m
|
|
CONFIG_CAN_RAW=m
|
|
CONFIG_CAN_BCM=m
|
|
CONFIG_CAN_C_CAN=m
|
|
CONFIG_CAN_C_CAN_PLATFORM=m
|
|
CONFIG_BT=m
|
|
CONFIG_BT_HCIUART=m
|
|
CONFIG_BT_HCIUART_H4=y
|
|
CONFIG_BT_HCIUART_BCSP=y
|
|
CONFIG_BT_HCIUART_LL=y
|
|
CONFIG_BT_HCIBCM203X=m
|
|
CONFIG_BT_HCIBPA10X=m
|
|
CONFIG_CFG80211=m
|
|
CONFIG_MAC80211=m
|
|
CONFIG_MAC80211_RC_PID=y
|
|
CONFIG_MAC80211_RC_DEFAULT_PID=y
|
|
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
|
CONFIG_CMA=y
|
|
CONFIG_DMA_CMA=y
|
|
CONFIG_CONNECTOR=y
|
|
CONFIG_DEVTMPFS=y
|
|
CONFIG_DEVTMPFS_MOUNT=y
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_CMDLINE_PARTS=y
|
|
CONFIG_MTD_CHAR=y
|
|
CONFIG_MTD_BLOCK=y
|
|
CONFIG_MTD_OOPS=y
|
|
CONFIG_MTD_CFI=y
|
|
CONFIG_MTD_CFI_INTELEXT=y
|
|
CONFIG_MTD_NAND=y
|
|
CONFIG_MTD_NAND_OMAP2=y
|
|
CONFIG_MTD_ONENAND=y
|
|
CONFIG_MTD_ONENAND_VERIFY_WRITE=y
|
|
CONFIG_MTD_ONENAND_OMAP2=y
|
|
CONFIG_MTD_UBI=y
|
|
CONFIG_BLK_DEV_LOOP=y
|
|
CONFIG_BLK_DEV_RAM=y
|
|
CONFIG_BLK_DEV_RAM_SIZE=16384
|
|
CONFIG_SENSORS_LIS3LV02D=m
|
|
CONFIG_SENSORS_TSL2550=m
|
|
CONFIG_SENSORS_LIS3_I2C=m
|
|
CONFIG_BMP085_I2C=m
|
|
CONFIG_SCSI=y
|
|
CONFIG_BLK_DEV_SD=y
|
|
CONFIG_SCSI_MULTI_LUN=y
|
|
CONFIG_SCSI_SCAN_ASYNC=y
|
|
CONFIG_MD=y
|
|
CONFIG_NETDEVICES=y
|
|
CONFIG_SMSC_PHY=y
|
|
CONFIG_NET_ETHERNET=y
|
|
CONFIG_SMC91X=y
|
|
CONFIG_SMSC911X=y
|
|
CONFIG_KS8851=y
|
|
CONFIG_KS8851_MLL=y
|
|
CONFIG_LIBERTAS=m
|
|
CONFIG_LIBERTAS_USB=m
|
|
CONFIG_LIBERTAS_SDIO=m
|
|
CONFIG_LIBERTAS_DEBUG=y
|
|
CONFIG_USB_USBNET=y
|
|
CONFIG_USB_NET_SMSC95XX=y
|
|
CONFIG_USB_ALI_M5632=y
|
|
CONFIG_USB_AN2720=y
|
|
CONFIG_USB_EPSON2888=y
|
|
CONFIG_USB_KC2190=y
|
|
CONFIG_INPUT_JOYDEV=y
|
|
CONFIG_INPUT_EVDEV=y
|
|
CONFIG_KEYBOARD_GPIO=y
|
|
CONFIG_KEYBOARD_MATRIX=m
|
|
CONFIG_KEYBOARD_TWL4030=y
|
|
CONFIG_INPUT_TOUCHSCREEN=y
|
|
CONFIG_TOUCHSCREEN_ADS7846=y
|
|
CONFIG_INPUT_MISC=y
|
|
CONFIG_INPUT_TWL4030_PWRBUTTON=y
|
|
CONFIG_VT_HW_CONSOLE_BINDING=y
|
|
# CONFIG_LEGACY_PTYS is not set
|
|
CONFIG_SERIAL_8250=y
|
|
CONFIG_SERIAL_8250_CONSOLE=y
|
|
CONFIG_SERIAL_8250_NR_UARTS=32
|
|
CONFIG_SERIAL_8250_EXTENDED=y
|
|
CONFIG_SERIAL_8250_MANY_PORTS=y
|
|
CONFIG_SERIAL_8250_SHARE_IRQ=y
|
|
CONFIG_SERIAL_8250_DETECT_IRQ=y
|
|
CONFIG_SERIAL_8250_RSA=y
|
|
CONFIG_SERIAL_AMBA_PL011=y
|
|
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
|
CONFIG_SERIAL_OMAP=y
|
|
CONFIG_SERIAL_OMAP_CONSOLE=y
|
|
CONFIG_HW_RANDOM=y
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_SPI=y
|
|
CONFIG_SPI_OMAP24XX=y
|
|
CONFIG_PINCTRL_SINGLE=y
|
|
CONFIG_DEBUG_GPIO=y
|
|
CONFIG_GPIO_SYSFS=y
|
|
CONFIG_GPIO_TWL4030=y
|
|
CONFIG_W1=y
|
|
CONFIG_POWER_SUPPLY=y
|
|
CONFIG_SENSORS_LM75=m
|
|
CONFIG_WATCHDOG=y
|
|
CONFIG_THERMAL=y
|
|
CONFIG_THERMAL_HWMON=y
|
|
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
|
CONFIG_THERMAL_GOV_FAIR_SHARE=y
|
|
CONFIG_THERMAL_GOV_STEP_WISE=y
|
|
CONFIG_THERMAL_GOV_USER_SPACE=y
|
|
CONFIG_CPU_THERMAL=y
|
|
CONFIG_OMAP_WATCHDOG=y
|
|
CONFIG_TWL4030_WATCHDOG=y
|
|
CONFIG_MFD_TPS65217=y
|
|
CONFIG_MFD_TPS65910=y
|
|
CONFIG_TWL6040_CORE=y
|
|
CONFIG_REGULATOR_TWL4030=y
|
|
CONFIG_REGULATOR_TPS65023=y
|
|
CONFIG_REGULATOR_TPS6507X=y
|
|
CONFIG_REGULATOR_TPS65217=y
|
|
CONFIG_REGULATOR_TPS65910=y
|
|
CONFIG_FB=y
|
|
CONFIG_FIRMWARE_EDID=y
|
|
CONFIG_FB_MODE_HELPERS=y
|
|
CONFIG_FB_TILEBLITTING=y
|
|
CONFIG_FB_OMAP_LCD_VGA=y
|
|
CONFIG_OMAP2_DSS=m
|
|
CONFIG_OMAP2_DSS_RFBI=y
|
|
CONFIG_OMAP2_DSS_SDI=y
|
|
CONFIG_OMAP2_DSS_DSI=y
|
|
CONFIG_FB_OMAP2=m
|
|
CONFIG_DISPLAY_ENCODER_TFP410=m
|
|
CONFIG_DISPLAY_ENCODER_TPD12S015=m
|
|
CONFIG_DISPLAY_CONNECTOR_DVI=m
|
|
CONFIG_DISPLAY_CONNECTOR_HDMI=m
|
|
CONFIG_DISPLAY_PANEL_DPI=m
|
|
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
|
CONFIG_LCD_CLASS_DEVICE=y
|
|
CONFIG_LCD_PLATFORM=y
|
|
CONFIG_DISPLAY_SUPPORT=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
|
|
CONFIG_FONTS=y
|
|
CONFIG_FONT_8x8=y
|
|
CONFIG_FONT_8x16=y
|
|
CONFIG_LOGO=y
|
|
CONFIG_SOUND=m
|
|
CONFIG_SND=m
|
|
CONFIG_SND_MIXER_OSS=m
|
|
CONFIG_SND_PCM_OSS=m
|
|
CONFIG_SND_VERBOSE_PRINTK=y
|
|
CONFIG_SND_DEBUG=y
|
|
CONFIG_SND_USB_AUDIO=m
|
|
CONFIG_SND_SOC=m
|
|
CONFIG_SND_OMAP_SOC=m
|
|
CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
|
|
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
|
|
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
|
|
CONFIG_USB=y
|
|
CONFIG_USB_DEBUG=y
|
|
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
|
CONFIG_USB_DEVICEFS=y
|
|
CONFIG_USB_MON=y
|
|
CONFIG_USB_WDM=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_USB_LIBUSUAL=y
|
|
CONFIG_USB_TEST=y
|
|
CONFIG_USB_PHY=y
|
|
CONFIG_NOP_USB_XCEIV=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_DEBUG=y
|
|
CONFIG_USB_GADGET_DEBUG_FILES=y
|
|
CONFIG_USB_GADGET_DEBUG_FS=y
|
|
CONFIG_USB_ZERO=m
|
|
CONFIG_MMC=y
|
|
CONFIG_MMC_UNSAFE_RESUME=y
|
|
CONFIG_SDIO_UART=y
|
|
CONFIG_MMC_ARMMMCI=y
|
|
CONFIG_MMC_OMAP=y
|
|
CONFIG_MMC_OMAP_HS=y
|
|
CONFIG_NEW_LEDS=y
|
|
CONFIG_LEDS_GPIO=y
|
|
CONFIG_LEDS_TRIGGERS=y
|
|
CONFIG_LEDS_TRIGGER_TIMER=y
|
|
CONFIG_LEDS_TRIGGER_ONESHOT=y
|
|
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
|
|
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
|
|
CONFIG_LEDS_TRIGGER_CPU=y
|
|
CONFIG_LEDS_TRIGGER_GPIO=y
|
|
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
|
|
CONFIG_RTC_CLASS=y
|
|
CONFIG_RTC_DRV_TWL92330=y
|
|
CONFIG_RTC_DRV_TWL4030=y
|
|
CONFIG_RTC_DRV_OMAP=y
|
|
CONFIG_DMADEVICES=y
|
|
CONFIG_TI_EDMA=y
|
|
CONFIG_DMA_OMAP=y
|
|
CONFIG_TI_SOC_THERMAL=y
|
|
CONFIG_TI_THERMAL=y
|
|
CONFIG_OMAP4_THERMAL=y
|
|
CONFIG_OMAP5_THERMAL=y
|
|
CONFIG_DRA752_THERMAL=y
|
|
CONFIG_EXT2_FS=y
|
|
CONFIG_EXT3_FS=y
|
|
# CONFIG_EXT3_FS_XATTR is not set
|
|
CONFIG_EXT4_FS=y
|
|
CONFIG_QUOTA=y
|
|
CONFIG_QFMT_V2=y
|
|
CONFIG_MSDOS_FS=y
|
|
CONFIG_VFAT_FS=y
|
|
CONFIG_TMPFS=y
|
|
CONFIG_JFFS2_FS=y
|
|
CONFIG_JFFS2_SUMMARY=y
|
|
CONFIG_JFFS2_FS_XATTR=y
|
|
CONFIG_JFFS2_COMPRESSION_OPTIONS=y
|
|
CONFIG_JFFS2_LZO=y
|
|
CONFIG_JFFS2_RUBIN=y
|
|
CONFIG_UBIFS_FS=y
|
|
CONFIG_CRAMFS=y
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_NFS_V3=y
|
|
CONFIG_NFS_V3_ACL=y
|
|
CONFIG_NFS_V4=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_PARTITION_ADVANCED=y
|
|
CONFIG_NLS_CODEPAGE_437=y
|
|
CONFIG_NLS_ISO8859_1=y
|
|
CONFIG_PRINTK_TIME=y
|
|
CONFIG_MAGIC_SYSRQ=y
|
|
CONFIG_DEBUG_KERNEL=y
|
|
CONFIG_SCHEDSTATS=y
|
|
CONFIG_TIMER_STATS=y
|
|
CONFIG_PROVE_LOCKING=y
|
|
CONFIG_DEBUG_SPINLOCK_SLEEP=y
|
|
# CONFIG_DEBUG_BUGVERBOSE is not set
|
|
CONFIG_DEBUG_INFO=y
|
|
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
|
|
CONFIG_SECURITY=y
|
|
CONFIG_CRYPTO_MICHAEL_MIC=y
|
|
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
|
CONFIG_CRC_CCITT=y
|
|
CONFIG_CRC_T10DIF=y
|
|
CONFIG_CRC_ITU_T=y
|
|
CONFIG_CRC7=y
|
|
CONFIG_LIBCRC32C=y
|
|
CONFIG_SOC_OMAP5=y
|
|
CONFIG_TI_DAVINCI_MDIO=y
|
|
CONFIG_TI_DAVINCI_CPDMA=y
|
|
CONFIG_TI_CPSW=y
|
|
CONFIG_AT803X_PHY=y
|
|
CONFIG_SOC_DRA7XX=y
|