| Message ID | 20161127221536.9577-10-vz@mleia.com |
|---|---|
| State | Accepted |
| Commit | b032eb1f71c0382146ecc3c87e7b00e31c312474 |
| Delegated to: | Tom Rini |
| Headers | show |
On 27 November 2016 at 15:15, Vladimir Zapolskiy <vz@mleia.com> wrote: > Defined __io is no-op for the SH architecture and it can be removed > from board files without any functional change. > > Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> > --- > arch/sh/include/asm/io.h | 10 ---------- > include/configs/r2dplus.h | 1 - > include/configs/r7780mp.h | 1 - > 3 files changed, 12 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Nov 28, 2016 at 12:15:21AM +0200, Vladimir Zapolskiy wrote: > Defined __io is no-op for the SH architecture and it can be removed > from board files without any functional change. > > Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 5dc27be..5cb000c 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -68,13 +68,6 @@ extern void __raw_readsl(unsigned int addr, void *data, int longlen); #define __raw_base_readl(base, off) __arch_base_getl(base, off) /* - * Now, pick up the machine-defined IO definitions - */ -#if 0 /* XXX###XXX */ -#include <asm/arch/io.h> -#endif /* XXX###XXX */ - -/* * IO port access primitives * ------------------------- * @@ -82,9 +75,6 @@ extern void __raw_readsl(unsigned int addr, void *data, int longlen); * mapped. Note that these are defined to perform little endian accesses * only. Their primary purpose is to access PCI and ISA peripherals. * - * The machine specific io.h include defines __io to translate an "IO" - * address to a memory address. - * * Note that we prevent GCC re-ordering or caching values in expressions * by introducing sequence points into the in*() definitions. Note that * __raw_* do not guarantee this behaviour. diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 477f035..2186915 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -91,7 +91,6 @@ #define CONFIG_SH4_PCI #define CONFIG_SH7751_PCI #define CONFIG_PCI_SCAN_SHOW 1 -#define __io #define __mem_pci #define CONFIG_PCI_MEM_BUS 0xFD000000 /* Memory space base addr */ diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index d4f200a..42d5135 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -100,7 +100,6 @@ #define CONFIG_SH7780_PCI_LAR CONFIG_SYS_SDRAM_SIZE #define CONFIG_SH7780_PCI_BAR CONFIG_SYS_SDRAM_SIZE #define CONFIG_PCI_SCAN_SHOW 1 -#define __io #define __mem_pci #define CONFIG_PCI_MEM_BUS 0xFD000000 /* Memory space base addr */
Defined __io is no-op for the SH architecture and it can be removed from board files without any functional change. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> --- arch/sh/include/asm/io.h | 10 ---------- include/configs/r2dplus.h | 1 - include/configs/r7780mp.h | 1 - 3 files changed, 12 deletions(-)