mips: Remove common.h usage

We can remove common.h from most cases of the code here, and only a few places need an additional header instead. Signed-off-by: Tom Rini <trini@konsulko.com>
2023-10-12 19:03:58 -04:00 · 2023-10-12 19:03:58 -04:00 · 8991fed97d
commit 8991fed97d
parent 577dddb5b7
46 changed files with 4 additions and 47 deletions
--- a/arch/mips/cpu/cpu.c
+++ b/arch/mips/cpu/cpu.c
@ -4,7 +4,6 @@
 * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
 */

-#include <common.h>
 #include <command.h>
 #include <init.h>
 #include <linux/compiler.h>
--- a/arch/mips/cpu/interrupts.c
+++ b/arch/mips/cpu/interrupts.c
@ -4,7 +4,6 @@
 * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
 */

-#include <common.h>
 #include <irq_func.h>

 int interrupt_init(void)
--- a/arch/mips/cpu/time.c
+++ b/arch/mips/cpu/time.c
@ -4,7 +4,6 @@
 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 */

-#include <common.h>
 #include <time.h>
 #include <asm/mipsregs.h>

--- a/arch/mips/include/asm/cacheops.h
+++ b/arch/mips/include/asm/cacheops.h
@ -11,6 +11,7 @@
 #include <asm/cache.h>

 #ifndef __ASSEMBLY__
+#include <linux/types.h>

 static inline void mips_cache(int op, const volatile void *addr)
 {
--- a/arch/mips/lib/boot.c
+++ b/arch/mips/lib/boot.c
@ -3,7 +3,6 @@
 * Copyright (C) 2020 Stefan Roese <sr@denx.de>
 */

-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@ -4,7 +4,6 @@
 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 */

-#include <common.h>
 #include <bootstage.h>
 #include <env.h>
 #include <image.h>
--- a/arch/mips/lib/cache.c
+++ b/arch/mips/lib/cache.c
@ -4,7 +4,6 @@
 * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <malloc.h>
 #include <asm/cache.h>
--- a/arch/mips/lib/reloc.c
+++ b/arch/mips/lib/reloc.c
@ -26,7 +26,6 @@
 * terminating R_MIPS_NONE reloc includes no offset.
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/relocs.h>
--- a/arch/mips/lib/spl.c
+++ b/arch/mips/lib/spl.c
@ -3,7 +3,6 @@
 * Copyright (C) 2020 Stefan Roese <sr@denx.de>
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <spl.h>
--- a/arch/mips/lib/stack.c
+++ b/arch/mips/lib/stack.c
@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+

-#include <common.h>
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@ -10,9 +10,9 @@
 * Copyright (C) 2014, Imagination Technologies Ltd.
 */

-#include <common.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
@ -20,6 +20,7 @@
 #include <asm/mipsregs.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
+#include <asm/u-boot.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/arch/mips/mach-ath79/ar933x/clk.c
+++ b/arch/mips/mach-ath79/ar933x/clk.c
@ -3,7 +3,6 @@
 * Copyright (C) 2015-2016 Wills Wang <wills.wang@live.com>
 */

-#include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
--- a/arch/mips/mach-ath79/ar933x/ddr.c
+++ b/arch/mips/mach-ath79/ar933x/ddr.c
@ -4,7 +4,6 @@
 * Based on Atheros LSDK/QSDK
 */

-#include <common.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@ -3,7 +3,6 @@
 * Copyright (C) 2016 Marek Vasut <marex@denx.de>
 */

-#include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
 #include <hang.h>
--- a/arch/mips/mach-ath79/ar934x/cpu.c
+++ b/arch/mips/mach-ath79/ar934x/cpu.c
@ -3,7 +3,5 @@
 * Copyright (C) 2016 Marek Vasut <marex@denx.de>
 */

-#include <common.h>
-
 /* The lowlevel_init() is not needed on AR934x */
 void lowlevel_init(void) {}
--- a/arch/mips/mach-ath79/ar934x/ddr.c
+++ b/arch/mips/mach-ath79/ar934x/ddr.c
@ -5,7 +5,6 @@
 * Based on RAM init sequence by Piotr Dymacz <pepe2k@gmail.com>
 */

-#include <common.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@ -3,7 +3,6 @@
 * Copyright (C) 2015-2016 Wills Wang <wills.wang@live.com>
 */

-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
--- a/arch/mips/mach-ath79/dram.c
+++ b/arch/mips/mach-ath79/dram.c
@ -3,7 +3,6 @@
 * Copyright (C) 2015-2016 Wills Wang <wills.wang@live.com>
 */

-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/sizes.h>
--- a/arch/mips/mach-ath79/qca953x/clk.c
+++ b/arch/mips/mach-ath79/qca953x/clk.c
@ -3,7 +3,6 @@
 * Copyright (C) 2015-2016 Wills Wang <wills.wang@live.com>
 */

-#include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
--- a/arch/mips/mach-ath79/qca953x/ddr.c
+++ b/arch/mips/mach-ath79/qca953x/ddr.c
@ -4,7 +4,6 @@
 * Based on Atheros LSDK/QSDK
 */

-#include <common.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
--- a/arch/mips/mach-ath79/qca956x/clk.c
+++ b/arch/mips/mach-ath79/qca956x/clk.c
@ -3,7 +3,6 @@
 * Copyright (C) 2019 Rosy Song <rosysong@rosinson.com>
 */

-#include <common.h>
 #include <clock_legacy.h>
 #include <log.h>
 #include <asm/global_data.h>
--- a/arch/mips/mach-ath79/qca956x/cpu.c
+++ b/arch/mips/mach-ath79/qca956x/cpu.c
@ -3,7 +3,5 @@
 * Copyright (C) 2019 Rosy Song <rosysong@rosinson.com>
 */

-#include <common.h>
-
 /* The lowlevel_init() is not needed on QCA956X */
 void lowlevel_init(void) {}
--- a/arch/mips/mach-ath79/qca956x/ddr.c
+++ b/arch/mips/mach-ath79/qca956x/ddr.c
@ -5,7 +5,6 @@
 * Based on QSDK
 */

-#include <common.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
--- a/arch/mips/mach-ath79/reset.c
+++ b/arch/mips/mach-ath79/reset.c
@ -4,7 +4,6 @@
 * Copyright (C) 2018-2019 Rosy Song <rosysong@rosinson.com>
 */

-#include <common.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
--- a/arch/mips/mach-bmips/dram.c
+++ b/arch/mips/mach-bmips/dram.c
@ -4,7 +4,6 @@
 * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
 */

-#include <common.h>
 #include <init.h>
 #include <log.h>
 #include <ram.h>
--- a/arch/mips/mach-jz47xx/jz4780/gpio.c
+++ b/arch/mips/mach-jz47xx/jz4780/gpio.c
@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+

 #include <config.h>
-#include <common.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <mach/jz4780.h>
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@ -7,7 +7,6 @@
 */

 #include <config.h>
-#include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <image.h>
--- a/arch/mips/mach-jz47xx/jz4780/pll.c
+++ b/arch/mips/mach-jz47xx/jz4780/pll.c
@ -7,7 +7,6 @@
 */

 #include <config.h>
-#include <common.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
--- a/arch/mips/mach-jz47xx/jz4780/reset.c
+++ b/arch/mips/mach-jz47xx/jz4780/reset.c
@ -7,7 +7,6 @@
 */

 #include <config.h>
-#include <common.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <mach/jz4780.h>
--- a/arch/mips/mach-jz47xx/jz4780/sdram.c
+++ b/arch/mips/mach-jz47xx/jz4780/sdram.c
@ -9,7 +9,6 @@
 * Copyright (c) 2006-2013 Ingenic Semiconductor
 */

-#include <common.h>
 #include <hang.h>
 #include <init.h>
 #include <asm/io.h>
--- a/arch/mips/mach-jz47xx/jz4780/timer.c
+++ b/arch/mips/mach-jz47xx/jz4780/timer.c
@ -7,7 +7,6 @@
 */

 #include <config.h>
-#include <common.h>
 #include <div64.h>
 #include <init.h>
 #include <irq_func.h>
--- a/arch/mips/mach-mscc/cpu.c
+++ b/arch/mips/mach-mscc/cpu.c
@ -3,7 +3,6 @@
 * Copyright (c) 2018 Microsemi Corporation
 */

-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
--- a/arch/mips/mach-mscc/dram.c
+++ b/arch/mips/mach-mscc/dram.c
@ -3,7 +3,6 @@
 * Copyright (c) 2018 Microsemi Corporation
 */

-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>

--- a/arch/mips/mach-mscc/gpio.c
+++ b/arch/mips/mach-mscc/gpio.c
@ -3,7 +3,6 @@
 * Copyright (c) 2018 Microsemi Corporation
 */

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

--- a/arch/mips/mach-mscc/include/mach/ddr.h
+++ b/arch/mips/mach-mscc/include/mach/ddr.h
@ -6,6 +6,7 @@
 #ifndef __ASM_MACH_DDR_H
 #define __ASM_MACH_DDR_H

+#include <config.h>
 #include <asm/cacheops.h>
 #include <asm/io.h>
 #include <asm/reboot.h>
--- a/arch/mips/mach-mscc/phy.c
+++ b/arch/mips/mach-mscc/phy.c
@ -3,7 +3,6 @@
 * Copyright (c) 2018 Microsemi Corporation
 */

-#include <common.h>
 #include <log.h>
 #include <asm/io.h>

--- a/arch/mips/mach-mscc/reset.c
+++ b/arch/mips/mach-mscc/reset.c
@ -3,8 +3,6 @@
 * Copyright (c) 2018 Microsemi Corporation
 */

-#include <common.h>
-
 #include <asm/sections.h>
 #include <asm/io.h>

--- a/arch/mips/mach-mtmips/cpu.c
+++ b/arch/mips/mach-mtmips/cpu.c
@ -3,7 +3,6 @@
 * Copyright (C) 2018 Stefan Roese <sr@denx.de>
 */

-#include <common.h>
 #include <event.h>
 #include <init.h>
 #include <malloc.h>
--- a/arch/mips/mach-mtmips/ddr_cal.c
+++ b/arch/mips/mach-mtmips/ddr_cal.c
@ -5,7 +5,6 @@
 * Author:  Weijie Gao <weijie.gao@mediatek.com>
 */

-#include <common.h>
 #include <asm/addrspace.h>
 #include <asm/cacheops.h>
 #include <asm/global_data.h>
--- a/arch/mips/mach-mtmips/ddr_init.c
+++ b/arch/mips/mach-mtmips/ddr_init.c
@ -5,7 +5,6 @@
 * Author:  Weijie Gao <weijie.gao@mediatek.com>
 */

-#include <common.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/io.h>
--- a/arch/mips/mach-mtmips/mt7628/ddr.c
+++ b/arch/mips/mach-mtmips/mt7628/ddr.c
@ -5,7 +5,6 @@
 * Author:  Weijie Gao <weijie.gao@mediatek.com>
 */

-#include <common.h>
 #include <asm/addrspace.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@ -5,7 +5,6 @@
 * Author:  Weijie Gao <weijie.gao@mediatek.com>
 */

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <asm/global_data.h>
--- a/arch/mips/mach-mtmips/mt7628/serial.c
+++ b/arch/mips/mach-mtmips/mt7628/serial.c
@ -5,7 +5,6 @@
 * Author:  Weijie Gao <weijie.gao@mediatek.com>
 */

-#include <common.h>
 #include <asm/io.h>
 #include "mt7628.h"

--- a/arch/mips/mach-mtmips/spl.c
+++ b/arch/mips/mach-mtmips/spl.c
@ -5,7 +5,6 @@
 * Author: Weijie Gao <weijie.gao@mediatek.com>
 */

-#include <common.h>
 #include <init.h>
 #include <spl.h>
 #include <asm/sections.h>
--- a/arch/mips/mach-pic32/cpu.c
+++ b/arch/mips/mach-pic32/cpu.c
@ -4,7 +4,6 @@
 * Purna Chandra Mandal <purna.mandal@microchip.com>
 *
 */
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <event.h>
--- a/arch/mips/mach-pic32/reset.c
+++ b/arch/mips/mach-pic32/reset.c
@ -4,7 +4,6 @@
 *
 */

-#include <common.h>
 #include <asm/io.h>
 #include <mach/pic32.h>