mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 17:41:44 +00:00
cbda94e039
These changes are mostly for ARM specific device drivers that either don't have an upstream maintainer, or that had the maintainer ask us to pick up the changes to avoid conflicts. A large chunk of this are clock drivers (bcm281xx, exynos, versatile, shmobile), aside from that, reset controllers for STi as well as a large rework of the Marvell Orion/EBU watchdog driver are notable. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUz/1+GCrR//JCVInAQJmfg/9GyqHatDjjUPUBjUQRIEtKgGdmQwdbDqF x+OrS/q5B5zYbpIWkbkt1IUYJfU+89Z5ev9jxI4rV824Nu9Y92mHPDnv+N/ptkIh q2OVP3bQDpWs3aEVV2B1HBNcWrNUuwco9BJu05eegEePii/cto0/wKwWIgUmrmjy xOLthsnp2YmeplGs7ctC6Dz8XbmELebpawejTGylARXei/SwmzB/YYDgJbYjRL2I WSCVa8Vo+MZaGC/yxdKVTtvsKVQenxGoMO3ojikJeRdvuVRJds48Cw+UBdzWYNeJ 3Ssvbdx6Xltf9jy/7H0btOUgxPetZuUV+2XpbWfGu0Zr9FcGDv3q9hrxA+UYKnkY GIGU0otSsmpHnX5Ms3E2xnHiV/fihxA3qohqts5kYRBDr5uc+IpW6SbDymQliCGG OO4XmIVM3pmsqAqP3Zuseemt9CeSW2yC0XlfXkzjO74yY39c+WLBbtGI40Z5W6i0 mM1C8RD3QSNijYCEC8eqz06BQfRImsPs+jllsnJTZaHfbOsib718uvandjfG26lN 616YMcqq0Sp51HIQ4qW7f2dQr7vOyNqbukdkrwF5JgkY/nVki5kdciRg/yeipRy6 Ey80a+OTq0GQljM0F2dcH/A1eHH9KsuI1L6NdSMJsl0h6guIBORPTwTw3qJ13OkR wpJyM+Gm+Fk= =u/FI -----END PGP SIGNATURE----- Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC driver changes from Arnd Bergmann: "These changes are mostly for ARM specific device drivers that either don't have an upstream maintainer, or that had the maintainer ask us to pick up the changes to avoid conflicts. A large chunk of this are clock drivers (bcm281xx, exynos, versatile, shmobile), aside from that, reset controllers for STi as well as a large rework of the Marvell Orion/EBU watchdog driver are notable" * tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (99 commits) Revert "dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac." Revert "net: stmmac: Add SOCFPGA glue driver" ARM: shmobile: r8a7791: Fix SCIFA3-5 clocks ARM: STi: Add reset controller support to mach-sti Kconfig drivers: reset: stih416: add softreset controller drivers: reset: stih415: add softreset controller drivers: reset: Reset controller driver for STiH416 drivers: reset: Reset controller driver for STiH415 drivers: reset: STi SoC system configuration reset controller support dts: socfpga: Add sysmgr node so the gmac can use to reference dts: socfpga: Add support for SD/MMC on the SOCFPGA platform reset: Add optional resets and stubs ARM: shmobile: r7s72100: fix bus clock calculation Power: Reset: Generalize qnap-poweroff to work on Synology devices. dts: socfpga: Update clock entry to support multiple parents ARM: socfpga: Update socfpga_defconfig dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac. net: stmmac: Add SOCFPGA glue driver watchdog: orion_wdt: Use %pa to print 'phys_addr_t' drivers: cci: Export CCI PMU revision ...
47 lines
1.1 KiB
Plaintext
47 lines
1.1 KiB
Plaintext
if ARCH_INTEGRATOR
|
|
|
|
menu "Integrator Options"
|
|
|
|
config ARCH_INTEGRATOR_AP
|
|
bool "Support Integrator/AP and Integrator/PP2 platforms"
|
|
select CLKSRC_MMIO
|
|
select MIGHT_HAVE_PCI
|
|
select SERIAL_AMBA_PL010 if TTY
|
|
select SERIAL_AMBA_PL010_CONSOLE if TTY
|
|
select SOC_BUS
|
|
help
|
|
Include support for the ARM(R) Integrator/AP and
|
|
Integrator/PP2 platforms.
|
|
|
|
config ARCH_INTEGRATOR_CP
|
|
bool "Support Integrator/CP platform"
|
|
select ARCH_CINTEGRATOR
|
|
select ARM_TIMER_SP804
|
|
select PLAT_VERSATILE_CLCD
|
|
select SERIAL_AMBA_PL011 if TTY
|
|
select SERIAL_AMBA_PL011_CONSOLE if TTY
|
|
select SOC_BUS
|
|
help
|
|
Include support for the ARM(R) Integrator CP platform.
|
|
|
|
config ARCH_CINTEGRATOR
|
|
bool
|
|
|
|
config INTEGRATOR_IMPD1
|
|
tristate "Include support for Integrator/IM-PD1"
|
|
depends on ARCH_INTEGRATOR_AP
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select ARM_VIC
|
|
select GPIO_PL061 if GPIOLIB
|
|
help
|
|
The IM-PD1 is an add-on logic module for the Integrator which
|
|
allows ARM(R) Ltd PrimeCells to be developed and evaluated.
|
|
The IM-PD1 can be found on the Integrator/PP2 platform.
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called impd1.
|
|
|
|
endmenu
|
|
|
|
endif
|