85b9174fda
- clk: mvebu
- reorganize by SoC to remove built up #ifdefs
- add clk flags per clock gate
Note: this branch only depends on mvebu/pcie in order to prevent managing a
tricky modify/remove file merge conflict. By rebasing on mvebu/pcie, we are
able to build the resolution into the patch series. The change is small, and
has been tested by the respective authors.
depends:
- mvebu/pcie
- mvebu/of_pci
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQEcBAABAgAGBQJRplb0AAoJEAi3KVZQDZAefTAH/1PMcXV+N/9HUgmx9XNpWg7Z
3ODWrA7Ewdvq9hfv9t+EH0FIdrZRA400p+AJuWSUuLzS7NzmCMTk/Pzad/W36ZY2
+8yJXVThSHqEQN/Vi1FtZGTKqRXZX/udVH5oNFV9jrUEFvLwuI/6/hCdkzlFKEol
9YJHNUyiul9P0jpcDXSSTFCpNXUPgQPuGTtIip0TKFmZOdA2QglgQAVkIwACZ+uX
PA7ewiFj1yfOhv8eh+nnb5kAsJEj1ynfMJywn7P/OC6ugAJtE9D0ZpzlYuj3lFEo
Z2snnzU7wVARfp1i6x3kNUyBiGHnJfxJC1KMePj87XP80BVzX1rmCoFY6x9nutg=
=jIi7
-----END PGP SIGNATURE-----
Merge tag 'seb_clk-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc
From Jason Cooper:
mvebu clock restructuring for v3.11
- clk: mvebu
- reorganize by SoC to remove built up #ifdefs
- add clk flags per clock gate
* tag 'seb_clk-3.11' of git://git.infradead.org/users/jcooper/linux:
clk: mvebu: disintegrate obsolete file
ARM: mvebu: move DT boards to SoC-centric clock init
ARM: kirkwood: move DT boards to SoC-centric clock init
ARM: dove: move DT boards to SoC-centric clock init
clk: mvebu: add Armada XP SoC-centric clock init
clk: mvebu: add Armada 370 SoC-centric clock init
clk: mvebu: add Kirkwood SoC-centric clock init
clk: mvebu: add Dove SoC-centric clock init
clk: mvebu: add common clock functions for core clk and clk gating
clk: mvebu: introduce per-clock-gate flags
51 lines
1.1 KiB
Plaintext
51 lines
1.1 KiB
Plaintext
config ARCH_MVEBU
|
|
bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7
|
|
select CLKSRC_MMIO
|
|
select COMMON_CLK
|
|
select GENERIC_CLOCKEVENTS
|
|
select GENERIC_IRQ_CHIP
|
|
select IRQ_DOMAIN
|
|
select MULTI_IRQ_HANDLER
|
|
select PINCTRL
|
|
select PLAT_ORION
|
|
select SPARSE_IRQ
|
|
select CLKDEV_LOOKUP
|
|
select MVEBU_MBUS
|
|
select ZONE_DMA if ARM_LPAE
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select MIGHT_HAVE_PCI
|
|
select PCI_QUIRKS if PCI
|
|
|
|
if ARCH_MVEBU
|
|
|
|
menu "Marvell SOC with device tree"
|
|
|
|
config MACH_ARMADA_370_XP
|
|
bool
|
|
select ARMADA_370_XP_TIMER
|
|
select HAVE_SMP
|
|
select CACHE_L2X0
|
|
select CPU_PJ4B
|
|
|
|
config MACH_ARMADA_370
|
|
bool "Marvell Armada 370 boards"
|
|
select ARMADA_370_CLK
|
|
select MACH_ARMADA_370_XP
|
|
select PINCTRL_ARMADA_370
|
|
help
|
|
Say 'Y' here if you want your kernel to support boards based
|
|
on the Marvell Armada 370 SoC with device tree.
|
|
|
|
config MACH_ARMADA_XP
|
|
bool "Marvell Armada XP boards"
|
|
select ARMADA_XP_CLK
|
|
select MACH_ARMADA_370_XP
|
|
select PINCTRL_ARMADA_XP
|
|
help
|
|
Say 'Y' here if you want your kernel to support boards based
|
|
on the Marvell Armada XP SoC with device tree.
|
|
|
|
endmenu
|
|
|
|
endif
|