diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-04-07 18:39:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 19:36:11 -0400 |
commit | ce816fa88cca083c47ab9000b2138a83043a78be (patch) | |
tree | fcdd6e68adb239187eb833722261ff348610809b /arch/arm | |
parent | 6d08a2567c0b9103c3ff946df17ad4be9a917e2f (diff) |
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
If the renamed symbol is defined lib/iomap.c implements ioport_map and
ioport_unmap and currently (nearly) all platforms define the port
accessor functions outb/inb and friend unconditionally. So
HAS_IOPORT_MAP is the better name for this.
Consequently NO_IOPORT is renamed to NO_IOPORT_MAP.
The motivation for this change is to reintroduce a symbol HAS_IOPORT
that signals if outb/int et al are available. I will address that at
least one merge window later though to keep surprises to a minimum and
catch new introductions of (HAS|NO)_IOPORT.
The changes in this commit were done using:
$ git grep -l -E '(NO|HAS)_IOPORT' | xargs perl -p -i -e 's/\b((?:CONFIG_)?(?:NO|HAS)_IOPORT)\b/$1_MAP/'
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 12 | ||||
-rw-r--r-- | arch/arm/mach-picoxcell/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-prima2/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/Kconfig | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d7a71e3ef55f..5db05f6a0412 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -126,7 +126,7 @@ config HAVE_TCM | |||
126 | config HAVE_PROC_CPU | 126 | config HAVE_PROC_CPU |
127 | bool | 127 | bool |
128 | 128 | ||
129 | config NO_IOPORT | 129 | config NO_IOPORT_MAP |
130 | bool | 130 | bool |
131 | 131 | ||
132 | config EISA | 132 | config EISA |
@@ -410,7 +410,7 @@ config ARCH_EBSA110 | |||
410 | select ISA | 410 | select ISA |
411 | select NEED_MACH_IO_H | 411 | select NEED_MACH_IO_H |
412 | select NEED_MACH_MEMORY_H | 412 | select NEED_MACH_MEMORY_H |
413 | select NO_IOPORT | 413 | select NO_IOPORT_MAP |
414 | help | 414 | help |
415 | This is an evaluation board for the StrongARM processor available | 415 | This is an evaluation board for the StrongARM processor available |
416 | from Digital. It has limited hardware on-board, including an | 416 | from Digital. It has limited hardware on-board, including an |
@@ -428,7 +428,7 @@ config ARCH_EFM32 | |||
428 | select CPU_V7M | 428 | select CPU_V7M |
429 | select GENERIC_CLOCKEVENTS | 429 | select GENERIC_CLOCKEVENTS |
430 | select NO_DMA | 430 | select NO_DMA |
431 | select NO_IOPORT | 431 | select NO_IOPORT_MAP |
432 | select SPARSE_IRQ | 432 | select SPARSE_IRQ |
433 | select USE_OF | 433 | select USE_OF |
434 | help | 434 | help |
@@ -677,7 +677,7 @@ config ARCH_SHMOBILE_LEGACY | |||
677 | select HAVE_SMP | 677 | select HAVE_SMP |
678 | select MIGHT_HAVE_CACHE_L2X0 | 678 | select MIGHT_HAVE_CACHE_L2X0 |
679 | select MULTI_IRQ_HANDLER | 679 | select MULTI_IRQ_HANDLER |
680 | select NO_IOPORT | 680 | select NO_IOPORT_MAP |
681 | select PINCTRL | 681 | select PINCTRL |
682 | select PM_GENERIC_DOMAINS if PM | 682 | select PM_GENERIC_DOMAINS if PM |
683 | select SPARSE_IRQ | 683 | select SPARSE_IRQ |
@@ -699,7 +699,7 @@ config ARCH_RPC | |||
699 | select ISA_DMA_API | 699 | select ISA_DMA_API |
700 | select NEED_MACH_IO_H | 700 | select NEED_MACH_IO_H |
701 | select NEED_MACH_MEMORY_H | 701 | select NEED_MACH_MEMORY_H |
702 | select NO_IOPORT | 702 | select NO_IOPORT_MAP |
703 | select VIRT_TO_BUS | 703 | select VIRT_TO_BUS |
704 | help | 704 | help |
705 | On the Acorn Risc-PC, Linux can support the internal IDE disk and | 705 | On the Acorn Risc-PC, Linux can support the internal IDE disk and |
@@ -760,7 +760,7 @@ config ARCH_S3C64XX | |||
760 | select HAVE_S3C2410_I2C if I2C | 760 | select HAVE_S3C2410_I2C if I2C |
761 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 761 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
762 | select HAVE_TCM | 762 | select HAVE_TCM |
763 | select NO_IOPORT | 763 | select NO_IOPORT_MAP |
764 | select PLAT_SAMSUNG | 764 | select PLAT_SAMSUNG |
765 | select PM_GENERIC_DOMAINS if PM | 765 | select PM_GENERIC_DOMAINS if PM |
766 | select S3C_DEV_NAND | 766 | select S3C_DEV_NAND |
diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig index eca9eb1c5931..62240f69b4ee 100644 --- a/arch/arm/mach-picoxcell/Kconfig +++ b/arch/arm/mach-picoxcell/Kconfig | |||
@@ -4,4 +4,4 @@ config ARCH_PICOXCELL | |||
4 | select ARM_VIC | 4 | select ARM_VIC |
5 | select DW_APB_TIMER_OF | 5 | select DW_APB_TIMER_OF |
6 | select HAVE_TCM | 6 | select HAVE_TCM |
7 | select NO_IOPORT | 7 | select NO_IOPORT_MAP |
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig index 3e8189186a5b..e4e505f52ba0 100644 --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig | |||
@@ -3,7 +3,7 @@ config ARCH_SIRF | |||
3 | select ARCH_HAS_RESET_CONTROLLER | 3 | select ARCH_HAS_RESET_CONTROLLER |
4 | select ARCH_REQUIRE_GPIOLIB | 4 | select ARCH_REQUIRE_GPIOLIB |
5 | select GENERIC_IRQ_CHIP | 5 | select GENERIC_IRQ_CHIP |
6 | select NO_IOPORT | 6 | select NO_IOPORT_MAP |
7 | select PINCTRL | 7 | select PINCTRL |
8 | select PINCTRL_SIRF | 8 | select PINCTRL_SIRF |
9 | help | 9 | help |
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index ba1cc6246778..40cf50b9940c 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig | |||
@@ -12,7 +12,7 @@ if ARCH_S3C24XX | |||
12 | config PLAT_S3C24XX | 12 | config PLAT_S3C24XX |
13 | def_bool y | 13 | def_bool y |
14 | select ARCH_REQUIRE_GPIOLIB | 14 | select ARCH_REQUIRE_GPIOLIB |
15 | select NO_IOPORT | 15 | select NO_IOPORT_MAP |
16 | select S3C_DEV_NAND | 16 | select S3C_DEV_NAND |
17 | select IRQ_DOMAIN | 17 | select IRQ_DOMAIN |
18 | help | 18 | help |
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index a182008e3aeb..0f92ba8e7884 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -10,7 +10,7 @@ config ARCH_SHMOBILE_MULTI | |||
10 | select ARM_GIC | 10 | select ARM_GIC |
11 | select MIGHT_HAVE_PCI | 11 | select MIGHT_HAVE_PCI |
12 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE | 12 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE |
13 | select NO_IOPORT | 13 | select NO_IOPORT_MAP |
14 | select PINCTRL | 14 | select PINCTRL |
15 | select ARCH_REQUIRE_GPIOLIB | 15 | select ARCH_REQUIRE_GPIOLIB |
16 | 16 | ||
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 80b4be36f10a..657d52d0391f 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig | |||
@@ -10,7 +10,7 @@ config ARCH_VEXPRESS | |||
10 | select HAVE_ARM_TWD if SMP | 10 | select HAVE_ARM_TWD if SMP |
11 | select HAVE_PATA_PLATFORM | 11 | select HAVE_PATA_PLATFORM |
12 | select ICST | 12 | select ICST |
13 | select NO_IOPORT | 13 | select NO_IOPORT_MAP |
14 | select PLAT_VERSATILE | 14 | select PLAT_VERSATILE |
15 | select PLAT_VERSATILE_CLCD | 15 | select PLAT_VERSATILE_CLCD |
16 | select POWER_RESET | 16 | select POWER_RESET |
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index b57e922f1614..243dfcb2ca0e 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
@@ -9,7 +9,7 @@ config PLAT_SAMSUNG | |||
9 | depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS | 9 | depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS |
10 | default y | 10 | default y |
11 | select GENERIC_IRQ_CHIP | 11 | select GENERIC_IRQ_CHIP |
12 | select NO_IOPORT | 12 | select NO_IOPORT_MAP |
13 | help | 13 | help |
14 | Base platform code for all Samsung SoC based systems | 14 | Base platform code for all Samsung SoC based systems |
15 | 15 | ||
@@ -19,7 +19,7 @@ config PLAT_S5P | |||
19 | default y | 19 | default y |
20 | select ARCH_REQUIRE_GPIOLIB | 20 | select ARCH_REQUIRE_GPIOLIB |
21 | select ARM_VIC | 21 | select ARM_VIC |
22 | select NO_IOPORT | 22 | select NO_IOPORT_MAP |
23 | select PLAT_SAMSUNG | 23 | select PLAT_SAMSUNG |
24 | select S3C_GPIO_TRACK | 24 | select S3C_GPIO_TRACK |
25 | select S5P_GPIO_DRVSTR | 25 | select S5P_GPIO_DRVSTR |