mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-19 09:04:57 +00:00
6c5096e553
These updates are all for board specific code, including
* defconfig updates for shmobile, davinci, bcm2835, imx, omap and tegra
* SD/MMC and I2C support on bcm2835 (Raspberry PI)
* minor updates for PXA
* shmobile updates to GPIO usage in board files
* More things in OMAP board files are moved over to device tree probing
* Better support for audio devices on some OMAP platforms
Conflicts include the omap board-apollon.c file that is removed without
a replacement, and conflicting context in the 4430sdp board file.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUAUSUyPmCrR//JCVInAQKc4xAAm3UXWLjjIecgdcWperYzUn8wVGg2sRvT
eFFtGvj3iC+HttPw01O2uVn2O/ixW6SJIgls1O3VTt6IKXPQg3OCjeu1/1vvgq14
IWuOVS9TLUS4IWkbIvQSdWrDTHocon1Umx+yIgyOpenHBn6kHMg1Tx6qQlUKKo8q
ne8DKlAfSmao2oHg08Biuzc+cjUOCj7Dq57P1Y5gRhtmdXiFfvdd6GytyFAGUl/m
60c7BECUs9ileeAUTgehsUk84uV9w/FHeWhccxKspd8GjuHg31t5lB/PEEud34FK
CTBWoPRn/xG6qjmp34kjP2zIFVfiYYscJpSzXw+cOmPx2gNcs9mGUflAmG9I2t/C
TPuRCgmhqjZkfHjoNPUaGSvLa4m3279lrqxVqU6BWs8NlqzXSma1rqUKCxikV4lR
OlPasykwIGdHoJWyrm517RRkLq9Jn2XxtZmequp8TAsUBzW1Su3ZNArSQ6VqGTgs
W8T20UGVj4bDaAUG4VICeRZGIJx5wknEr11NrRL1a0/EFhFUxNFZf5JAs1YHw/Yi
rJP8oTppbo6eAaTThc6/a1/rklu8TUcRvmeS+iIH4IFxbroqc/ntAYd16+cKhPbO
EJtvUv2B3WQZesV7zmDG4TzleYjgYeFxPzTeYHHOYRIgDA3al2eSlp6EIZULSmul
gqxlMv/YHF8=
=/qBE
-----END PGP SIGNATURE-----
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board specific changes from Arnd Bergmann:
"These updates are all for board specific code, including
- defconfig updates for shmobile, davinci, bcm2835, imx, omap and
tegra
- SD/MMC and I2C support on bcm2835 (Raspberry PI)
- minor updates for PXA
- shmobile updates to GPIO usage in board files
- More things in OMAP board files are moved over to device tree
probing
- Better support for audio devices on some OMAP platforms"
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
ARM: imx_v4_v5_defconfig: Add VPU support
ARM: imx: configs: enable netfilter support
ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
RX-51: Register twl4030-madc device
RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
ARM: OMAP1: nokia770: enable CBUS/Retu
ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
ARM: OMAP2+: craneboard: support the TPS65910 PMU
ARM: OMAP2+: craneboard: support NAND device
ARM: OMAP3: cm-t3517: add MMC support
ARM: OMAP2+: Remove apollon board support
ARM: shmobile: armadillo800eva: set clock rates before timer init
ARM: tegra: defconfig updates
ARM: shmobile: mackerel: Use gpio_request_one()
ARM: shmobile: kzm9g: Use gpio_request_one()
ARM: shmobile: bonito: Use gpio_request_one()
...
259 lines
5.9 KiB
Text
259 lines
5.9 KiB
Text
CONFIG_EXPERIMENTAL=y
|
|
# CONFIG_LOCALVERSION_AUTO is not set
|
|
CONFIG_KERNEL_LZO=y
|
|
CONFIG_SYSVIPC=y
|
|
CONFIG_NO_HZ=y
|
|
CONFIG_HIGH_RES_TIMERS=y
|
|
CONFIG_LOG_BUF_SHIFT=18
|
|
CONFIG_CGROUPS=y
|
|
CONFIG_RELAY=y
|
|
CONFIG_BLK_DEV_INITRD=y
|
|
CONFIG_EXPERT=y
|
|
# CONFIG_SLUB_DEBUG is not set
|
|
# CONFIG_COMPAT_BRK is not set
|
|
CONFIG_MODULES=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
CONFIG_MODVERSIONS=y
|
|
CONFIG_MODULE_SRCVERSION_ALL=y
|
|
# CONFIG_BLK_DEV_BSG is not set
|
|
CONFIG_ARCH_MXC=y
|
|
CONFIG_ARCH_MULTI_V6=y
|
|
CONFIG_ARCH_MULTI_V7=y
|
|
CONFIG_MACH_IMX31_DT=y
|
|
CONFIG_MACH_MX31LILLY=y
|
|
CONFIG_MACH_MX31LITE=y
|
|
CONFIG_MACH_PCM037=y
|
|
CONFIG_MACH_PCM037_EET=y
|
|
CONFIG_MACH_MX31_3DS=y
|
|
CONFIG_MACH_MX31MOBOARD=y
|
|
CONFIG_MACH_QONG=y
|
|
CONFIG_MACH_ARMADILLO5X0=y
|
|
CONFIG_MACH_KZM_ARM11_01=y
|
|
CONFIG_MACH_PCM043=y
|
|
CONFIG_MACH_MX35_3DS=y
|
|
CONFIG_MACH_VPR200=y
|
|
CONFIG_MACH_IMX51_DT=y
|
|
CONFIG_MACH_EUKREA_CPUIMX51SD=y
|
|
CONFIG_SOC_IMX53=y
|
|
CONFIG_SOC_IMX6Q=y
|
|
CONFIG_MXC_PWM=y
|
|
CONFIG_SMP=y
|
|
CONFIG_VMSPLIT_2G=y
|
|
CONFIG_PREEMPT_VOLUNTARY=y
|
|
CONFIG_AEABI=y
|
|
# CONFIG_OABI_COMPAT is not set
|
|
CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
|
|
CONFIG_VFP=y
|
|
CONFIG_NEON=y
|
|
CONFIG_BINFMT_MISC=m
|
|
CONFIG_PM_DEBUG=y
|
|
CONFIG_PM_TEST_SUSPEND=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_INET=y
|
|
CONFIG_IP_PNP=y
|
|
CONFIG_IP_PNP_DHCP=y
|
|
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
|
|
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
|
|
# CONFIG_INET_XFRM_MODE_BEET is not set
|
|
# CONFIG_INET_LRO is not set
|
|
CONFIG_IPV6=y
|
|
CONFIG_NETFILTER=y
|
|
# CONFIG_WIRELESS is not set
|
|
CONFIG_DEVTMPFS=y
|
|
CONFIG_DEVTMPFS_MOUNT=y
|
|
# CONFIG_STANDALONE is not set
|
|
CONFIG_CONNECTOR=y
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_CMDLINE_PARTS=y
|
|
CONFIG_MTD_CHAR=y
|
|
CONFIG_MTD_BLOCK=y
|
|
CONFIG_MTD_CFI=y
|
|
CONFIG_MTD_JEDECPROBE=y
|
|
CONFIG_MTD_CFI_INTELEXT=y
|
|
CONFIG_MTD_CFI_AMDSTD=y
|
|
CONFIG_MTD_CFI_STAA=y
|
|
CONFIG_MTD_DATAFLASH=y
|
|
CONFIG_MTD_M25P80=y
|
|
CONFIG_MTD_SST25L=y
|
|
CONFIG_MTD_NAND=y
|
|
CONFIG_MTD_NAND_GPMI_NAND=y
|
|
CONFIG_MTD_NAND_MXC=y
|
|
CONFIG_MTD_UBI=y
|
|
CONFIG_BLK_DEV_LOOP=y
|
|
CONFIG_BLK_DEV_RAM=y
|
|
CONFIG_BLK_DEV_RAM_SIZE=65536
|
|
CONFIG_EEPROM_AT24=y
|
|
CONFIG_EEPROM_AT25=y
|
|
# CONFIG_SCSI_PROC_FS is not set
|
|
CONFIG_BLK_DEV_SD=y
|
|
CONFIG_SCSI_MULTI_LUN=y
|
|
CONFIG_SCSI_CONSTANTS=y
|
|
CONFIG_SCSI_LOGGING=y
|
|
CONFIG_SCSI_SCAN_ASYNC=y
|
|
# CONFIG_SCSI_LOWLEVEL is not set
|
|
CONFIG_ATA=y
|
|
CONFIG_PATA_IMX=y
|
|
CONFIG_NETDEVICES=y
|
|
# CONFIG_NET_VENDOR_BROADCOM is not set
|
|
# CONFIG_NET_VENDOR_CHELSIO is not set
|
|
CONFIG_CS89x0=y
|
|
CONFIG_CS89x0_PLATFORM=y
|
|
# CONFIG_NET_VENDOR_FARADAY is not set
|
|
# CONFIG_NET_VENDOR_INTEL is not set
|
|
# CONFIG_NET_VENDOR_MARVELL is not set
|
|
# CONFIG_NET_VENDOR_MICREL is not set
|
|
# CONFIG_NET_VENDOR_MICROCHIP is not set
|
|
# CONFIG_NET_VENDOR_NATSEMI is not set
|
|
# CONFIG_NET_VENDOR_SEEQ is not set
|
|
CONFIG_SMC91X=y
|
|
CONFIG_SMC911X=y
|
|
CONFIG_SMSC911X=y
|
|
# CONFIG_NET_VENDOR_STMICRO is not set
|
|
# CONFIG_WLAN is not set
|
|
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
|
|
CONFIG_INPUT_EVDEV=y
|
|
CONFIG_INPUT_EVBUG=m
|
|
CONFIG_KEYBOARD_GPIO=y
|
|
CONFIG_KEYBOARD_IMX=y
|
|
CONFIG_MOUSE_PS2=m
|
|
CONFIG_MOUSE_PS2_ELANTECH=y
|
|
CONFIG_INPUT_TOUCHSCREEN=y
|
|
CONFIG_TOUCHSCREEN_MC13783=y
|
|
CONFIG_INPUT_MISC=y
|
|
CONFIG_INPUT_MMA8450=y
|
|
CONFIG_SERIO_SERPORT=m
|
|
CONFIG_VT_HW_CONSOLE_BINDING=y
|
|
# CONFIG_LEGACY_PTYS is not set
|
|
# CONFIG_DEVKMEM is not set
|
|
CONFIG_SERIAL_IMX=y
|
|
CONFIG_SERIAL_IMX_CONSOLE=y
|
|
CONFIG_HW_RANDOM=y
|
|
CONFIG_HW_RANDOM_MXC_RNGA=y
|
|
CONFIG_I2C=y
|
|
# CONFIG_I2C_COMPAT is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
# CONFIG_I2C_HELPER_AUTO is not set
|
|
CONFIG_I2C_ALGOBIT=m
|
|
CONFIG_I2C_ALGOPCF=m
|
|
CONFIG_I2C_ALGOPCA=m
|
|
CONFIG_I2C_IMX=y
|
|
CONFIG_SPI=y
|
|
CONFIG_SPI_IMX=y
|
|
CONFIG_GPIO_SYSFS=y
|
|
CONFIG_GPIO_MC9S08DZ60=y
|
|
# CONFIG_HWMON is not set
|
|
CONFIG_WATCHDOG=y
|
|
CONFIG_IMX2_WDT=y
|
|
CONFIG_MFD_DA9052_I2C=y
|
|
CONFIG_MFD_MC13XXX_SPI=y
|
|
CONFIG_MFD_MC13XXX_I2C=y
|
|
CONFIG_REGULATOR=y
|
|
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
|
CONFIG_REGULATOR_DA9052=y
|
|
CONFIG_REGULATOR_ANATOP=y
|
|
CONFIG_REGULATOR_MC13783=y
|
|
CONFIG_REGULATOR_MC13892=y
|
|
CONFIG_MEDIA_SUPPORT=y
|
|
CONFIG_VIDEO_DEV=y
|
|
CONFIG_V4L_PLATFORM_DRIVERS=y
|
|
CONFIG_MEDIA_CAMERA_SUPPORT=y
|
|
CONFIG_SOC_CAMERA=y
|
|
CONFIG_SOC_CAMERA_OV2640=y
|
|
CONFIG_DRM=y
|
|
CONFIG_VIDEO_MX3=y
|
|
CONFIG_FB=y
|
|
CONFIG_LCD_PLATFORM=y
|
|
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
|
CONFIG_LCD_CLASS_DEVICE=y
|
|
CONFIG_LCD_L4F00242T03=y
|
|
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
|
|
CONFIG_FONTS=y
|
|
CONFIG_FONT_8x8=y
|
|
CONFIG_FONT_8x16=y
|
|
CONFIG_LOGO=y
|
|
CONFIG_SOUND=y
|
|
CONFIG_SND=y
|
|
CONFIG_SND_SOC=y
|
|
CONFIG_SND_IMX_SOC=y
|
|
CONFIG_SND_SOC_PHYCORE_AC97=y
|
|
CONFIG_SND_SOC_EUKREA_TLV320=y
|
|
CONFIG_SND_SOC_IMX_SGTL5000=y
|
|
CONFIG_SND_SOC_IMX_MC13783=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_MXC=y
|
|
CONFIG_USB_CHIPIDEA=y
|
|
CONFIG_USB_CHIPIDEA_HOST=y
|
|
CONFIG_USB_MXS_PHY=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_MMC=y
|
|
CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_PLTFM=y
|
|
CONFIG_MMC_SDHCI_ESDHC_IMX=y
|
|
CONFIG_NEW_LEDS=y
|
|
CONFIG_LEDS_CLASS=y
|
|
CONFIG_RTC_CLASS=y
|
|
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
|
|
CONFIG_RTC_DRV_MC13XXX=y
|
|
CONFIG_RTC_DRV_MXC=y
|
|
CONFIG_RTC_DRV_SNVS=y
|
|
CONFIG_DMADEVICES=y
|
|
CONFIG_IMX_SDMA=y
|
|
CONFIG_MXS_DMA=y
|
|
CONFIG_STAGING=y
|
|
CONFIG_DRM_IMX=y
|
|
CONFIG_DRM_IMX_IPUV3_CORE=y
|
|
CONFIG_DRM_IMX_IPUV3=y
|
|
CONFIG_COMMON_CLK_DEBUG=y
|
|
# CONFIG_IOMMU_SUPPORT is not set
|
|
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_FS_POSIX_ACL=y
|
|
CONFIG_EXT3_FS_SECURITY=y
|
|
CONFIG_EXT4_FS=y
|
|
CONFIG_EXT4_FS_POSIX_ACL=y
|
|
CONFIG_EXT4_FS_SECURITY=y
|
|
CONFIG_QUOTA=y
|
|
CONFIG_QUOTA_NETLINK_INTERFACE=y
|
|
# CONFIG_PRINT_QUOTA_WARNING is not set
|
|
CONFIG_AUTOFS4_FS=y
|
|
CONFIG_FUSE_FS=y
|
|
CONFIG_ISO9660_FS=m
|
|
CONFIG_JOLIET=y
|
|
CONFIG_ZISOFS=y
|
|
CONFIG_UDF_FS=m
|
|
CONFIG_MSDOS_FS=m
|
|
CONFIG_VFAT_FS=y
|
|
CONFIG_TMPFS=y
|
|
CONFIG_CONFIGFS_FS=m
|
|
CONFIG_JFFS2_FS=y
|
|
CONFIG_UBIFS_FS=y
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_NFS_V3_ACL=y
|
|
CONFIG_NFS_V4=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_NLS_DEFAULT="cp437"
|
|
CONFIG_NLS_CODEPAGE_437=y
|
|
CONFIG_NLS_ASCII=y
|
|
CONFIG_NLS_ISO8859_1=y
|
|
CONFIG_NLS_ISO8859_15=m
|
|
CONFIG_NLS_UTF8=y
|
|
CONFIG_MAGIC_SYSRQ=y
|
|
# CONFIG_SCHED_DEBUG is not set
|
|
# CONFIG_DEBUG_BUGVERBOSE is not set
|
|
# CONFIG_FTRACE is not set
|
|
# CONFIG_ARM_UNWIND is not set
|
|
CONFIG_SECURITYFS=y
|
|
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
|
# CONFIG_CRYPTO_HW is not set
|
|
CONFIG_CRC_CCITT=m
|
|
CONFIG_CRC_T10DIF=y
|
|
CONFIG_CRC7=m
|
|
CONFIG_LIBCRC32C=m
|