ARM: uniphier: delete or replace <common.h> includes

<common.h> pulls in a lot of bloat. <common.h> is unneeded in most of places. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2025-02-17 22:49:02 +00:00 · 2020-05-20 12:31:27 +09:00 · 2020-05-20 12:31:27 +09:00 · 6717e15447
commit 6717e15447
parent 1e1518866f
36 changed files with 8 additions and 36 deletions
--- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c
+++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
--- a/arch/arm/mach-uniphier/arm32/psci.c
+++ b/arch/arm/mach-uniphier/arm32/psci.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
--- a/arch/arm/mach-uniphier/arm32/timer.c
+++ b/arch/arm/mach-uniphier/arm32/timer.c
@ -3,7 +3,7 @@
 * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <linux/io.h>

--- a/arch/arm/mach-uniphier/arm64/mem_map.c
+++ b/arch/arm/mach-uniphier/arm64/mem_map.c
@ -3,7 +3,6 @@
 * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <linux/types.h>
 #include <asm/armv8/mmu.h>

--- a/arch/arm/mach-uniphier/base-address.c
+++ b/arch/arm/mach-uniphier/base-address.c
@ -3,9 +3,9 @@
 // Copyright (C) 2019 Socionext Inc.
 //   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

-#include <common.h>
 #include <dm/of.h>
 #include <fdt_support.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <env.h>
 #include <init.h>
 #include <spl.h>
--- a/arch/arm/mach-uniphier/boards.c
+++ b/arch/arm/mach-uniphier/boards.c
@ -4,9 +4,9 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <linux/libfdt.h>
 #include <linux/kernel.h>
+#include <asm/global_data.h>

 #include "init.h"

--- a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
--- a/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
--- a/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
--- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
--- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@ -4,12 +4,12 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <command.h>
 #include <spl.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/log2.h>

--- a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
@ -4,7 +4,6 @@
 * Copyright (C) 2015-2017 Socionext Inc.
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>

--- a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
@ -3,7 +3,6 @@
 * Copyright (C) 2016-2017 Socionext Inc.
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>

--- a/arch/arm/mach-uniphier/clk/clk-early-ld4.c
+++ b/arch/arm/mach-uniphier/clk/clk-early-ld4.c
@ -4,7 +4,6 @@
 * Copyright (C) 2015-2017 Socionext Inc.
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>

--- a/arch/arm/mach-uniphier/clk/clk-ld11.c
+++ b/arch/arm/mach-uniphier/clk/clk-ld11.c
@ -3,7 +3,6 @@
 * Copyright (C) 2016 Socionext Inc.
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
--- a/arch/arm/mach-uniphier/clk/dpll-ld4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-ld4.c
@ -4,7 +4,6 @@
 * Copyright (C) 2015-2016 Socionext Inc.
 */

-#include <common.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
--- a/arch/arm/mach-uniphier/clk/dpll-pro4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-pro4.c
@ -4,7 +4,6 @@
 * Copyright (C) 2015-2016 Socionext Inc.
 */

-#include <common.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
@ -3,7 +3,6 @@
 * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <debug_uart.h>
 #include <linux/io.h>
 #include <linux/serial_reg.h>
--- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <command.h>
 #include <stdio.h>
 #include <linux/io.h>
--- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <command.h>
 #include <stdio.h>
 #include <linux/io.h>
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
--- a/arch/arm/mach-uniphier/dram_init.c
+++ b/arch/arm/mach-uniphier/dram_init.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <init.h>
 #include <linux/errno.h>
 #include <linux/io.h>
@ -13,6 +12,7 @@
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>

 #include "init.h"
 #include "sg-regs.h"
--- a/arch/arm/mach-uniphier/fdt-fixup.c
+++ b/arch/arm/mach-uniphier/fdt-fixup.c
@ -4,11 +4,11 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>

--- a/arch/arm/mach-uniphier/memconf.c
+++ b/arch/arm/mach-uniphier/memconf.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@ -5,12 +5,13 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
+#include <config.h>
 #include <dm/of.h>
 #include <fdt_support.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <asm/global_data.h>

 #include "micro-support-card.h"

--- a/arch/arm/mach-uniphier/mmc-boot-mode.c
+++ b/arch/arm/mach-uniphier/mmc-boot-mode.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <mmc.h>
 #include <spl.h>

--- a/arch/arm/mach-uniphier/mmc-first-dev.c
+++ b/arch/arm/mach-uniphier/mmc-first-dev.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <mmc.h>
--- a/arch/arm/mach-uniphier/pinctrl-glue.c
+++ b/arch/arm/mach-uniphier/pinctrl-glue.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <linux/errno.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
--- a/arch/arm/mach-uniphier/reset.c
+++ b/arch/arm/mach-uniphier/reset.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <linux/io.h>
 #include <asm/secure.h>
--- a/arch/arm/mach-uniphier/sbc/sbc-ld11.c
+++ b/arch/arm/mach-uniphier/sbc/sbc-ld11.c
@ -3,7 +3,6 @@
 * Copyright (C) 2016-2017 Socionext Inc.
 */

-#include <common.h>
 #include <spl.h>
 #include <linux/io.h>

--- a/arch/arm/mach-uniphier/sbc/sbc.c
+++ b/arch/arm/mach-uniphier/sbc/sbc.c
@ -5,7 +5,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <linux/io.h>
 #include <asm/global_data.h>

--- a/arch/arm/mach-uniphier/spl_board_init.c
+++ b/arch/arm/mach-uniphier/spl_board_init.c
@ -4,7 +4,6 @@
 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
 #include <debug_uart.h>
 #include <hang.h>
 #include <spl.h>