mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-19 15:39:07 +00:00
34800598b2
These are all specific to some driver. They are typically the platform side of a change in the drivers directory, such as adding a new driver or extending the interface to the platform. In cases where there is no maintainer for the driver, or the maintainer prefers to have the platform changes in the same branch as the driver changes, the patches to the drivers are included as well. A much smaller set of driver updates that depend on other branches getting merged first will be sent later. The new export of tegra_chip_uid conflicts with other changes in fuse.c. In rtc-sa1100.c, the global removal of IRQF_DISABLED conflicts with the cleanup of the interrupt handling of that driver. Signed-off-by: Arnd Bergmann <arnd@arndb.de> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUAT24/Y2CrR//JCVInAQLUdw//V4pKPuKempSe1kuD2MJfqldHwEVOlAUt of1IhLPAp8tpCscPDQ0yTy3ixquINg4jVnaDLL+E0quVbhLu6hlS2TYNKDEaVAAc cPUtVEUdja7Cfu4+bXX2vcWM/UyI6Ax7bsUUcwu4wFnEsjA6qOSu/jYY4jXDguHq ODGQSaSz0XQkfVBsWOlO8W/ejb0T3y+Ro3M/Vz5qJsMnZBR8R/i9aUYDFGiZ1GTn 3APHB7ALz6SS5/9SJS65PH16poBexcea5gyb3gnR1yt30kRmMTOAWrLC+JdyqFaO 7LHXW514+D1QbWV2gwNCWhQSLbgp9PWq/FXJtq4StW7tgNbDbj1d1Dc1GX+fvk2M bBih1yWoIVx6CZWFBQ7gsbqVHUZ/sW2fo76yb8K5dVPXx0fL5lEkv5Xwk3gxbqt5 lPE8+z+jiL5D+8RK1DZQu1PfxzaMwDZkJkVoGLCcdyM7FvnX3LIYf2bqbcp+zrQL lz9aht9C1k12R7feOX8emlluNd3eaKv/6jLrOasUP5wrJDam5hesSD5mLeTlAdxZ U8XJe4L24dFv15/yrMCzcyes5EmB3aS3nfb9TsSfq22IOKo2PCQLCnL6Z/rfM+1p mGu7BqdBnx3/8NkHdUrttMWjuPNh77MfPM6RO/E+TaBLHtwvKoLWJAHAYQNmt2xH IbGcyorBD5s= =pQ3X -----END PGP SIGNATURE----- Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: driver specific updates" from Arnd Bergmann: "These are all specific to some driver. They are typically the platform side of a change in the drivers directory, such as adding a new driver or extending the interface to the platform. In cases where there is no maintainer for the driver, or the maintainer prefers to have the platform changes in the same branch as the driver changes, the patches to the drivers are included as well. A much smaller set of driver updates that depend on other branches getting merged first will be sent later. The new export of tegra_chip_uid conflicts with other changes in fuse.c. In rtc-sa1100.c, the global removal of IRQF_DISABLED conflicts with the cleanup of the interrupt handling of that driver. Signed-off-by: Arnd Bergmann <arnd@arndb.de>" Fixed up aforementioned trivial conflicts. * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits) ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci mmc: sdhci-s3c: add platform data for the second capability ARM: SAMSUNG: support the second capability for samsung-soc ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1 ARM: EXYNOS: Enable MDMA driver regulator: Remove bq24022 regulator driver rtc: sa1100: add OF support pxa: magician/hx4700: Convert to gpio-regulator from bq24022 ARM: OMAP3+: SmartReflex: fix error handling ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API ARM: OMAP3+: SmartReflex: micro-optimization for sanity check ARM: OMAP3+: SmartReflex: misc cleanups ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata() ARM: OMAP3+: hwmod: add SmartReflex IRQs ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register ARM: OMAP3+: SmartReflex: Add a shutdown hook ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP ... Conflicts: arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/fuse.c drivers/rtc/rtc-sa1100.c
393 lines
7.8 KiB
Plaintext
393 lines
7.8 KiB
Plaintext
# arch/arm/mach-exynos/Kconfig
|
|
#
|
|
# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
|
|
# http://www.samsung.com/
|
|
#
|
|
# Licensed under GPLv2
|
|
|
|
# Configuration options for the EXYNOS4
|
|
|
|
if ARCH_EXYNOS
|
|
|
|
menu "SAMSUNG EXYNOS SoCs Support"
|
|
|
|
choice
|
|
prompt "EXYNOS System Type"
|
|
default ARCH_EXYNOS4
|
|
|
|
config ARCH_EXYNOS4
|
|
bool "SAMSUNG EXYNOS4"
|
|
select HAVE_SMP
|
|
select MIGHT_HAVE_CACHE_L2X0
|
|
help
|
|
Samsung EXYNOS4 SoCs based systems
|
|
|
|
endchoice
|
|
|
|
comment "EXYNOS SoCs"
|
|
|
|
config CPU_EXYNOS4210
|
|
bool "SAMSUNG EXYNOS4210"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
select SAMSUNG_DMADEV
|
|
select ARM_CPU_SUSPEND if PM
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
select PM_GENERIC_DOMAINS
|
|
help
|
|
Enable EXYNOS4210 CPU support
|
|
|
|
config SOC_EXYNOS4212
|
|
bool "SAMSUNG EXYNOS4212"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
select SAMSUNG_DMADEV
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
help
|
|
Enable EXYNOS4212 SoC support
|
|
|
|
config SOC_EXYNOS4412
|
|
bool "SAMSUNG EXYNOS4412"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
select SAMSUNG_DMADEV
|
|
help
|
|
Enable EXYNOS4412 SoC support
|
|
|
|
config EXYNOS4_MCT
|
|
bool
|
|
default y
|
|
help
|
|
Use MCT (Multi Core Timer) as kernel timers
|
|
|
|
config EXYNOS4_DEV_DMA
|
|
bool
|
|
help
|
|
Compile in amba device definitions for DMA controller
|
|
|
|
config EXYNOS4_DEV_AHCI
|
|
bool
|
|
help
|
|
Compile in platform device definitions for AHCI
|
|
|
|
config EXYNOS4_SETUP_FIMD0
|
|
bool
|
|
help
|
|
Common setup code for FIMD0.
|
|
|
|
config EXYNOS4_DEV_SYSMMU
|
|
bool
|
|
help
|
|
Common setup code for SYSTEM MMU in EXYNOS4
|
|
|
|
config EXYNOS4_DEV_DWMCI
|
|
bool
|
|
help
|
|
Compile in platform device definitions for DWMCI
|
|
|
|
config EXYNOS4_DEV_USB_OHCI
|
|
bool
|
|
help
|
|
Compile in platform device definition for USB OHCI
|
|
|
|
config EXYNOS4_SETUP_I2C1
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 1.
|
|
|
|
config EXYNOS4_SETUP_I2C2
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 2.
|
|
|
|
config EXYNOS4_SETUP_I2C3
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 3.
|
|
|
|
config EXYNOS4_SETUP_I2C4
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 4.
|
|
|
|
config EXYNOS4_SETUP_I2C5
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 5.
|
|
|
|
config EXYNOS4_SETUP_I2C6
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 6.
|
|
|
|
config EXYNOS4_SETUP_I2C7
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 7.
|
|
|
|
config EXYNOS4_SETUP_KEYPAD
|
|
bool
|
|
help
|
|
Common setup code for keypad.
|
|
|
|
config EXYNOS4_SETUP_SDHCI
|
|
bool
|
|
select EXYNOS4_SETUP_SDHCI_GPIO
|
|
help
|
|
Internal helper functions for EXYNOS4 based SDHCI systems.
|
|
|
|
config EXYNOS4_SETUP_SDHCI_GPIO
|
|
bool
|
|
help
|
|
Common setup code for SDHCI gpio.
|
|
|
|
config EXYNOS4_SETUP_FIMC
|
|
bool
|
|
help
|
|
Common setup code for the camera interfaces.
|
|
|
|
config EXYNOS4_SETUP_USB_PHY
|
|
bool
|
|
help
|
|
Common setup code for USB PHY controller
|
|
|
|
config EXYNOS4_SETUP_SPI
|
|
bool
|
|
help
|
|
Common setup code for SPI GPIO configurations.
|
|
|
|
# machine support
|
|
|
|
if ARCH_EXYNOS4
|
|
|
|
comment "EXYNOS4210 Boards"
|
|
|
|
config MACH_SMDKC210
|
|
bool "SMDKC210"
|
|
select MACH_SMDKV310
|
|
help
|
|
Machine support for Samsung SMDKC210
|
|
|
|
config MACH_SMDKV310
|
|
bool "SMDKV310"
|
|
select CPU_EXYNOS4210
|
|
select S5P_DEV_FIMD0
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S3C_DEV_I2C1
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S5P_DEV_FIMC3
|
|
select S5P_DEV_G2D
|
|
select S5P_DEV_I2C_HDMIPHY
|
|
select S5P_DEV_JPEG
|
|
select S5P_DEV_MFC
|
|
select S5P_DEV_TV
|
|
select S5P_DEV_USB_EHCI
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select SAMSUNG_DEV_BACKLIGHT
|
|
select EXYNOS4_DEV_AHCI
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select EXYNOS4_DEV_DMA
|
|
select SAMSUNG_DEV_PWM
|
|
select EXYNOS4_DEV_USB_OHCI
|
|
select EXYNOS4_DEV_SYSMMU
|
|
select EXYNOS4_SETUP_FIMD0
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_KEYPAD
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS4_SETUP_USB_PHY
|
|
help
|
|
Machine support for Samsung SMDKV310
|
|
|
|
config MACH_ARMLEX4210
|
|
bool "ARMLEX4210"
|
|
select CPU_EXYNOS4210
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select EXYNOS4_DEV_AHCI
|
|
select EXYNOS4_DEV_DMA
|
|
select EXYNOS4_DEV_SYSMMU
|
|
select EXYNOS4_SETUP_SDHCI
|
|
help
|
|
Machine support for Samsung ARMLEX4210 based on EXYNOS4210
|
|
|
|
config MACH_UNIVERSAL_C210
|
|
bool "Mobile UNIVERSAL_C210 Board"
|
|
select CPU_EXYNOS4210
|
|
select S5P_GPIO_INT
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S5P_DEV_FIMC3
|
|
select S5P_DEV_G2D
|
|
select S5P_DEV_CSIS0
|
|
select S5P_DEV_JPEG
|
|
select S5P_DEV_FIMD0
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C3
|
|
select S3C_DEV_I2C5
|
|
select S5P_DEV_I2C_HDMIPHY
|
|
select S5P_DEV_MFC
|
|
select S5P_DEV_ONENAND
|
|
select S5P_DEV_TV
|
|
select EXYNOS4_DEV_DMA
|
|
select EXYNOS4_SETUP_FIMD0
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_I2C3
|
|
select EXYNOS4_SETUP_I2C5
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS4_SETUP_FIMC
|
|
select S5P_SETUP_MIPIPHY
|
|
help
|
|
Machine support for Samsung Mobile Universal S5PC210 Reference
|
|
Board.
|
|
|
|
config MACH_NURI
|
|
bool "Mobile NURI Board"
|
|
select CPU_EXYNOS4210
|
|
select S5P_GPIO_INT
|
|
select S3C_DEV_WDT
|
|
select S3C_DEV_RTC
|
|
select S5P_DEV_FIMD0
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C3
|
|
select S3C_DEV_I2C5
|
|
select S3C_DEV_I2C6
|
|
select S5P_DEV_CSIS0
|
|
select S5P_DEV_JPEG
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S5P_DEV_FIMC3
|
|
select S5P_DEV_G2D
|
|
select S5P_DEV_MFC
|
|
select S5P_DEV_USB_EHCI
|
|
select S5P_SETUP_MIPIPHY
|
|
select EXYNOS4_DEV_DMA
|
|
select EXYNOS4_SETUP_FIMC
|
|
select EXYNOS4_SETUP_FIMD0
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_I2C3
|
|
select EXYNOS4_SETUP_I2C5
|
|
select EXYNOS4_SETUP_I2C6
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS4_SETUP_USB_PHY
|
|
select S5P_SETUP_MIPIPHY
|
|
select SAMSUNG_DEV_PWM
|
|
select SAMSUNG_DEV_ADC
|
|
help
|
|
Machine support for Samsung Mobile NURI Board.
|
|
|
|
config MACH_ORIGEN
|
|
bool "ORIGEN"
|
|
select CPU_EXYNOS4210
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC2
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S5P_DEV_FIMC3
|
|
select S5P_DEV_FIMD0
|
|
select S5P_DEV_G2D
|
|
select S5P_DEV_I2C_HDMIPHY
|
|
select S5P_DEV_JPEG
|
|
select S5P_DEV_MFC
|
|
select S5P_DEV_TV
|
|
select S5P_DEV_USB_EHCI
|
|
select SAMSUNG_DEV_BACKLIGHT
|
|
select SAMSUNG_DEV_PWM
|
|
select EXYNOS4_DEV_DMA
|
|
select EXYNOS4_DEV_USB_OHCI
|
|
select EXYNOS4_SETUP_FIMD0
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS4_SETUP_USB_PHY
|
|
help
|
|
Machine support for ORIGEN based on Samsung EXYNOS4210
|
|
|
|
comment "EXYNOS4212 Boards"
|
|
|
|
config MACH_SMDK4212
|
|
bool "SMDK4212"
|
|
select SOC_EXYNOS4212
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C3
|
|
select S3C_DEV_I2C7
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select SAMSUNG_DEV_BACKLIGHT
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select SAMSUNG_DEV_PWM
|
|
select EXYNOS4_DEV_DMA
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_I2C3
|
|
select EXYNOS4_SETUP_I2C7
|
|
select EXYNOS4_SETUP_KEYPAD
|
|
select EXYNOS4_SETUP_SDHCI
|
|
help
|
|
Machine support for Samsung SMDK4212
|
|
|
|
comment "EXYNOS4412 Boards"
|
|
|
|
config MACH_SMDK4412
|
|
bool "SMDK4412"
|
|
select SOC_EXYNOS4412
|
|
select MACH_SMDK4212
|
|
help
|
|
Machine support for Samsung SMDK4412
|
|
endif
|
|
|
|
comment "Flattened Device Tree based board for Exynos4 based SoC"
|
|
|
|
config MACH_EXYNOS4_DT
|
|
bool "Samsung Exynos4 Machine using device tree"
|
|
select CPU_EXYNOS4210
|
|
select USE_OF
|
|
select ARM_AMBA
|
|
select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
|
|
help
|
|
Machine support for Samsung Exynos4 machine with device tree enabled.
|
|
Select this if a fdt blob is available for the Exynos4 SoC based board.
|
|
Note: This is under development and not all peripherals can be supported
|
|
with this machine file.
|
|
|
|
if ARCH_EXYNOS4
|
|
|
|
comment "Configuration for HSMMC 8-bit bus width"
|
|
|
|
config EXYNOS4_SDHCI_CH0_8BIT
|
|
bool "Channel 0 with 8-bit bus"
|
|
help
|
|
Support HSMMC Channel 0 8-bit bus.
|
|
If selected, Channel 1 is disabled.
|
|
|
|
config EXYNOS4_SDHCI_CH2_8BIT
|
|
bool "Channel 2 with 8-bit bus"
|
|
help
|
|
Support HSMMC Channel 2 8-bit bus.
|
|
If selected, Channel 3 is disabled.
|
|
endif
|
|
|
|
endmenu
|
|
|
|
endif
|