mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 11:21:33 +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()
...
280 lines
6.2 KiB
Plaintext
280 lines
6.2 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_OMAP2PLUS=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_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_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_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_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_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_OMAP_WATCHDOG=y
|
|
CONFIG_TWL4030_WATCHDOG=y
|
|
CONFIG_MFD_TPS65217=y
|
|
CONFIG_MFD_TPS65910=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_PANEL_GENERIC_DPI=m
|
|
CONFIG_PANEL_TFP410=m
|
|
CONFIG_PANEL_SHARP_LS037V7DW01=m
|
|
CONFIG_PANEL_NEC_NL8048HL11_01B=m
|
|
CONFIG_PANEL_TAAL=m
|
|
CONFIG_PANEL_TPO_TD043MTEA1=m
|
|
CONFIG_PANEL_ACX565AKM=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_OMAP3_PANDORA=m
|
|
CONFIG_USB=y
|
|
CONFIG_USB_DEBUG=y
|
|
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
|
CONFIG_USB_DEVICEFS=y
|
|
CONFIG_USB_SUSPEND=y
|
|
CONFIG_USB_MON=y
|
|
CONFIG_USB_WDM=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_USB_LIBUSUAL=y
|
|
CONFIG_USB_TEST=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_DMA_OMAP=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
|