6fa52ed33b
This is a rather large set of patches for device drivers that for one
reason or another the subsystem maintainer preferred to get merged
through the arm-soc tree. There are both new drivers as well as
existing drivers that are getting converted from platform-specific
code into standalone drivers using the appropriate subsystem
specific interfaces.
In particular, we can now have pinctrl, clk, clksource and irqchip
drivers in one file per driver, without the need to call into
platform specific interface, or to get called from platform specific
code, as long as all information about the hardware is provided
through a device tree.
Most of the drivers we touch this time are for clocksource. Since
now most of them are part of drivers/clocksource, I expect that we
won't have to touch these again from arm-soc and can let the
clocksource maintainers take care of these in the future.
Another larger part of this series is specific to the exynos platform,
which is seeing some significant effort in upstreaming and
modernization of its device drivers this time around, which
unfortunately is also the cause for the churn and a lot of the
merge conflicts.
There is one new subsystem that gets merged as part of this series:
the reset controller interface, which is a very simple interface
for taking devices on the SoC out of reset or back into reset.
Patches to use this interface on i.MX follow later in this merge
window, and we are going to have other platforms (at least tegra
and sirf) get converted in 3.11. This will let us get rid of
platform specific callbacks in a number of platform independent
device drivers.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJRhKUsAAoJEIwa5zzehBx3Ug4P/RqEen15hxS/NY8SIVRAU5c0
G9ZiSPcLmvXGR/t1RZFeLWKaKOYRb2oW1EbXrlkddprkmg85RuQE/KMpCgzPPhVC
Yrs8UaagMGblaLOjwavVjin/CUXZokRdMfsQoIyMGOezmVGFnv4d4Kt64IOf35DF
24vDv/QO0BAI9k6m6WLqlWvSshb0IkW8r2LneRLnMEAVop7b1xkOxz0sR6l0LWfV
6JAMXyTjJMg0t8uCVW/QyNdxcxINHhV4SYcNkzF3EZ7ol50OiJsT9fg0XW759+Wb
vlX6Xuehg+CBOg+g3ZOZuR8JOEkOhAGRSzuJkk/TmLCCxc+ghnuYz8HArxh6GMHK
KaxvogLIi0ZsD94A/BZIKkDtOLWlzdz2HBrYo9PTz8zrOz/gXhwQ3zq0jPccC5E0
S+YYiobCBXepknF9301ti7wGD9VDzI8nmqOKG6tEBrD3xuO+RoBv+z4pBugN4/1C
DlB19gOz60G5kniziL+wlmWER2qXmYrQZqS+s6+B2XoyoETC0Yij3Rck5vyC6qIK
A2sni+Y9rzNOB9nzmnISP/UiGUffCy8AV4DZJjMSl0XkF4cpOXqRVGZ2nGB4tR5q
GTOETcDCo5dvMDKX7Wfrz40CQzO39tnPCddg3OIS93ZwMpCeykIlb1FVL7RcsyF7
3uikzYHlDo3C5pvtJ5TS
=ZWk9
-----END PGP SIGNATURE-----
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver changes from Olof Johansson:
"This is a rather large set of patches for device drivers that for one
reason or another the subsystem maintainer preferred to get merged
through the arm-soc tree. There are both new drivers as well as
existing drivers that are getting converted from platform-specific
code into standalone drivers using the appropriate subsystem specific
interfaces.
In particular, we can now have pinctrl, clk, clksource and irqchip
drivers in one file per driver, without the need to call into platform
specific interface, or to get called from platform specific code, as
long as all information about the hardware is provided through a
device tree.
Most of the drivers we touch this time are for clocksource. Since now
most of them are part of drivers/clocksource, I expect that we won't
have to touch these again from arm-soc and can let the clocksource
maintainers take care of these in the future.
Another larger part of this series is specific to the exynos platform,
which is seeing some significant effort in upstreaming and
modernization of its device drivers this time around, which
unfortunately is also the cause for the churn and a lot of the merge
conflicts.
There is one new subsystem that gets merged as part of this series:
the reset controller interface, which is a very simple interface for
taking devices on the SoC out of reset or back into reset. Patches to
use this interface on i.MX follow later in this merge window, and we
are going to have other platforms (at least tegra and sirf) get
converted in 3.11. This will let us get rid of platform specific
callbacks in a number of platform independent device drivers."
* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (256 commits)
irqchip: s3c24xx: add missing __init annotations
ARM: dts: Disable the RTC by default on exynos5
clk: exynos5250: Fix parent clock for sclk_mmc{0,1,2,3}
ARM: exynos: restore mach/regs-clock.h for exynos5
clocksource: exynos_mct: fix build error on non-DT
pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register()
irqchip: vt8500: Convert arch-vt8500 to new irqchip infrastructure
reset: NULL deref on allocation failure
reset: Add reset controller API
dt: describe base reset signal binding
ARM: EXYNOS: Add arm-pmu DT binding for exynos421x
ARM: EXYNOS: Add arm-pmu DT binding for exynos5250
ARM: EXYNOS: Enable PMUs for exynos4
irqchip: exynos-combiner: Correct combined IRQs for exynos4
irqchip: exynos-combiner: Add set_irq_affinity function for combiner_irq
ARM: EXYNOS: fix compilation error introduced due to common clock migration
clk: exynos5250: Fix divider values for sclk_mmc{0,1,2,3}
clk: exynos4: export clocks required for fimc-is
clk: samsung: Fix compilation error
clk: tegra: fix enum tegra114_clk to match binding
...
456 lines
9.4 KiB
Plaintext
456 lines
9.4 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"
|
|
|
|
config ARCH_EXYNOS4
|
|
bool "SAMSUNG EXYNOS4"
|
|
default y
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_SMP
|
|
select MIGHT_HAVE_CACHE_L2X0
|
|
help
|
|
Samsung EXYNOS4 SoCs based systems
|
|
|
|
config ARCH_EXYNOS5
|
|
bool "SAMSUNG EXYNOS5"
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_SMP
|
|
help
|
|
Samsung EXYNOS5 (Cortex-A15) SoC based systems
|
|
|
|
comment "EXYNOS SoCs"
|
|
|
|
config CPU_EXYNOS4210
|
|
bool "SAMSUNG EXYNOS4210"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
select ARM_CPU_SUSPEND if PM
|
|
select PM_GENERIC_DOMAINS
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
select SAMSUNG_DMADEV
|
|
help
|
|
Enable EXYNOS4210 CPU support
|
|
|
|
config SOC_EXYNOS4212
|
|
bool "SAMSUNG EXYNOS4212"
|
|
default y
|
|
depends on ARCH_EXYNOS4
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
select SAMSUNG_DMADEV
|
|
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 SOC_EXYNOS5250
|
|
bool "SAMSUNG EXYNOS5250"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
select PM_GENERIC_DOMAINS if PM
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
select S5P_DEV_MFC
|
|
select SAMSUNG_DMADEV
|
|
help
|
|
Enable EXYNOS5250 SoC support
|
|
|
|
config SOC_EXYNOS5440
|
|
bool "SAMSUNG EXYNOS5440"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
select ARCH_HAS_OPP
|
|
select ARM_ARCH_TIMER
|
|
select AUTO_ZRELADDR
|
|
select PINCTRL
|
|
select PINCTRL_EXYNOS5440
|
|
select PM_OPP
|
|
help
|
|
Enable EXYNOS5440 SoC support
|
|
|
|
config EXYNOS_ATAGS
|
|
bool "ATAGS based boot for EXYNOS (deprecated)"
|
|
depends on !ARCH_MULTIPLATFORM
|
|
depends on ATAGS
|
|
default y
|
|
help
|
|
The EXYNOS platform is moving towards being completely probed
|
|
through device tree. This enables support for board files using
|
|
the traditional ATAGS boot format.
|
|
Note that this option is not available for multiplatform builds.
|
|
|
|
if EXYNOS_ATAGS
|
|
|
|
config EXYNOS_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_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 EXYNOS_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 EXYNOS4_DEV_AHCI
|
|
select EXYNOS4_DEV_USB_OHCI
|
|
select EXYNOS4_SETUP_FIMD0
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_KEYPAD
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS4_SETUP_USB_PHY
|
|
select EXYNOS_DEV_DMA
|
|
select EXYNOS_DEV_SYSMMU
|
|
select S3C24XX_PWM
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_USB_HSOTG
|
|
select S3C_DEV_WDT
|
|
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_KEYPAD
|
|
select SAMSUNG_DEV_PWM
|
|
help
|
|
Machine support for Samsung SMDKV310
|
|
|
|
config MACH_ARMLEX4210
|
|
bool "ARMLEX4210"
|
|
select CPU_EXYNOS4210
|
|
select EXYNOS4_DEV_AHCI
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS_DEV_DMA
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
help
|
|
Machine support for Samsung ARMLEX4210 based on EXYNOS4210
|
|
|
|
config MACH_UNIVERSAL_C210
|
|
bool "Mobile UNIVERSAL_C210 Board"
|
|
select CLKSRC_MMIO
|
|
select CPU_EXYNOS4210
|
|
select EXYNOS4_SETUP_FIMC
|
|
select EXYNOS4_SETUP_FIMD0
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_I2C3
|
|
select EXYNOS4_SETUP_I2C5
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS4_SETUP_USB_PHY
|
|
select EXYNOS_DEV_DMA
|
|
select EXYNOS_DEV_SYSMMU
|
|
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_USB_HSOTG
|
|
select S5P_DEV_CSIS0
|
|
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_ONENAND
|
|
select S5P_DEV_TV
|
|
select S5P_GPIO_INT
|
|
select S5P_SETUP_MIPIPHY
|
|
select SAMSUNG_HRT
|
|
help
|
|
Machine support for Samsung Mobile Universal S5PC210 Reference
|
|
Board.
|
|
|
|
config MACH_NURI
|
|
bool "Mobile NURI Board"
|
|
select CPU_EXYNOS4210
|
|
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 EXYNOS_DEV_DMA
|
|
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 S3C_DEV_RTC
|
|
select S3C_DEV_USB_HSOTG
|
|
select S3C_DEV_WDT
|
|
select S5P_DEV_CSIS0
|
|
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_JPEG
|
|
select S5P_DEV_MFC
|
|
select S5P_DEV_USB_EHCI
|
|
select S5P_GPIO_INT
|
|
select S5P_SETUP_MIPIPHY
|
|
select SAMSUNG_DEV_ADC
|
|
select SAMSUNG_DEV_PWM
|
|
help
|
|
Machine support for Samsung Mobile NURI Board.
|
|
|
|
config MACH_ORIGEN
|
|
bool "ORIGEN"
|
|
select CPU_EXYNOS4210
|
|
select EXYNOS4_DEV_USB_OHCI
|
|
select EXYNOS4_SETUP_FIMD0
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS4_SETUP_USB_PHY
|
|
select EXYNOS_DEV_DMA
|
|
select EXYNOS_DEV_SYSMMU
|
|
select S3C24XX_PWM
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_USB_HSOTG
|
|
select S3C_DEV_WDT
|
|
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
|
|
help
|
|
Machine support for ORIGEN based on Samsung EXYNOS4210
|
|
|
|
comment "EXYNOS4212 Boards"
|
|
|
|
config MACH_SMDK4212
|
|
bool "SMDK4212"
|
|
select EXYNOS4_SETUP_FIMD0
|
|
select EXYNOS4_SETUP_I2C1
|
|
select EXYNOS4_SETUP_I2C3
|
|
select EXYNOS4_SETUP_I2C7
|
|
select EXYNOS4_SETUP_KEYPAD
|
|
select EXYNOS4_SETUP_SDHCI
|
|
select EXYNOS4_SETUP_USB_PHY
|
|
select EXYNOS_DEV_DMA
|
|
select EXYNOS_DEV_SYSMMU
|
|
select S3C24XX_PWM
|
|
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_USB_HSOTG
|
|
select S3C_DEV_WDT
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S5P_DEV_FIMC3
|
|
select S5P_DEV_FIMD0
|
|
select S5P_DEV_MFC
|
|
select SAMSUNG_DEV_BACKLIGHT
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select SAMSUNG_DEV_PWM
|
|
select SOC_EXYNOS4212
|
|
help
|
|
Machine support for Samsung SMDK4212
|
|
|
|
comment "EXYNOS4412 Boards"
|
|
|
|
config MACH_SMDK4412
|
|
bool "SMDK4412"
|
|
select MACH_SMDK4212
|
|
select SOC_EXYNOS4412
|
|
help
|
|
Machine support for Samsung SMDK4412
|
|
endif
|
|
|
|
endif
|
|
|
|
comment "Flattened Device Tree based board for EXYNOS SoCs"
|
|
|
|
config MACH_EXYNOS4_DT
|
|
bool "Samsung Exynos4 Machine using device tree"
|
|
depends on ARCH_EXYNOS4
|
|
select ARM_AMBA
|
|
select CLKSRC_OF
|
|
select CPU_EXYNOS4210
|
|
select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
|
|
select PINCTRL
|
|
select PINCTRL_EXYNOS
|
|
select S5P_DEV_MFC
|
|
select USE_OF
|
|
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.
|
|
|
|
config MACH_EXYNOS5_DT
|
|
bool "SAMSUNG EXYNOS5 Machine using device tree"
|
|
default y
|
|
depends on ARCH_EXYNOS5
|
|
select ARM_AMBA
|
|
select CLKSRC_OF
|
|
select USE_OF
|
|
help
|
|
Machine support for Samsung EXYNOS5 machine with device tree enabled.
|
|
Select this if a fdt blob is available for the EXYNOS5 SoC based board.
|
|
|
|
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
|