mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-28 21:45:01 +08:00
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
...
237 lines
4.5 KiB
Plaintext
237 lines
4.5 KiB
Plaintext
#
|
|
# PINCTRL infrastructure and drivers
|
|
#
|
|
|
|
config PINCTRL
|
|
bool
|
|
|
|
if PINCTRL
|
|
|
|
menu "Pin controllers"
|
|
depends on PINCTRL
|
|
|
|
config PINMUX
|
|
bool "Support pin multiplexing controllers"
|
|
|
|
config PINCONF
|
|
bool "Support pin configuration controllers"
|
|
|
|
config GENERIC_PINCONF
|
|
bool
|
|
select PINCONF
|
|
|
|
config DEBUG_PINCTRL
|
|
bool "Debug PINCTRL calls"
|
|
depends on DEBUG_KERNEL
|
|
help
|
|
Say Y here to add some extra checks and diagnostics to PINCTRL calls.
|
|
|
|
config PINCTRL_ABX500
|
|
bool "ST-Ericsson ABx500 family Mixed Signal Circuit gpio functions"
|
|
depends on AB8500_CORE
|
|
select GENERIC_PINCONF
|
|
help
|
|
Select this to enable the ABx500 family IC GPIO driver
|
|
|
|
config PINCTRL_AB8500
|
|
bool "AB8500 pin controller driver"
|
|
depends on PINCTRL_ABX500 && ARCH_U8500
|
|
|
|
config PINCTRL_AB8540
|
|
bool "AB8540 pin controller driver"
|
|
depends on PINCTRL_ABX500 && ARCH_U8500
|
|
|
|
config PINCTRL_AB9540
|
|
bool "AB9540 pin controller driver"
|
|
depends on PINCTRL_ABX500 && ARCH_U8500
|
|
|
|
config PINCTRL_AB8505
|
|
bool "AB8505 pin controller driver"
|
|
depends on PINCTRL_ABX500 && ARCH_U8500
|
|
|
|
config PINCTRL_AT91
|
|
bool "AT91 pinctrl driver"
|
|
depends on OF
|
|
depends on ARCH_AT91
|
|
select PINMUX
|
|
select PINCONF
|
|
help
|
|
Say Y here to enable the at91 pinctrl driver
|
|
|
|
config PINCTRL_BCM2835
|
|
bool
|
|
select PINMUX
|
|
select PINCONF
|
|
|
|
config PINCTRL_IMX
|
|
bool
|
|
select PINMUX
|
|
select PINCONF
|
|
|
|
config PINCTRL_IMX35
|
|
bool "IMX35 pinctrl driver"
|
|
depends on OF
|
|
depends on SOC_IMX35
|
|
select PINCTRL_IMX
|
|
help
|
|
Say Y here to enable the imx35 pinctrl driver
|
|
|
|
config PINCTRL_IMX51
|
|
bool "IMX51 pinctrl driver"
|
|
depends on OF
|
|
depends on SOC_IMX51
|
|
select PINCTRL_IMX
|
|
help
|
|
Say Y here to enable the imx51 pinctrl driver
|
|
|
|
config PINCTRL_IMX53
|
|
bool "IMX53 pinctrl driver"
|
|
depends on OF
|
|
depends on SOC_IMX53
|
|
select PINCTRL_IMX
|
|
help
|
|
Say Y here to enable the imx53 pinctrl driver
|
|
|
|
config PINCTRL_IMX6Q
|
|
bool "IMX6Q/DL pinctrl driver"
|
|
depends on OF
|
|
depends on SOC_IMX6Q
|
|
select PINCTRL_IMX
|
|
help
|
|
Say Y here to enable the imx6q/dl pinctrl driver
|
|
|
|
config PINCTRL_IMX6SL
|
|
bool "IMX6SL pinctrl driver"
|
|
depends on OF
|
|
depends on SOC_IMX6SL
|
|
select PINCTRL_IMX
|
|
help
|
|
Say Y here to enable the imx6sl pinctrl driver
|
|
|
|
config PINCTRL_LANTIQ
|
|
bool
|
|
depends on LANTIQ
|
|
select PINMUX
|
|
select PINCONF
|
|
|
|
config PINCTRL_FALCON
|
|
bool
|
|
depends on SOC_FALCON
|
|
depends on PINCTRL_LANTIQ
|
|
|
|
config PINCTRL_MXS
|
|
bool
|
|
select PINMUX
|
|
select PINCONF
|
|
|
|
config PINCTRL_IMX23
|
|
bool
|
|
select PINCTRL_MXS
|
|
|
|
config PINCTRL_IMX28
|
|
bool
|
|
select PINCTRL_MXS
|
|
|
|
config PINCTRL_NOMADIK
|
|
bool "Nomadik pin controller driver"
|
|
depends on ARCH_U8500 || ARCH_NOMADIK
|
|
select PINMUX
|
|
select PINCONF
|
|
|
|
config PINCTRL_STN8815
|
|
bool "STN8815 pin controller driver"
|
|
depends on PINCTRL_NOMADIK && ARCH_NOMADIK
|
|
|
|
config PINCTRL_DB8500
|
|
bool "DB8500 pin controller driver"
|
|
depends on PINCTRL_NOMADIK && ARCH_U8500
|
|
|
|
config PINCTRL_DB8540
|
|
bool "DB8540 pin controller driver"
|
|
depends on PINCTRL_NOMADIK && ARCH_U8500
|
|
|
|
config PINCTRL_SINGLE
|
|
tristate "One-register-per-pin type device tree based pinctrl driver"
|
|
depends on OF
|
|
select PINMUX
|
|
select PINCONF
|
|
select GENERIC_PINCONF
|
|
help
|
|
This selects the device tree based generic pinctrl driver.
|
|
|
|
config PINCTRL_SIRF
|
|
bool "CSR SiRFprimaII/SiRFmarco pin controller driver"
|
|
depends on ARCH_SIRF
|
|
select PINMUX
|
|
|
|
config PINCTRL_SUNXI
|
|
bool
|
|
select PINMUX
|
|
select GENERIC_PINCONF
|
|
|
|
config PINCTRL_TEGRA
|
|
bool
|
|
select PINMUX
|
|
select PINCONF
|
|
|
|
config PINCTRL_TEGRA20
|
|
bool
|
|
select PINCTRL_TEGRA
|
|
|
|
config PINCTRL_TEGRA30
|
|
bool
|
|
select PINCTRL_TEGRA
|
|
|
|
config PINCTRL_TEGRA114
|
|
bool
|
|
select PINCTRL_TEGRA
|
|
|
|
config PINCTRL_U300
|
|
bool "U300 pin controller driver"
|
|
depends on ARCH_U300
|
|
select PINMUX
|
|
select GENERIC_PINCONF
|
|
|
|
config PINCTRL_COH901
|
|
bool "ST-Ericsson U300 COH 901 335/571 GPIO"
|
|
depends on GPIOLIB && ARCH_U300 && PINCTRL_U300
|
|
help
|
|
Say yes here to support GPIO interface on ST-Ericsson U300.
|
|
The names of the two IP block variants supported are
|
|
COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
|
|
ports of 8 GPIO pins each.
|
|
|
|
config PINCTRL_SAMSUNG
|
|
bool
|
|
select PINMUX
|
|
select PINCONF
|
|
|
|
config PINCTRL_EXYNOS
|
|
bool "Pinctrl driver data for Samsung EXYNOS SoCs"
|
|
depends on OF && GPIOLIB
|
|
select PINCTRL_SAMSUNG
|
|
|
|
config PINCTRL_EXYNOS5440
|
|
bool "Samsung EXYNOS5440 SoC pinctrl driver"
|
|
select PINMUX
|
|
select PINCONF
|
|
|
|
config PINCTRL_S3C64XX
|
|
bool "Samsung S3C64XX SoC pinctrl driver"
|
|
depends on ARCH_S3C64XX
|
|
select PINCTRL_SAMSUNG
|
|
|
|
source "drivers/pinctrl/mvebu/Kconfig"
|
|
source "drivers/pinctrl/sh-pfc/Kconfig"
|
|
source "drivers/pinctrl/spear/Kconfig"
|
|
source "drivers/pinctrl/vt8500/Kconfig"
|
|
|
|
config PINCTRL_XWAY
|
|
bool
|
|
depends on SOC_TYPE_XWAY
|
|
depends on PINCTRL_LANTIQ
|
|
|
|
endmenu
|
|
|
|
endif
|