aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-06 12:00:32 -0400
committerArnd Bergmann <arnd@arndb.de>2016-07-06 12:00:32 -0400
commit7c2d780ec018812333fa726c42acc34cc0be1426 (patch)
tree39332a150f6457fb6137930e157eff907d021e99
parentc86f51737f8dedbfc2b8566b15231d4ff6d6ac59 (diff)
parent5c34a4e89c743339f78cafb2f2a826a010f0746a (diff)
Merge ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB changes into next/soc
* commit '5c34a4e89c743339f78cafb2f2a826a010f0746a': ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB ARM: uniphier: drop code for old DT binding These cause a harmless conflict with the clps711x multiplatform support, and it's easy to resolve. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat
-rw-r--r--arch/arm/Kconfig32
-rw-r--r--arch/arm/mach-at91/Kconfig2
-rw-r--r--arch/arm/mach-bcm/Kconfig7
-rw-r--r--arch/arm/mach-berlin/Kconfig2
-rw-r--r--arch/arm/mach-digicolor/Kconfig2
-rw-r--r--arch/arm/mach-exynos/Kconfig2
-rw-r--r--arch/arm/mach-imx/Kconfig2
-rw-r--r--arch/arm/mach-integrator/Kconfig4
-rw-r--r--arch/arm/mach-meson/Kconfig2
-rw-r--r--arch/arm/mach-mmp/Kconfig2
-rw-r--r--arch/arm/mach-moxart/Kconfig2
-rw-r--r--arch/arm/mach-mv78xx0/Kconfig2
-rw-r--r--arch/arm/mach-mvebu/Kconfig4
-rw-r--r--arch/arm/mach-mxs/Kconfig2
-rw-r--r--arch/arm/mach-nomadik/Kconfig2
-rw-r--r--arch/arm/mach-omap2/Kconfig2
-rw-r--r--arch/arm/mach-orion5x/Kconfig2
-rw-r--r--arch/arm/mach-oxnas/Kconfig2
-rw-r--r--arch/arm/mach-picoxcell/Kconfig2
-rw-r--r--arch/arm/mach-prima2/Kconfig2
-rw-r--r--arch/arm/mach-rockchip/Kconfig2
-rw-r--r--arch/arm/mach-s3c24xx/Kconfig2
-rw-r--r--arch/arm/mach-s3c64xx/Kconfig2
-rw-r--r--arch/arm/mach-s5pv210/Kconfig2
-rw-r--r--arch/arm/mach-shmobile/Kconfig2
-rw-r--r--arch/arm/mach-spear/Kconfig2
-rw-r--r--arch/arm/mach-sti/Kconfig2
-rw-r--r--arch/arm/mach-sunxi/Kconfig2
-rw-r--r--arch/arm/mach-tegra/Kconfig2
-rw-r--r--arch/arm/mach-u300/Kconfig2
-rw-r--r--arch/arm/mach-uniphier/platsmp.c18
-rw-r--r--arch/arm/mach-ux500/Kconfig2
-rw-r--r--arch/arm/mach-vexpress/Kconfig2
-rw-r--r--arch/arm/mach-vt8500/Kconfig2
34 files changed, 56 insertions, 67 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7a13e5a8fbbd..774ad8bbf705 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -327,7 +327,6 @@ choice
327config ARCH_MULTIPLATFORM 327config ARCH_MULTIPLATFORM
328 bool "Allow multiple platforms to be selected" 328 bool "Allow multiple platforms to be selected"
329 depends on MMU 329 depends on MMU
330 select ARCH_WANT_OPTIONAL_GPIOLIB
331 select ARM_HAS_SG_CHAIN 330 select ARM_HAS_SG_CHAIN
332 select ARM_PATCH_PHYS_VIRT 331 select ARM_PATCH_PHYS_VIRT
333 select AUTO_ZRELADDR 332 select AUTO_ZRELADDR
@@ -342,7 +341,6 @@ config ARCH_MULTIPLATFORM
342config ARM_SINGLE_ARMV7M 341config ARM_SINGLE_ARMV7M
343 bool "ARMv7-M based platforms (Cortex-M0/M3/M4)" 342 bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
344 depends on !MMU 343 depends on !MMU
345 select ARCH_WANT_OPTIONAL_GPIOLIB
346 select ARM_NVIC 344 select ARM_NVIC
347 select AUTO_ZRELADDR 345 select AUTO_ZRELADDR
348 select CLKSRC_OF 346 select CLKSRC_OF
@@ -355,10 +353,10 @@ config ARM_SINGLE_ARMV7M
355 353
356config ARCH_GEMINI 354config ARCH_GEMINI
357 bool "Cortina Systems Gemini" 355 bool "Cortina Systems Gemini"
358 select ARCH_REQUIRE_GPIOLIB
359 select CLKSRC_MMIO 356 select CLKSRC_MMIO
360 select CPU_FA526 357 select CPU_FA526
361 select GENERIC_CLOCKEVENTS 358 select GENERIC_CLOCKEVENTS
359 select GPIOLIB
362 help 360 help
363 Support for the Cortina Systems Gemini family SoCs 361 Support for the Cortina Systems Gemini family SoCs
364 362
@@ -379,7 +377,6 @@ config ARCH_EBSA110
379config ARCH_EP93XX 377config ARCH_EP93XX
380 bool "EP93xx-based" 378 bool "EP93xx-based"
381 select ARCH_HAS_HOLES_MEMORYMODEL 379 select ARCH_HAS_HOLES_MEMORYMODEL
382 select ARCH_REQUIRE_GPIOLIB
383 select ARM_AMBA 380 select ARM_AMBA
384 select ARM_PATCH_PHYS_VIRT 381 select ARM_PATCH_PHYS_VIRT
385 select ARM_VIC 382 select ARM_VIC
@@ -388,6 +385,7 @@ config ARCH_EP93XX
388 select CLKSRC_MMIO 385 select CLKSRC_MMIO
389 select CPU_ARM920T 386 select CPU_ARM920T
390 select GENERIC_CLOCKEVENTS 387 select GENERIC_CLOCKEVENTS
388 select GPIOLIB
391 help 389 help
392 This enables support for the Cirrus EP93xx series of CPUs. 390 This enables support for the Cirrus EP93xx series of CPUs.
393 391
@@ -428,9 +426,9 @@ config ARCH_IOP13XX
428config ARCH_IOP32X 426config ARCH_IOP32X
429 bool "IOP32x-based" 427 bool "IOP32x-based"
430 depends on MMU 428 depends on MMU
431 select ARCH_REQUIRE_GPIOLIB
432 select CPU_XSCALE 429 select CPU_XSCALE
433 select GPIO_IOP 430 select GPIO_IOP
431 select GPIOLIB
434 select NEED_RET_TO_USER 432 select NEED_RET_TO_USER
435 select PCI 433 select PCI
436 select PLAT_IOP 434 select PLAT_IOP
@@ -441,9 +439,9 @@ config ARCH_IOP32X
441config ARCH_IOP33X 439config ARCH_IOP33X
442 bool "IOP33x-based" 440 bool "IOP33x-based"
443 depends on MMU 441 depends on MMU
444 select ARCH_REQUIRE_GPIOLIB
445 select CPU_XSCALE 442 select CPU_XSCALE
446 select GPIO_IOP 443 select GPIO_IOP
444 select GPIOLIB
447 select NEED_RET_TO_USER 445 select NEED_RET_TO_USER
448 select PCI 446 select PCI
449 select PLAT_IOP 447 select PLAT_IOP
@@ -454,12 +452,12 @@ config ARCH_IXP4XX
454 bool "IXP4xx-based" 452 bool "IXP4xx-based"
455 depends on MMU 453 depends on MMU
456 select ARCH_HAS_DMA_SET_COHERENT_MASK 454 select ARCH_HAS_DMA_SET_COHERENT_MASK
457 select ARCH_REQUIRE_GPIOLIB
458 select ARCH_SUPPORTS_BIG_ENDIAN 455 select ARCH_SUPPORTS_BIG_ENDIAN
459 select CLKSRC_MMIO 456 select CLKSRC_MMIO
460 select CPU_XSCALE 457 select CPU_XSCALE
461 select DMABOUNCE if PCI 458 select DMABOUNCE if PCI
462 select GENERIC_CLOCKEVENTS 459 select GENERIC_CLOCKEVENTS
460 select GPIOLIB
463 select MIGHT_HAVE_PCI 461 select MIGHT_HAVE_PCI
464 select NEED_MACH_IO_H 462 select NEED_MACH_IO_H
465 select USB_EHCI_BIG_ENDIAN_DESC 463 select USB_EHCI_BIG_ENDIAN_DESC
@@ -469,9 +467,9 @@ config ARCH_IXP4XX
469 467
470config ARCH_DOVE 468config ARCH_DOVE
471 bool "Marvell Dove" 469 bool "Marvell Dove"
472 select ARCH_REQUIRE_GPIOLIB
473 select CPU_PJ4 470 select CPU_PJ4
474 select GENERIC_CLOCKEVENTS 471 select GENERIC_CLOCKEVENTS
472 select GPIOLIB
475 select MIGHT_HAVE_PCI 473 select MIGHT_HAVE_PCI
476 select MULTI_IRQ_HANDLER 474 select MULTI_IRQ_HANDLER
477 select MVEBU_MBUS 475 select MVEBU_MBUS
@@ -485,10 +483,10 @@ config ARCH_DOVE
485 483
486config ARCH_KS8695 484config ARCH_KS8695
487 bool "Micrel/Kendin KS8695" 485 bool "Micrel/Kendin KS8695"
488 select ARCH_REQUIRE_GPIOLIB
489 select CLKSRC_MMIO 486 select CLKSRC_MMIO
490 select CPU_ARM922T 487 select CPU_ARM922T
491 select GENERIC_CLOCKEVENTS 488 select GENERIC_CLOCKEVENTS
489 select GPIOLIB
492 select NEED_MACH_MEMORY_H 490 select NEED_MACH_MEMORY_H
493 help 491 help
494 Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based 492 Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
@@ -496,11 +494,11 @@ config ARCH_KS8695
496 494
497config ARCH_W90X900 495config ARCH_W90X900
498 bool "Nuvoton W90X900 CPU" 496 bool "Nuvoton W90X900 CPU"
499 select ARCH_REQUIRE_GPIOLIB
500 select CLKDEV_LOOKUP 497 select CLKDEV_LOOKUP
501 select CLKSRC_MMIO 498 select CLKSRC_MMIO
502 select CPU_ARM926T 499 select CPU_ARM926T
503 select GENERIC_CLOCKEVENTS 500 select GENERIC_CLOCKEVENTS
501 select GPIOLIB
504 help 502 help
505 Support for Nuvoton (Winbond logic dept.) ARM9 processor, 503 Support for Nuvoton (Winbond logic dept.) ARM9 processor,
506 At present, the w90x900 has been renamed nuc900, regarding 504 At present, the w90x900 has been renamed nuc900, regarding
@@ -512,13 +510,13 @@ config ARCH_W90X900
512 510
513config ARCH_LPC32XX 511config ARCH_LPC32XX
514 bool "NXP LPC32XX" 512 bool "NXP LPC32XX"
515 select ARCH_REQUIRE_GPIOLIB
516 select ARM_AMBA 513 select ARM_AMBA
517 select CLKDEV_LOOKUP 514 select CLKDEV_LOOKUP
518 select CLKSRC_LPC32XX 515 select CLKSRC_LPC32XX
519 select COMMON_CLK 516 select COMMON_CLK
520 select CPU_ARM926T 517 select CPU_ARM926T
521 select GENERIC_CLOCKEVENTS 518 select GENERIC_CLOCKEVENTS
519 select GPIOLIB
522 select MULTI_IRQ_HANDLER 520 select MULTI_IRQ_HANDLER
523 select SPARSE_IRQ 521 select SPARSE_IRQ
524 select USE_OF 522 select USE_OF
@@ -529,7 +527,6 @@ config ARCH_PXA
529 bool "PXA2xx/PXA3xx-based" 527 bool "PXA2xx/PXA3xx-based"
530 depends on MMU 528 depends on MMU
531 select ARCH_MTD_XIP 529 select ARCH_MTD_XIP
532 select ARCH_REQUIRE_GPIOLIB
533 select ARM_CPU_SUSPEND if PM 530 select ARM_CPU_SUSPEND if PM
534 select AUTO_ZRELADDR 531 select AUTO_ZRELADDR
535 select COMMON_CLK 532 select COMMON_CLK
@@ -540,6 +537,7 @@ config ARCH_PXA
540 select CPU_XSCALE if !CPU_XSC3 537 select CPU_XSCALE if !CPU_XSC3
541 select GENERIC_CLOCKEVENTS 538 select GENERIC_CLOCKEVENTS
542 select GPIO_PXA 539 select GPIO_PXA
540 select GPIOLIB
543 select HAVE_IDE 541 select HAVE_IDE
544 select IRQ_DOMAIN 542 select IRQ_DOMAIN
545 select MULTI_IRQ_HANDLER 543 select MULTI_IRQ_HANDLER
@@ -570,7 +568,6 @@ config ARCH_RPC
570config ARCH_SA1100 568config ARCH_SA1100
571 bool "SA1100-based" 569 bool "SA1100-based"
572 select ARCH_MTD_XIP 570 select ARCH_MTD_XIP
573 select ARCH_REQUIRE_GPIOLIB
574 select ARCH_SPARSEMEM_ENABLE 571 select ARCH_SPARSEMEM_ENABLE
575 select CLKDEV_LOOKUP 572 select CLKDEV_LOOKUP
576 select CLKSRC_MMIO 573 select CLKSRC_MMIO
@@ -579,6 +576,7 @@ config ARCH_SA1100
579 select CPU_FREQ 576 select CPU_FREQ
580 select CPU_SA1100 577 select CPU_SA1100
581 select GENERIC_CLOCKEVENTS 578 select GENERIC_CLOCKEVENTS
579 select GPIOLIB
582 select HAVE_IDE 580 select HAVE_IDE
583 select IRQ_DOMAIN 581 select IRQ_DOMAIN
584 select ISA 582 select ISA
@@ -590,12 +588,12 @@ config ARCH_SA1100
590 588
591config ARCH_S3C24XX 589config ARCH_S3C24XX
592 bool "Samsung S3C24XX SoCs" 590 bool "Samsung S3C24XX SoCs"
593 select ARCH_REQUIRE_GPIOLIB
594 select ATAGS 591 select ATAGS
595 select CLKDEV_LOOKUP 592 select CLKDEV_LOOKUP
596 select CLKSRC_SAMSUNG_PWM 593 select CLKSRC_SAMSUNG_PWM
597 select GENERIC_CLOCKEVENTS 594 select GENERIC_CLOCKEVENTS
598 select GPIO_SAMSUNG 595 select GPIO_SAMSUNG
596 select GPIOLIB
599 select HAVE_S3C2410_I2C if I2C 597 select HAVE_S3C2410_I2C if I2C
600 select HAVE_S3C2410_WATCHDOG if WATCHDOG 598 select HAVE_S3C2410_WATCHDOG if WATCHDOG
601 select HAVE_S3C_RTC if RTC_CLASS 599 select HAVE_S3C_RTC if RTC_CLASS
@@ -611,12 +609,12 @@ config ARCH_S3C24XX
611config ARCH_DAVINCI 609config ARCH_DAVINCI
612 bool "TI DaVinci" 610 bool "TI DaVinci"
613 select ARCH_HAS_HOLES_MEMORYMODEL 611 select ARCH_HAS_HOLES_MEMORYMODEL
614 select ARCH_REQUIRE_GPIOLIB
615 select CLKDEV_LOOKUP 612 select CLKDEV_LOOKUP
616 select CPU_ARM926T 613 select CPU_ARM926T
617 select GENERIC_ALLOCATOR 614 select GENERIC_ALLOCATOR
618 select GENERIC_CLOCKEVENTS 615 select GENERIC_CLOCKEVENTS
619 select GENERIC_IRQ_CHIP 616 select GENERIC_IRQ_CHIP
617 select GPIOLIB
620 select HAVE_IDE 618 select HAVE_IDE
621 select USE_OF 619 select USE_OF
622 select ZONE_DMA 620 select ZONE_DMA
@@ -628,11 +626,11 @@ config ARCH_OMAP1
628 depends on MMU 626 depends on MMU
629 select ARCH_HAS_HOLES_MEMORYMODEL 627 select ARCH_HAS_HOLES_MEMORYMODEL
630 select ARCH_OMAP 628 select ARCH_OMAP
631 select ARCH_REQUIRE_GPIOLIB
632 select CLKDEV_LOOKUP 629 select CLKDEV_LOOKUP
633 select CLKSRC_MMIO 630 select CLKSRC_MMIO
634 select GENERIC_CLOCKEVENTS 631 select GENERIC_CLOCKEVENTS
635 select GENERIC_IRQ_CHIP 632 select GENERIC_IRQ_CHIP
633 select GPIOLIB
636 select HAVE_IDE 634 select HAVE_IDE
637 select IRQ_DOMAIN 635 select IRQ_DOMAIN
638 select MULTI_IRQ_HANDLER 636 select MULTI_IRQ_HANDLER
@@ -854,7 +852,7 @@ source "arch/arm/mach-zynq/Kconfig"
854config ARCH_EFM32 852config ARCH_EFM32
855 bool "Energy Micro efm32" 853 bool "Energy Micro efm32"
856 depends on ARM_SINGLE_ARMV7M 854 depends on ARM_SINGLE_ARMV7M
857 select ARCH_REQUIRE_GPIOLIB 855 select GPIOLIB
858 help 856 help
859 Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko 857 Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko
860 processors. 858 processors.
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 08047afdf38e..5204395efda8 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,8 +1,8 @@
1menuconfig ARCH_AT91 1menuconfig ARCH_AT91
2 bool "Atmel SoCs" 2 bool "Atmel SoCs"
3 depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 3 depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
4 select ARCH_REQUIRE_GPIOLIB
5 select COMMON_CLK_AT91 4 select COMMON_CLK_AT91
5 select GPIOLIB
6 select PINCTRL 6 select PINCTRL
7 select SOC_BUS 7 select SOC_BUS
8 8
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 5832dbae530f..051aabdbbcce 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -17,7 +17,7 @@ config ARCH_BCM_IPROC
17 select ARM_GLOBAL_TIMER 17 select ARM_GLOBAL_TIMER
18 select COMMON_CLK_IPROC 18 select COMMON_CLK_IPROC
19 select CLKSRC_MMIO 19 select CLKSRC_MMIO
20 select ARCH_REQUIRE_GPIOLIB 20 select GPIOLIB
21 select ARM_AMBA 21 select ARM_AMBA
22 select PINCTRL 22 select PINCTRL
23 help 23 help
@@ -80,7 +80,7 @@ comment "KONA architected SoCs"
80 80
81config ARCH_BCM_MOBILE 81config ARCH_BCM_MOBILE
82 bool 82 bool
83 select ARCH_REQUIRE_GPIOLIB 83 select GPIOLIB
84 select ARM_ERRATA_754322 84 select ARM_ERRATA_754322
85 select ARM_ERRATA_775420 85 select ARM_ERRATA_775420
86 select ARM_GIC 86 select ARM_GIC
@@ -145,7 +145,7 @@ comment "Other Architectures"
145config ARCH_BCM2835 145config ARCH_BCM2835
146 bool "Broadcom BCM2835 family" 146 bool "Broadcom BCM2835 family"
147 depends on ARCH_MULTI_V6 || ARCH_MULTI_V7 147 depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
148 select ARCH_REQUIRE_GPIOLIB 148 select GPIOLIB
149 select ARM_AMBA 149 select ARM_AMBA
150 select ARM_ERRATA_411920 if ARCH_MULTI_V6 150 select ARM_ERRATA_411920 if ARCH_MULTI_V6
151 select ARM_TIMER_SP804 151 select ARM_TIMER_SP804
@@ -184,7 +184,6 @@ config ARCH_BRCMSTB
184 select BRCMSTB_L2_IRQ 184 select BRCMSTB_L2_IRQ
185 select BCM7120_L2_IRQ 185 select BCM7120_L2_IRQ
186 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE 186 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
187 select ARCH_WANT_OPTIONAL_GPIOLIB
188 select SOC_BRCMSTB 187 select SOC_BRCMSTB
189 select SOC_BUS 188 select SOC_BUS
190 help 189 help
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index ffbfa0bd091b..63ab1d368625 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -2,11 +2,11 @@ menuconfig ARCH_BERLIN
2 bool "Marvell Berlin SoCs" 2 bool "Marvell Berlin SoCs"
3 depends on ARCH_MULTI_V7 3 depends on ARCH_MULTI_V7
4 select ARCH_HAS_RESET_CONTROLLER 4 select ARCH_HAS_RESET_CONTROLLER
5 select ARCH_REQUIRE_GPIOLIB
6 select ARM_GIC 5 select ARM_GIC
7 select DW_APB_ICTL 6 select DW_APB_ICTL
8 select DW_APB_TIMER_OF 7 select DW_APB_TIMER_OF
9 select GENERIC_IRQ_CHIP 8 select GENERIC_IRQ_CHIP
9 select GPIOLIB
10 select MFD_SYSCON 10 select MFD_SYSCON
11 select PINCTRL 11 select PINCTRL
12 12
diff --git a/arch/arm/mach-digicolor/Kconfig b/arch/arm/mach-digicolor/Kconfig
index fc65b0f1db48..9d05c6c4181d 100644
--- a/arch/arm/mach-digicolor/Kconfig
+++ b/arch/arm/mach-digicolor/Kconfig
@@ -1,10 +1,10 @@
1config ARCH_DIGICOLOR 1config ARCH_DIGICOLOR
2 bool "Conexant Digicolor SoC Support" 2 bool "Conexant Digicolor SoC Support"
3 depends on ARCH_MULTI_V7 3 depends on ARCH_MULTI_V7
4 select ARCH_REQUIRE_GPIOLIB
5 select CLKSRC_MMIO 4 select CLKSRC_MMIO
6 select DIGICOLOR_TIMER 5 select DIGICOLOR_TIMER
7 select GENERIC_IRQ_CHIP 6 select GENERIC_IRQ_CHIP
7 select GPIOLIB
8 select MFD_SYSCON 8 select MFD_SYSCON
9 select PINCTRL 9 select PINCTRL
10 select PINCTRL_DIGICOLOR 10 select PINCTRL_DIGICOLOR
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index e65aa7d11b20..7f2d804fbddf 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -12,13 +12,13 @@ menuconfig ARCH_EXYNOS
12 depends on ARCH_MULTI_V7 12 depends on ARCH_MULTI_V7
13 select ARCH_HAS_BANDGAP 13 select ARCH_HAS_BANDGAP
14 select ARCH_HAS_HOLES_MEMORYMODEL 14 select ARCH_HAS_HOLES_MEMORYMODEL
15 select ARCH_REQUIRE_GPIOLIB
16 select ARM_AMBA 15 select ARM_AMBA
17 select ARM_GIC 16 select ARM_GIC
18 select COMMON_CLK_SAMSUNG 17 select COMMON_CLK_SAMSUNG
19 select EXYNOS_THERMAL 18 select EXYNOS_THERMAL
20 select EXYNOS_PMU 19 select EXYNOS_PMU
21 select EXYNOS_SROM 20 select EXYNOS_SROM
21 select GPIOLIB
22 select HAVE_ARM_SCU if SMP 22 select HAVE_ARM_SCU if SMP
23 select HAVE_S3C2410_I2C if I2C 23 select HAVE_S3C2410_I2C if I2C
24 select HAVE_S3C2410_WATCHDOG if WATCHDOG 24 select HAVE_S3C2410_WATCHDOG if WATCHDOG
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index dd905b9602a0..859e584f1f01 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,10 +1,10 @@
1menuconfig ARCH_MXC 1menuconfig ARCH_MXC
2 bool "Freescale i.MX family" 2 bool "Freescale i.MX family"
3 depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M 3 depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
4 select ARCH_REQUIRE_GPIOLIB
5 select ARCH_SUPPORTS_BIG_ENDIAN 4 select ARCH_SUPPORTS_BIG_ENDIAN
6 select CLKSRC_IMX_GPT 5 select CLKSRC_IMX_GPT
7 select GENERIC_IRQ_CHIP 6 select GENERIC_IRQ_CHIP
7 select GPIOLIB
8 select PINCTRL 8 select PINCTRL
9 select PM_OPP if PM 9 select PM_OPP if PM
10 select SOC_BUS 10 select SOC_BUS
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index b2a85ba13f08..bc764a89615e 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -32,9 +32,9 @@ config ARCH_INTEGRATOR_AP
32config INTEGRATOR_IMPD1 32config INTEGRATOR_IMPD1
33 bool "Include support for Integrator/IM-PD1" 33 bool "Include support for Integrator/IM-PD1"
34 depends on ARCH_INTEGRATOR_AP 34 depends on ARCH_INTEGRATOR_AP
35 select ARCH_REQUIRE_GPIOLIB
36 select ARM_VIC 35 select ARM_VIC
37 select GPIO_PL061 if GPIOLIB 36 select GPIO_PL061
37 select GPIOLIB
38 help 38 help
39 The IM-PD1 is an add-on logic module for the Integrator which 39 The IM-PD1 is an add-on logic module for the Integrator which
40 allows ARM(R) Ltd PrimeCells to be developed and evaluated. 40 allows ARM(R) Ltd PrimeCells to be developed and evaluated.
diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 31bdd91098b6..fbce42d7390f 100644
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -1,7 +1,7 @@
1menuconfig ARCH_MESON 1menuconfig ARCH_MESON
2 bool "Amlogic Meson SoCs" 2 bool "Amlogic Meson SoCs"
3 depends on ARCH_MULTI_V7 3 depends on ARCH_MULTI_V7
4 select ARCH_REQUIRE_GPIOLIB 4 select GPIOLIB
5 select GENERIC_IRQ_CHIP 5 select GENERIC_IRQ_CHIP
6 select ARM_GIC 6 select ARM_GIC
7 select CACHE_L2X0 7 select CACHE_L2X0
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
index 01c57d369462..94500bed56ab 100644
--- a/arch/arm/mach-mmp/Kconfig
+++ b/arch/arm/mach-mmp/Kconfig
@@ -1,8 +1,8 @@
1menuconfig ARCH_MMP 1menuconfig ARCH_MMP
2 bool "Marvell PXA168/910/MMP2" 2 bool "Marvell PXA168/910/MMP2"
3 depends on ARCH_MULTI_V5 || ARCH_MULTI_V7 3 depends on ARCH_MULTI_V5 || ARCH_MULTI_V7
4 select ARCH_REQUIRE_GPIOLIB
5 select GPIO_PXA 4 select GPIO_PXA
5 select GPIOLIB
6 select PINCTRL 6 select PINCTRL
7 select PLAT_PXA 7 select PLAT_PXA
8 help 8 help
diff --git a/arch/arm/mach-moxart/Kconfig b/arch/arm/mach-moxart/Kconfig
index 180d9d216719..6eca2363b81a 100644
--- a/arch/arm/mach-moxart/Kconfig
+++ b/arch/arm/mach-moxart/Kconfig
@@ -5,7 +5,7 @@ menuconfig ARCH_MOXART
5 select ARM_DMA_MEM_BUFFERABLE 5 select ARM_DMA_MEM_BUFFERABLE
6 select CLKSRC_MMIO 6 select CLKSRC_MMIO
7 select GENERIC_IRQ_CHIP 7 select GENERIC_IRQ_CHIP
8 select ARCH_REQUIRE_GPIOLIB 8 select GPIOLIB
9 select PHYLIB if NETDEVICES 9 select PHYLIB if NETDEVICES
10 help 10 help
11 Say Y here if you want to run your kernel on hardware with a 11 Say Y here if you want to run your kernel on hardware with a
diff --git a/arch/arm/mach-mv78xx0/Kconfig b/arch/arm/mach-mv78xx0/Kconfig
index c32f85559c65..81c0f08a2684 100644
--- a/arch/arm/mach-mv78xx0/Kconfig
+++ b/arch/arm/mach-mv78xx0/Kconfig
@@ -1,8 +1,8 @@
1menuconfig ARCH_MV78XX0 1menuconfig ARCH_MV78XX0
2 bool "Marvell MV78xx0" 2 bool "Marvell MV78xx0"
3 depends on ARCH_MULTI_V5 3 depends on ARCH_MULTI_V5
4 select ARCH_REQUIRE_GPIOLIB
5 select CPU_FEROCEON 4 select CPU_FEROCEON
5 select GPIOLIB
6 select MVEBU_MBUS 6 select MVEBU_MBUS
7 select PCI 7 select PCI
8 select PLAT_ORION_LEGACY 8 select PLAT_ORION_LEGACY
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 348044ea650c..f9b6bd306cfe 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -8,7 +8,7 @@ menuconfig ARCH_MVEBU
8 select SOC_BUS 8 select SOC_BUS
9 select MVEBU_MBUS 9 select MVEBU_MBUS
10 select ZONE_DMA if ARM_LPAE 10 select ZONE_DMA if ARM_LPAE
11 select ARCH_REQUIRE_GPIOLIB 11 select GPIOLIB
12 select PCI_QUIRKS if PCI 12 select PCI_QUIRKS if PCI
13 select OF_ADDRESS_PCI 13 select OF_ADDRESS_PCI
14 14
@@ -119,8 +119,8 @@ config MACH_DOVE
119config MACH_KIRKWOOD 119config MACH_KIRKWOOD
120 bool "Marvell Kirkwood boards" 120 bool "Marvell Kirkwood boards"
121 depends on ARCH_MULTI_V5 121 depends on ARCH_MULTI_V5
122 select ARCH_REQUIRE_GPIOLIB
123 select CPU_FEROCEON 122 select CPU_FEROCEON
123 select GPIOLIB
124 select KIRKWOOD_CLK 124 select KIRKWOOD_CLK
125 select MACH_MVEBU_ANY 125 select MACH_MVEBU_ANY
126 select ORION_IRQCHIP 126 select ORION_IRQCHIP
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 84794137b175..5d9e5fce7937 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -15,8 +15,8 @@ config SOC_IMX28
15config ARCH_MXS 15config ARCH_MXS
16 bool "Freescale MXS (i.MX23, i.MX28) support" 16 bool "Freescale MXS (i.MX23, i.MX28) support"
17 depends on ARCH_MULTI_V5 17 depends on ARCH_MULTI_V5
18 select ARCH_REQUIRE_GPIOLIB
19 select CLKSRC_MMIO 18 select CLKSRC_MMIO
19 select GPIOLIB
20 select PINCTRL 20 select PINCTRL
21 select SOC_BUS 21 select SOC_BUS
22 select SOC_IMX23 22 select SOC_IMX23
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
index 3c61096c8627..b7e9801fdaa4 100644
--- a/arch/arm/mach-nomadik/Kconfig
+++ b/arch/arm/mach-nomadik/Kconfig
@@ -1,12 +1,12 @@
1menuconfig ARCH_NOMADIK 1menuconfig ARCH_NOMADIK
2 bool "ST-Ericsson Nomadik" 2 bool "ST-Ericsson Nomadik"
3 depends on ARCH_MULTI_V5 3 depends on ARCH_MULTI_V5
4 select ARCH_REQUIRE_GPIOLIB
5 select ARM_AMBA 4 select ARM_AMBA
6 select ARM_VIC 5 select ARM_VIC
7 select CLKSRC_NOMADIK_MTU 6 select CLKSRC_NOMADIK_MTU
8 select CLKSRC_NOMADIK_MTU_SCHED_CLOCK 7 select CLKSRC_NOMADIK_MTU_SCHED_CLOCK
9 select CPU_ARM926T 8 select CPU_ARM926T
9 select GPIOLIB
10 select MIGHT_HAVE_CACHE_L2X0 10 select MIGHT_HAVE_CACHE_L2X0
11 select PINCTRL 11 select PINCTRL
12 select PINCTRL_NOMADIK 12 select PINCTRL_NOMADIK
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index a63d3fe2ca46..518f0e40167a 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -88,9 +88,9 @@ config ARCH_OMAP2PLUS
88 select ARCH_HAS_BANDGAP 88 select ARCH_HAS_BANDGAP
89 select ARCH_HAS_HOLES_MEMORYMODEL 89 select ARCH_HAS_HOLES_MEMORYMODEL
90 select ARCH_OMAP 90 select ARCH_OMAP
91 select ARCH_REQUIRE_GPIOLIB
92 select CLKSRC_MMIO 91 select CLKSRC_MMIO
93 select GENERIC_IRQ_CHIP 92 select GENERIC_IRQ_CHIP
93 select GPIOLIB
94 select MACH_OMAP_GENERIC 94 select MACH_OMAP_GENERIC
95 select MEMORY 95 select MEMORY
96 select MFD_SYSCON 96 select MFD_SYSCON
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index a2af15822fcb..89bb0fc796bd 100644
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -1,9 +1,9 @@
1menuconfig ARCH_ORION5X 1menuconfig ARCH_ORION5X
2 bool "Marvell Orion" 2 bool "Marvell Orion"
3 depends on MMU && ARCH_MULTI_V5 3 depends on MMU && ARCH_MULTI_V5
4 select ARCH_REQUIRE_GPIOLIB
5 select CPU_FEROCEON 4 select CPU_FEROCEON
6 select GENERIC_CLOCKEVENTS 5 select GENERIC_CLOCKEVENTS
6 select GPIOLIB
7 select MVEBU_MBUS 7 select MVEBU_MBUS
8 select PCI 8 select PCI
9 select PLAT_ORION_LEGACY 9 select PLAT_ORION_LEGACY
diff --git a/arch/arm/mach-oxnas/Kconfig b/arch/arm/mach-oxnas/Kconfig
index 19164d729d2a..567496bd250a 100644
--- a/arch/arm/mach-oxnas/Kconfig
+++ b/arch/arm/mach-oxnas/Kconfig
@@ -1,7 +1,7 @@
1menuconfig ARCH_OXNAS 1menuconfig ARCH_OXNAS
2 bool "Oxford Semiconductor OXNAS Family SoCs" 2 bool "Oxford Semiconductor OXNAS Family SoCs"
3 select ARCH_REQUIRE_GPIOLIB
4 select ARCH_HAS_RESET_CONTROLLER 3 select ARCH_HAS_RESET_CONTROLLER
4 select GPIOLIB
5 select PINCTRL 5 select PINCTRL
6 depends on ARCH_MULTI_V5 6 depends on ARCH_MULTI_V5
7 help 7 help
diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig
index aef92ba0eacd..1c8f701526c9 100644
--- a/arch/arm/mach-picoxcell/Kconfig
+++ b/arch/arm/mach-picoxcell/Kconfig
@@ -1,8 +1,8 @@
1config ARCH_PICOXCELL 1config ARCH_PICOXCELL
2 bool "Picochip PicoXcell" 2 bool "Picochip PicoXcell"
3 depends on ARCH_MULTI_V6 3 depends on ARCH_MULTI_V6
4 select ARCH_REQUIRE_GPIOLIB
5 select ARM_VIC 4 select ARM_VIC
6 select DW_APB_TIMER_OF 5 select DW_APB_TIMER_OF
6 select GPIOLIB
7 select HAVE_TCM 7 select HAVE_TCM
8 select NO_IOPORT_MAP 8 select NO_IOPORT_MAP
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 0cf4426183cf..3c4717c4b16b 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -3,8 +3,8 @@ menuconfig ARCH_SIRF
3 depends on ARCH_MULTI_V7 3 depends on ARCH_MULTI_V7
4 select ARCH_HAS_RESET_CONTROLLER 4 select ARCH_HAS_RESET_CONTROLLER
5 select RESET_CONTROLLER 5 select RESET_CONTROLLER
6 select ARCH_REQUIRE_GPIOLIB
7 select GENERIC_IRQ_CHIP 6 select GENERIC_IRQ_CHIP
7 select GPIOLIB
8 select NO_IOPORT_MAP 8 select NO_IOPORT_MAP
9 select REGMAP 9 select REGMAP
10 select PINCTRL 10 select PINCTRL
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index cef42fd886d1..9ad84cd01ba0 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -4,10 +4,10 @@ config ARCH_ROCKCHIP
4 select PINCTRL 4 select PINCTRL
5 select PINCTRL_ROCKCHIP 5 select PINCTRL_ROCKCHIP
6 select ARCH_HAS_RESET_CONTROLLER 6 select ARCH_HAS_RESET_CONTROLLER
7 select ARCH_REQUIRE_GPIOLIB
8 select ARM_AMBA 7 select ARM_AMBA
9 select ARM_GIC 8 select ARM_GIC
10 select CACHE_L2X0 9 select CACHE_L2X0
10 select GPIOLIB
11 select HAVE_ARM_ARCH_TIMER 11 select HAVE_ARM_ARCH_TIMER
12 select HAVE_ARM_SCU if SMP 12 select HAVE_ARM_SCU if SMP
13 select HAVE_ARM_TWD if SMP 13 select HAVE_ARM_TWD if SMP
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index b91aee406c74..4b1690acb6a5 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -11,7 +11,7 @@ if ARCH_S3C24XX
11 11
12config PLAT_S3C24XX 12config PLAT_S3C24XX
13 def_bool y 13 def_bool y
14 select ARCH_REQUIRE_GPIOLIB 14 select GPIOLIB
15 select NO_IOPORT_MAP 15 select NO_IOPORT_MAP
16 select S3C_DEV_NAND 16 select S3C_DEV_NAND
17 select IRQ_DOMAIN 17 select IRQ_DOMAIN
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index e5c1888fc67b..459214fa20b4 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -5,12 +5,12 @@
5menuconfig ARCH_S3C64XX 5menuconfig ARCH_S3C64XX
6 bool "Samsung S3C64XX" 6 bool "Samsung S3C64XX"
7 depends on ARCH_MULTI_V6 7 depends on ARCH_MULTI_V6
8 select ARCH_REQUIRE_GPIOLIB
9 select ARM_AMBA 8 select ARM_AMBA
10 select ARM_VIC 9 select ARM_VIC
11 select CLKSRC_SAMSUNG_PWM 10 select CLKSRC_SAMSUNG_PWM
12 select COMMON_CLK_SAMSUNG 11 select COMMON_CLK_SAMSUNG
13 select GPIO_SAMSUNG if ATAGS 12 select GPIO_SAMSUNG if ATAGS
13 select GPIOLIB
14 select HAVE_S3C2410_I2C if I2C 14 select HAVE_S3C2410_I2C if I2C
15 select HAVE_S3C2410_WATCHDOG if WATCHDOG 15 select HAVE_S3C2410_WATCHDOG if WATCHDOG
16 select HAVE_TCM 16 select HAVE_TCM
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 13bc9820ff22..4cec11cf5e6f 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -11,10 +11,10 @@ config ARCH_S5PV210
11 bool "Samsung S5PV210/S5PC110" 11 bool "Samsung S5PV210/S5PC110"
12 depends on ARCH_MULTI_V7 12 depends on ARCH_MULTI_V7
13 select ARCH_HAS_HOLES_MEMORYMODEL 13 select ARCH_HAS_HOLES_MEMORYMODEL
14 select ARCH_REQUIRE_GPIOLIB
15 select ARM_VIC 14 select ARM_VIC
16 select CLKSRC_SAMSUNG_PWM 15 select CLKSRC_SAMSUNG_PWM
17 select COMMON_CLK_SAMSUNG 16 select COMMON_CLK_SAMSUNG
17 select GPIOLIB
18 select HAVE_S3C2410_I2C if I2C 18 select HAVE_S3C2410_I2C if I2C
19 select HAVE_S3C2410_WATCHDOG if WATCHDOG 19 select HAVE_S3C2410_WATCHDOG if WATCHDOG
20 select HAVE_S3C_RTC if RTC_CLASS 20 select HAVE_S3C_RTC if RTC_CLASS
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index fe4ccb52f921..108ae2b41819 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -41,7 +41,7 @@ menuconfig ARCH_RENESAS
41 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE 41 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
42 select NO_IOPORT_MAP 42 select NO_IOPORT_MAP
43 select PINCTRL 43 select PINCTRL
44 select ARCH_REQUIRE_GPIOLIB 44 select GPIOLIB
45 select ZONE_DMA if ARM_LPAE 45 select ZONE_DMA if ARM_LPAE
46 46
47if ARCH_RENESAS 47if ARCH_RENESAS
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index ea9ea95630bd..b7260c2b510c 100644
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -5,9 +5,9 @@
5menuconfig PLAT_SPEAR 5menuconfig PLAT_SPEAR
6 bool "ST SPEAr Family" 6 bool "ST SPEAr Family"
7 depends on ARCH_MULTI_V7 || ARCH_MULTI_V5 7 depends on ARCH_MULTI_V7 || ARCH_MULTI_V5
8 select ARCH_REQUIRE_GPIOLIB
9 select ARM_AMBA 8 select ARM_AMBA
10 select CLKSRC_MMIO 9 select CLKSRC_MMIO
10 select GPIOLIB
11 11
12if PLAT_SPEAR 12if PLAT_SPEAR
13 13
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index 6f1af29f935d..119e1108b1f8 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -10,7 +10,7 @@ menuconfig ARCH_STI
10 select MFD_SYSCON 10 select MFD_SYSCON
11 select ARCH_HAS_RESET_CONTROLLER 11 select ARCH_HAS_RESET_CONTROLLER
12 select HAVE_ARM_SCU if SMP 12 select HAVE_ARM_SCU if SMP
13 select ARCH_REQUIRE_GPIOLIB 13 select GPIOLIB
14 select ARM_ERRATA_754322 14 select ARM_ERRATA_754322
15 select ARM_ERRATA_764369 if SMP 15 select ARM_ERRATA_764369 if SMP
16 select ARM_ERRATA_775420 16 select ARM_ERRATA_775420
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index c124d658b350..096ed216c6d5 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -1,10 +1,10 @@
1menuconfig ARCH_SUNXI 1menuconfig ARCH_SUNXI
2 bool "Allwinner SoCs" 2 bool "Allwinner SoCs"
3 depends on ARCH_MULTI_V7 3 depends on ARCH_MULTI_V7
4 select ARCH_REQUIRE_GPIOLIB
5 select ARCH_HAS_RESET_CONTROLLER 4 select ARCH_HAS_RESET_CONTROLLER
6 select CLKSRC_MMIO 5 select CLKSRC_MMIO
7 select GENERIC_IRQ_CHIP 6 select GENERIC_IRQ_CHIP
7 select GPIOLIB
8 select PINCTRL 8 select PINCTRL
9 select SUN4I_TIMER 9 select SUN4I_TIMER
10 select RESET_CONTROLLER 10 select RESET_CONTROLLER
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 0fa8b84ed657..329f01c5b6f8 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -1,11 +1,11 @@
1menuconfig ARCH_TEGRA 1menuconfig ARCH_TEGRA
2 bool "NVIDIA Tegra" 2 bool "NVIDIA Tegra"
3 depends on ARCH_MULTI_V7 3 depends on ARCH_MULTI_V7
4 select ARCH_REQUIRE_GPIOLIB
5 select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS 4 select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
6 select ARM_AMBA 5 select ARM_AMBA
7 select ARM_GIC 6 select ARM_GIC
8 select CLKSRC_MMIO 7 select CLKSRC_MMIO
8 select GPIOLIB
9 select HAVE_ARM_SCU if SMP 9 select HAVE_ARM_SCU if SMP
10 select HAVE_ARM_TWD if SMP 10 select HAVE_ARM_TWD if SMP
11 select PINCTRL 11 select PINCTRL
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index 301a98498453..56e0ef680b79 100644
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -1,11 +1,11 @@
1menuconfig ARCH_U300 1menuconfig ARCH_U300
2 bool "ST-Ericsson U300 Series" 2 bool "ST-Ericsson U300 Series"
3 depends on ARCH_MULTI_V5 && MMU 3 depends on ARCH_MULTI_V5 && MMU
4 select ARCH_REQUIRE_GPIOLIB
5 select ARM_AMBA 4 select ARM_AMBA
6 select ARM_VIC 5 select ARM_VIC
7 select CLKSRC_MMIO 6 select CLKSRC_MMIO
8 select CPU_ARM926T 7 select CPU_ARM926T
8 select GPIOLIB
9 select HAVE_TCM 9 select HAVE_TCM
10 select PINCTRL 10 select PINCTRL
11 select PINCTRL_COH901 11 select PINCTRL_COH901
diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c
index e802ca836ec7..9978c41128f6 100644
--- a/arch/arm/mach-uniphier/platsmp.c
+++ b/arch/arm/mach-uniphier/platsmp.c
@@ -101,21 +101,13 @@ static int __init uniphier_smp_prepare_trampoline(unsigned int max_cpus)
101 np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl"); 101 np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl");
102 ret = of_address_to_resource(np, 0, &res); 102 ret = of_address_to_resource(np, 0, &res);
103 of_node_put(np); 103 of_node_put(np);
104 if (!ret) { 104 if (ret) {
105 rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2; 105 pr_err("failed to get resource of SMP control\n");
106 } else { 106 return ret;
107 /* try old binding too */
108 np = of_find_compatible_node(NULL, NULL,
109 "socionext,uniphier-system-bus-controller");
110 ret = of_address_to_resource(np, 1, &res);
111 of_node_put(np);
112 if (ret) {
113 pr_err("failed to get resource of SMP control\n");
114 return ret;
115 }
116 rom_rsv2_phys = res.start + 0x1000 + UNIPHIER_SMPCTRL_ROM_RSV2;
117 } 107 }
118 108
109 rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2;
110
119 ret = uniphier_smp_copy_trampoline(rom_rsv2_phys); 111 ret = uniphier_smp_copy_trampoline(rom_rsv2_phys);
120 if (ret) 112 if (ret)
121 return ret; 113 return ret;
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 3185081bdb2c..4740ac393297 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -3,13 +3,13 @@ menuconfig ARCH_U8500
3 depends on ARCH_MULTI_V7 && MMU 3 depends on ARCH_MULTI_V7 && MMU
4 select AB8500_CORE 4 select AB8500_CORE
5 select ABX500_CORE 5 select ABX500_CORE
6 select ARCH_REQUIRE_GPIOLIB
7 select ARM_AMBA 6 select ARM_AMBA
8 select ARM_ERRATA_754322 7 select ARM_ERRATA_754322
9 select ARM_ERRATA_764369 if SMP 8 select ARM_ERRATA_764369 if SMP
10 select ARM_GIC 9 select ARM_GIC
11 select CACHE_L2X0 10 select CACHE_L2X0
12 select CLKSRC_NOMADIK_MTU 11 select CLKSRC_NOMADIK_MTU
12 select GPIOLIB
13 select HAVE_ARM_SCU if SMP 13 select HAVE_ARM_SCU if SMP
14 select HAVE_ARM_TWD if SMP 14 select HAVE_ARM_TWD if SMP
15 select PINCTRL 15 select PINCTRL
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 398a297b7e09..7c728ebc0b33 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -1,13 +1,13 @@
1menuconfig ARCH_VEXPRESS 1menuconfig ARCH_VEXPRESS
2 bool "ARM Ltd. Versatile Express family" 2 bool "ARM Ltd. Versatile Express family"
3 depends on ARCH_MULTI_V7 3 depends on ARCH_MULTI_V7
4 select ARCH_REQUIRE_GPIOLIB
5 select ARCH_SUPPORTS_BIG_ENDIAN 4 select ARCH_SUPPORTS_BIG_ENDIAN
6 select ARM_AMBA 5 select ARM_AMBA
7 select ARM_GIC 6 select ARM_GIC
8 select ARM_GLOBAL_TIMER 7 select ARM_GLOBAL_TIMER
9 select ARM_TIMER_SP804 8 select ARM_TIMER_SP804
10 select COMMON_CLK_VERSATILE 9 select COMMON_CLK_VERSATILE
10 select GPIOLIB
11 select HAVE_ARM_SCU if SMP 11 select HAVE_ARM_SCU if SMP
12 select HAVE_ARM_TWD if SMP 12 select HAVE_ARM_TWD if SMP
13 select HAVE_PATA_PLATFORM 13 select HAVE_PATA_PLATFORM
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index aaaa24fe4d71..c4f1dba7bd8a 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -1,6 +1,6 @@
1config ARCH_VT8500 1config ARCH_VT8500
2 bool 2 bool
3 select ARCH_REQUIRE_GPIOLIB 3 select GPIOLIB
4 select CLKDEV_LOOKUP 4 select CLKDEV_LOOKUP
5 select VT8500_TIMER 5 select VT8500_TIMER
6 select PINCTRL 6 select PINCTRL
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-11 12:00:29 -0400