diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-03-03 00:35:15 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-03-04 15:59:23 +0000 |
| commit | 3ee8b750f49b7c82e8b8787ee306017746e8c12a (patch) | |
| tree | c2d5a9a2b35e561303e9a6088004e05a7b282421 /src/arch/arm/include | |
| parent | 3855c01e0a9d9e9787652479576e882bcda9fde5 (diff) | |
arch/io.h: Separate MMIO and PNP ops
Change-Id: Ie32f1d43168c277be46cdbd7fbfa2445d9899689
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31699
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/arch/arm/include')
| -rw-r--r-- | src/arch/arm/include/armv4/arch/mmio.h (renamed from src/arch/arm/include/armv4/arch/io.h) | 7 | ||||
| -rw-r--r-- | src/arch/arm/include/armv7/arch/mmio.h (renamed from src/arch/arm/include/armv7/arch/io.h) | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/arch/arm/include/armv4/arch/io.h b/src/arch/arm/include/armv4/arch/mmio.h index 9597ffed1c..ad89ef5d12 100644 --- a/src/arch/arm/include/armv4/arch/io.h +++ b/src/arch/arm/include/armv4/arch/mmio.h @@ -25,8 +25,9 @@ * 12-Dec-1999 RMK More cleanups * 18-Jun-2000 RMK Removed virt_to_* and friends definitions */ -#ifndef __ARCH_IO_H -#define __ARCH_IO_H + +#ifndef __ARCH_MMIO_H__ +#define __ARCH_MMIO_H__ #include <endian.h> #include <stdint.h> @@ -61,4 +62,4 @@ static inline void write32(void *addr, uint32_t val) *(volatile uint32_t *)addr = val; } -#endif /* __ARCH_IO_H */ +#endif /* __ARCH_MMIO_H__ */ diff --git a/src/arch/arm/include/armv7/arch/io.h b/src/arch/arm/include/armv7/arch/mmio.h index 1772659fec..b245b264fd 100644 --- a/src/arch/arm/include/armv7/arch/io.h +++ b/src/arch/arm/include/armv7/arch/mmio.h @@ -25,8 +25,9 @@ * 12-Dec-1999 RMK More cleanups * 18-Jun-2000 RMK Removed virt_to_* and friends definitions */ -#ifndef __ARCH_IO_H -#define __ARCH_IO_H + +#ifndef __ARCH_MMIO_H__ +#define __ARCH_MMIO_H__ #include <arch/cache.h> /* for dmb() */ #include <endian.h> @@ -71,4 +72,4 @@ static inline void write32(void *addr, uint32_t val) dmb(); } -#endif /* __ARCH_IO_H */ +#endif /* __ARCH_MMIO_H__ */ |