Bladeren bron

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>
Masahiro Yamada 4 jaren geleden
bovenliggende
commit
6717e15447
36 gewijzigde bestanden met toevoegingen van 8 en 36 verwijderingen
  1. 0 1
      arch/arm/mach-uniphier/arm32/cache-uniphier.c
  2. 0 1
      arch/arm/mach-uniphier/arm32/psci.c
  3. 1 1
      arch/arm/mach-uniphier/arm32/timer.c
  4. 0 1
      arch/arm/mach-uniphier/arm64/mem_map.c
  5. 1 1
      arch/arm/mach-uniphier/base-address.c
  6. 0 1
      arch/arm/mach-uniphier/board_late_init.c
  7. 1 1
      arch/arm/mach-uniphier/boards.c
  8. 0 1
      arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
  9. 0 1
      arch/arm/mach-uniphier/boot-device/boot-device-ld4.c
  10. 0 1
      arch/arm/mach-uniphier/boot-device/boot-device-pro5.c
  11. 0 1
      arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
  12. 0 1
      arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
  13. 1 1
      arch/arm/mach-uniphier/boot-device/boot-device.c
  14. 0 1
      arch/arm/mach-uniphier/clk/clk-dram-ld4.c
  15. 0 1
      arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
  16. 0 1
      arch/arm/mach-uniphier/clk/clk-early-ld4.c
  17. 0 1
      arch/arm/mach-uniphier/clk/clk-ld11.c
  18. 0 1
      arch/arm/mach-uniphier/clk/dpll-ld4.c
  19. 0 1
      arch/arm/mach-uniphier/clk/dpll-pro4.c
  20. 0 1
      arch/arm/mach-uniphier/debug-uart/debug-uart.c
  21. 0 1
      arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
  22. 0 1
      arch/arm/mach-uniphier/dram/cmd_ddrphy.c
  23. 0 1
      arch/arm/mach-uniphier/dram/umc-ld4.c
  24. 0 1
      arch/arm/mach-uniphier/dram/umc-pro4.c
  25. 0 1
      arch/arm/mach-uniphier/dram/umc-sld8.c
  26. 1 1
      arch/arm/mach-uniphier/dram_init.c
  27. 1 1
      arch/arm/mach-uniphier/fdt-fixup.c
  28. 0 1
      arch/arm/mach-uniphier/memconf.c
  29. 2 1
      arch/arm/mach-uniphier/micro-support-card.c
  30. 0 1
      arch/arm/mach-uniphier/mmc-boot-mode.c
  31. 0 1
      arch/arm/mach-uniphier/mmc-first-dev.c
  32. 0 1
      arch/arm/mach-uniphier/pinctrl-glue.c
  33. 0 1
      arch/arm/mach-uniphier/reset.c
  34. 0 1
      arch/arm/mach-uniphier/sbc/sbc-ld11.c
  35. 0 1
      arch/arm/mach-uniphier/sbc/sbc.c
  36. 0 1
      arch/arm/mach-uniphier/spl_board_init.c

+ 0 - 1
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>

+ 0 - 1
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>

+ 1 - 1
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>
 

+ 0 - 1
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>
 

+ 1 - 1
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>

+ 0 - 1
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>

+ 1 - 1
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"
 

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 1 - 1
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>
 

+ 0 - 1
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>
 

+ 0 - 1
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>
 

+ 0 - 1
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>
 

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 1 - 1
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"

+ 1 - 1
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>
 

+ 0 - 1
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>

+ 2 - 1
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"
 

+ 0 - 1
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>
 

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>
 

+ 0 - 1
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>
 

+ 0 - 1
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>