diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-05-29 17:30:00 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-05-31 02:53:56 +0900 |
| commit | f6e7f07c17bdf4c9c4c03375dc913b77c39dbe1d (patch) | |
| tree | dc7c40878452b0131e5a0ce1c8f241907d324e55 /arch/arm/mach-uniphier/include | |
| parent | 012681b1fa822492bb8fdc5c2dd3d24d6092e110 (diff) | |
| download | talos-obmc-uboot-f6e7f07c17bdf4c9c4c03375dc913b77c39dbe1d.tar.gz talos-obmc-uboot-f6e7f07c17bdf4c9c4c03375dc913b77c39dbe1d.zip | |
ARM: UniPhier: replace <asm/io.h> with <linux/io.h>
In the Linux coding style, it is recommended to include <linux/io.h>
rather than <asm/io.h>. Follow this trend.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/include')
| -rw-r--r-- | arch/arm/mach-uniphier/include/mach/led.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/include/mach/sbc-regs.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/include/mach/sg-regs.h | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-uniphier/include/mach/led.h b/arch/arm/mach-uniphier/include/mach/led.h index 21277dac76..f7749b4860 100644 --- a/arch/arm/mach-uniphier/include/mach/led.h +++ b/arch/arm/mach-uniphier/include/mach/led.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2012-2014 Panasonic Corporation - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com> + * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -77,7 +76,7 @@ #else /* __ASSEMBLY__ */ -#include <asm/io.h> +#include <linux/io.h> #define led_write(C0, C1, C2, C3) \ do { \ diff --git a/arch/arm/mach-uniphier/include/mach/sbc-regs.h b/arch/arm/mach-uniphier/include/mach/sbc-regs.h index efb68e8564..493363bb64 100644 --- a/arch/arm/mach-uniphier/include/mach/sbc-regs.h +++ b/arch/arm/mach-uniphier/include/mach/sbc-regs.h @@ -1,7 +1,7 @@ /* * UniPhier SBC (System Bus Controller) registers * - * Copyright (C) 2011-2014 Panasonic Corporation + * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -99,7 +99,7 @@ #define ROM_BOOT_ROMRSV2 0x59801208 #ifndef __ASSEMBLY__ -#include <asm/io.h> +#include <linux/io.h> static inline int boot_is_swapped(void) { return !(readl(SBBASE0) & SBBASE_BANK_ENABLE); diff --git a/arch/arm/mach-uniphier/include/mach/sg-regs.h b/arch/arm/mach-uniphier/include/mach/sg-regs.h index 63408d5ba7..a65f058ee2 100644 --- a/arch/arm/mach-uniphier/include/mach/sg-regs.h +++ b/arch/arm/mach-uniphier/include/mach/sg-regs.h @@ -1,7 +1,7 @@ /* * UniPhier SG (SoC Glue) block registers * - * Copyright (C) 2011-2015 Panasonic Corporation + * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -108,7 +108,7 @@ #else #include <linux/types.h> -#include <asm/io.h> +#include <linux/io.h> static inline void sg_set_pinsel(int n, int value) { |
