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>

diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c
index b6e4abbad0f62bfb030b882f0453478cbf23ea9d..cde2a8124fe221687b4acd080fdeba9f5f096952 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <cpu_func.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <cpu_func.h>
 #include <linux/io.h>
 #include <linux/kernel.h>

diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c
index b54dc3979d66ee40998f3572bce2c17ee298cfa6..a4d260aecedcee55b1a12c824e90e2cc5043a6d1 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <cpu_func.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <cpu_func.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>

diff --git a/arch/arm/mach-uniphier/arm32/timer.c b/arch/arm/mach-uniphier/arm32/timer.c
index b3c907b50891f2581439d28c9a64b487628f3712..a40bdf17055e841b2f64512cf6b8160face671c7 100644 (file)
--- 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>
  */
 
  * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>
+#include <config.h>

 #include <init.h>
 #include <linux/io.h>
 
 #include <init.h>
 #include <linux/io.h>
 

diff --git a/arch/arm/mach-uniphier/arm64/mem_map.c b/arch/arm/mach-uniphier/arm64/mem_map.c
index 7653bd2d3c65874208376dfb127b65f839b69dec..a8bd4eee898a859b2cde99e91e4566ccc6b70265 100644 (file)
--- 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>
  */
 
  * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

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

diff --git a/arch/arm/mach-uniphier/base-address.c b/arch/arm/mach-uniphier/base-address.c
index 5ee742e363ffd5548977b19805fe0e58aa43997e..d7456f8df6f21bdfbd1c3157a71eadaacbec850e 100644 (file)
--- 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>
 
 // Copyright (C) 2019 Socionext Inc.
 //   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 

-#include <common.h>

 #include <dm/of.h>
 #include <fdt_support.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>
 #include <linux/io.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>

diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index 378aad0c9c4566819c91595d62ccafa72b757b05..b800e8b8c6be11b31e89bc5c57fb2f8428ce0812 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <env.h>
 #include <init.h>
 #include <spl.h>
 #include <env.h>
 #include <init.h>
 #include <spl.h>

diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c
index d9a8d2f28aef92f1fd4399318a29c1f35d285a3f..3e2ec9b26a41abebd38f98ec81a3e3ebc42b7e9f 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <linux/libfdt.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/kernel.h>

+#include <asm/global_data.h>

 
 #include "init.h"
 
 
 #include "init.h"
 

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
index 11e70a926fc84eb4f4cd152b8c6e8b8e6f5de2f4..4689ed79fdc8cf434ac4c674b3aeb3b9b40436da 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c
index 02b239475f1308c18ce1f502b8ccead4d9d887f5..c6aef18c198dd3138b8f11b10105e7db5d4122a1 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c b/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c
index 55452484d908a75438beea170a3add21182d52f0..efd07a3296562db06ca2229d68bf99e7ddea7683 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
index 49c5da1469c7169f31d90610e118e02e07edd624..677470cdc6497fd3eb35f961544c8a1075d1561f 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <spl.h>
 #include <linux/io.h>
 #include <linux/kernel.h>

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
index 4aee50f5d32e6dfe349cdbd8463bcab5e39eb9d0..688809931279cd1b27cba8719992473026478609 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <spl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <spl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 2fb625535bd6d5a533de8248856ed40fb2399c92..69a35f5fb8e2698ef2ee0a0f06fe731fe720fb13 100644 (file)
--- 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>
  */
 
  *   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 <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>
 
 #include <linux/io.h>
 #include <linux/log2.h>
 

diff --git a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
index c796d364bb160af1daa02208d30be74185d66fbd..3b721eaf2340b69c22f8a8ba389da06eda1fa2c6 100644 (file)
--- 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.
  */
 
  * Copyright (C) 2015-2017 Socionext Inc.
  */
 

-#include <common.h>

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

diff --git a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
index b78bd016721844ae9de7fa776fa3289a67f08206..75d3e70d6aad5a5b6bfeac336dbd34e1b04f701f 100644 (file)
--- 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.
  */
 
  * Copyright (C) 2016-2017 Socionext Inc.
  */
 

-#include <common.h>

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

diff --git a/arch/arm/mach-uniphier/clk/clk-early-ld4.c b/arch/arm/mach-uniphier/clk/clk-early-ld4.c
index 0f9ce650976899a65a342e1ef46b62241af186f5..25b72d8926c89789e5e0fe66f8243f8f9db95c7f 100644 (file)
--- 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.
  */
 
  * Copyright (C) 2015-2017 Socionext Inc.
  */
 

-#include <common.h>

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

diff --git a/arch/arm/mach-uniphier/clk/clk-ld11.c b/arch/arm/mach-uniphier/clk/clk-ld11.c
index 94b9d904dc644dd4dd210530272c5941f56fbe59..d241a65382f67a486c7d4602e771cc81ababbe84 100644 (file)
--- 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.
  */
 
  * Copyright (C) 2016 Socionext Inc.
  */
 

-#include <common.h>

 #include <spl.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <spl.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>

diff --git a/arch/arm/mach-uniphier/clk/dpll-ld4.c b/arch/arm/mach-uniphier/clk/dpll-ld4.c
index fd77aa7e11588f100776f334397372f6db3a109b..3ccaf02242c667657b7cec8e21dd9d8cb666f6e4 100644 (file)
--- 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.
  */
 
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 

-#include <common.h>

 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>

diff --git a/arch/arm/mach-uniphier/clk/dpll-pro4.c b/arch/arm/mach-uniphier/clk/dpll-pro4.c
index c86881dabd2657bf3194b7969b7ed010df3b81ec..44006ae6dc44ff2ea4c2a8b33d760889d114a33f 100644 (file)
--- 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.
  */
 
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 

-#include <common.h>

 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>

diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.c b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
index a70ce59accdc63e49edc1e15947e5baa450ad335..d116d46812d56630e29d2a81991dfee8d04dfa42 100644 (file)
--- 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>
  */
 
  * 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>
 #include <debug_uart.h>
 #include <linux/io.h>
 #include <linux/serial_reg.h>

diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
index a6c0735198b8827189c1182a8c3b4dd4d3463a53..629f8b90c9d869b5b2a082f15499d63f74524e1b 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <command.h>
 #include <stdio.h>
 #include <linux/io.h>
 #include <command.h>
 #include <stdio.h>
 #include <linux/io.h>

diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
index 476c5b3582308140078adab1d5a68b031a24341e..ca519d1c7e0c6be37d0ef00cbbc30b72a763fcc4 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <command.h>
 #include <stdio.h>
 #include <linux/io.h>
 #include <command.h>
 #include <stdio.h>
 #include <linux/io.h>

diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 2d1f3e3dc0f799044cd49750247933e6ecf972f1..96acca2562fac2ebc5c6c80fa9f4e2c248283b22 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>

diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index 012e5f869b79ec2e085a65252cc598ac781e7149..cde39b499bf6974bf4e1bf4684d9023b44b88d63 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>

diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index b55b04415c72add6fd72e7ef0b8025d2fceb5c4f..a11586952d84b535c6ce97d359cb4e8bc6c5dc64 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>

diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
index 1127373b20fb53ac638b39beacd4a8f0bf5055ae..7f2753190c233372e21c9f9da81ee9fc1b6a6453 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <init.h>
 #include <linux/errno.h>
 #include <linux/io.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 <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/global_data.h>

+#include <asm/u-boot.h>

 
 #include "init.h"
 #include "sg-regs.h"
 
 #include "init.h"
 #include "sg-regs.h"

diff --git a/arch/arm/mach-uniphier/fdt-fixup.c b/arch/arm/mach-uniphier/fdt-fixup.c
index 6f3c29d8c0215e7f96ee965ed86c6b9a2ff51f7f..980c260f4c9440ee78172b21bbbf773c1772156b 100644 (file)
--- 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>
  */
 
  *   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 <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>
 
 #include <linux/kernel.h>
 #include <linux/printk.h>
 

diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c
index f69b489b76e506d60c0f2ecc28681ec6fb83a7f9..57192f0154aa21081e1482aadc4ce3a689e2386d 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>

diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index 84c377766ac0e243e4c237381e5aa263ff14b3bc..3bd26f26dbd28129631623ba54c076d3ee9839d3 100644 (file)
--- 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>
  */
 
  *   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 <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"
 
 
 #include "micro-support-card.h"
 

diff --git a/arch/arm/mach-uniphier/mmc-boot-mode.c b/arch/arm/mach-uniphier/mmc-boot-mode.c
index b48495365c051fdf6c11703ff59ffd7727c6e607..e47e5df6480aa56ab8d0f711bcec9ea28c09466a 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

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

diff --git a/arch/arm/mach-uniphier/mmc-first-dev.c b/arch/arm/mach-uniphier/mmc-first-dev.c
index 7f29b6bccd4643a9e50b2380454c2a6843787a01..45bb10f8eb1f9c85a28fe40bd70d08960a1fbe01 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <command.h>
 #include <env.h>
 #include <mmc.h>
 #include <command.h>
 #include <env.h>
 #include <mmc.h>

diff --git a/arch/arm/mach-uniphier/pinctrl-glue.c b/arch/arm/mach-uniphier/pinctrl-glue.c
index b45f72f59a77862b8256f4bd19d6d2db77694d5a..2e07264695956de7c685f33b0fc73b42c92274ce 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <linux/errno.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <dm.h>
 #include <dm/pinctrl.h>

diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c
index 92a8b925474f098274d93eaa97f995691fd20a57..5fffd23e9a5a31bf3d7991bf92c50e33bfe1faa5 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

 #include <cpu_func.h>
 #include <linux/io.h>
 #include <asm/secure.h>
 #include <cpu_func.h>
 #include <linux/io.h>
 #include <asm/secure.h>

diff --git a/arch/arm/mach-uniphier/sbc/sbc-ld11.c b/arch/arm/mach-uniphier/sbc/sbc-ld11.c
index 21972ac9494bc462780a34955935b8919e7f06c8..a0162e1cc852fc08738be94e1afe275ff1c1ea11 100644 (file)
--- 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.
  */
 
  * Copyright (C) 2016-2017 Socionext Inc.
  */
 

-#include <common.h>

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

diff --git a/arch/arm/mach-uniphier/sbc/sbc.c b/arch/arm/mach-uniphier/sbc/sbc.c
index af8d6f4f9dc5bb90ca71d5e70fc5ee7c5c2ea9a5..2100f49a0888a2cf48701ac109228c46335e7e03 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

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

diff --git a/arch/arm/mach-uniphier/spl_board_init.c b/arch/arm/mach-uniphier/spl_board_init.c
index 48764a18702f67f7ed21e6fe36c27db415e2ab4b..a93b8cdc04d21dc67b6033acb31b3d0330310a9a 100644 (file)
--- 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>
  */
 
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 

-#include <common.h>

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