diff options
| author | Tom Rini <trini@konsulko.com> | 2023-05-07 09:44:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-07 09:44:27 -0400 |
| commit | 1917a1a8a8bad28170cd464e5ea61ff0d738310b (patch) | |
| tree | 2dab7a37f9e7274e7ecdc7cc6f3e6fd19e90c54b /arch/powerpc/include/asm/io.h | |
| parent | ae0772f333a7e76c4fb3771a77117b2f740d7c93 (diff) | |
| parent | 0ec8ebef87d78529d1b4f3e7beaced0b9fbea629 (diff) | |
Merge branch 'for-2023.07-2' of https://source.denx.de/u-boot/custodians/u-boot-mpc8xx
This pull request adds misc fixes for cssi boards and activates
CPM relocation in order to enable the use of SCC4 in
QMC (QUICC Multi-Channel) mode.
Diffstat (limited to 'arch/powerpc/include/asm/io.h')
| -rw-r--r-- | arch/powerpc/include/asm/io.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 998a82aa0d1..f63cae0bc80 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -95,9 +95,9 @@ extern void _outsl_ns(volatile u32 *port, const void *buf, int nl); #define IO_SPACE_LIMIT ~0 -#define memset_io(a,b,c) memset((void *)(a),(b),(c)) -#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) -#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) +#define memset_io(a,b,c) memset((void __force *)(a),(b),(c)) +#define memcpy_fromio(a,b,c) memcpy((a),(void __force *)(b),(c)) +#define memcpy_toio(a,b,c) memcpy((void __force *)(a),(b),(c)) /* * Enforce In-order Execution of I/O: |