arm: Don't include common.h in header files

It is bad practice to include common.h in other header files since it can
bring in any number of superfluous definitions. It implies that some C
files don't include it and thus may be missing CONFIG options that are set
up by that file. The C files should include these themselves.

Update some header files in arch/arm to drop this.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-05-10 11:39:55 -06:00 committed by Tom Rini
parent b79fdc7697
commit c3dc39a2f8
80 changed files with 67 additions and 89 deletions

View File

@ -10,6 +10,7 @@
#include <version.h>
#include <asm/macro.h>
#include <asm/psci.h>
#include <asm/ptrace.h>
#include <asm/system.h>
/*

View File

@ -10,8 +10,6 @@
#ifndef __CLK_SYNTHESIZER_H
#define __CLK_SYNTHESIZER_H
#include <common.h>
#define CLK_SYNTHESIZER_ID_REG 0x0
#define CLK_SYNTHESIZER_XCSEL 0x05
#define CLK_SYNTHESIZER_MUX_REG 0x14

View File

@ -16,7 +16,6 @@
#ifndef _MUX_H_
#define _MUX_H_
#include <common.h>
#include <asm/io.h>
#ifdef CONFIG_AM33XX

View File

@ -16,7 +16,6 @@
#ifndef _MUX_AM33XX_H_
#define _MUX_AM33XX_H_
#include <common.h>
#include <asm/io.h>
#define MUX_CFG(value, offset) \

View File

@ -8,7 +8,6 @@
#ifndef _MUX_AM43XX_H_
#define _MUX_AM43XX_H_
#include <common.h>
#include <asm/io.h>
#define MUX_CFG(value, offset) \

View File

@ -17,7 +17,6 @@
#ifndef _MUX_TI816X_H_
#define _MUX_TI816X_H_
#include <common.h>
#include <asm/io.h>
#define MUX_CFG(value, offset) \

View File

@ -8,8 +8,6 @@
#ifndef __ASM_ARCH_FSL_LAYERSCAPE_CLOCK_H_
#define __ASM_ARCH_FSL_LAYERSCAPE_CLOCK_H_
#include <common.h>
enum mxc_clock {
MXC_ARM_CLK = 0,
MXC_BUS_CLK,

View File

@ -11,8 +11,6 @@
#ifndef _LPC32XX_DMA_H
#define _LPC32XX_DMA_H
#include <common.h>
/*
* DMA linked list structure used with a channel's LLI register;
* refer to UM10326, "LPC32x0 and LPC32x0/01 User manual" - Rev. 3

View File

@ -1,7 +1,6 @@
#ifndef _LPC32XX_I2C_H
#define _LPC32XX_I2C_H
#include <common.h>
#include <asm/types.h>
/* i2c register set */

View File

@ -7,8 +7,6 @@
#ifndef __ASM_ARCH_LS102XA_CLOCK_H_
#define __ASM_ARCH_LS102XA_CLOCK_H_
#include <common.h>
enum mxc_clock {
MXC_ARM_CLK = 0,
MXC_UART_CLK,

View File

@ -9,8 +9,6 @@
#ifndef __ASM_ARCH_CLOCK_H
#define __ASM_ARCH_CLOCK_H
#include <common.h>
#ifdef CONFIG_MX25_HCLK_FREQ
#define MXC_HCLK CONFIG_MX25_HCLK_FREQ
#else

View File

@ -7,8 +7,6 @@
#ifndef __ASM_ARCH_CLOCK_H
#define __ASM_ARCH_CLOCK_H
#include <common.h>
#define MXC_HCLK CONFIG_MX31_HCLK_FREQ
#define MXC_CLK32 CONFIG_MX31_CLK32

View File

@ -7,8 +7,6 @@
#ifndef __ASM_ARCH_CLOCK_H
#define __ASM_ARCH_CLOCK_H
#include <common.h>
#ifdef CONFIG_MX35_HCLK_FREQ
#define MXC_HCLK CONFIG_MX35_HCLK_FREQ
#else

View File

@ -7,8 +7,6 @@
#ifndef __ASM_ARCH_CLOCK_H
#define __ASM_ARCH_CLOCK_H
#include <common.h>
#ifdef CONFIG_SYS_MX5_HCLK
#define MXC_HCLK CONFIG_SYS_MX5_HCLK
#else

View File

@ -7,7 +7,7 @@
#ifndef __ASM_ARCH_CLOCK_H
#define __ASM_ARCH_CLOCK_H
#include <common.h>
#include <linux/types.h>
#ifdef CONFIG_SYS_MX6_HCLK
#define MXC_HCLK CONFIG_SYS_MX6_HCLK
@ -21,6 +21,8 @@
#define MXC_CLK32 32768
#endif
struct cmd_tbl_s;
enum mxc_clock {
MXC_ARM_CLK = 0,
MXC_PER_CLK,
@ -80,5 +82,6 @@ void enable_thermal_clk(void);
void mxs_set_lcdclk(u32 base_addr, u32 freq);
void select_ldb_di_clock_source(enum ldb_di_clock clk);
void enable_eim_clk(unsigned char enable);
int do_mx6_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
int do_mx6_showclocks(struct cmd_tbl_s *cmdtp, int flag, int argc,
char *const argv[]);
#endif /* __ASM_ARCH_CLOCK_H */

View File

@ -9,7 +9,6 @@
#ifndef _ASM_ARCH_CLOCK_H
#define _ASM_ARCH_CLOCK_H
#include <common.h>
#include <asm/arch/crm_regs.h>
#ifdef CONFIG_SYS_MX7_HCLK

View File

@ -6,7 +6,6 @@
#ifndef _ASM_ARCH_CLOCK_H
#define _ASM_ARCH_CLOCK_H
#include <common.h>
#include <asm/arch/pcc.h>
#include <asm/arch/scg.h>

View File

@ -6,7 +6,6 @@
#ifndef _ASM_ARCH_PCC_H
#define _ASM_ARCH_PCC_H
#include <common.h>
#include <asm/arch/scg.h>
/* PCC2 */

View File

@ -6,8 +6,6 @@
#ifndef _ASM_ARCH_SCG_H
#define _ASM_ARCH_SCG_H
#include <common.h>
#ifdef CONFIG_CLK_DEBUG
#define clk_debug(fmt, args...) printf(fmt, ##args)
#else

View File

@ -7,7 +7,6 @@
*/
#ifndef _CLOCKS_OMAP4_H_
#define _CLOCKS_OMAP4_H_
#include <common.h>
#include <asm/omap_common.h>
/*

View File

@ -8,7 +8,6 @@
*/
#ifndef _CLOCKS_OMAP5_H_
#define _CLOCKS_OMAP5_H_
#include <common.h>
#include <asm/omap_common.h>
/*

View File

@ -9,7 +9,6 @@
#ifndef _DRA7_IODELAY_H_
#define _DRA7_IODELAY_H_
#include <common.h>
#include <asm/arch/sys_proto.h>
/* CONFIG_REG_0 */

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_CRU_RK3308_H
#define _ASM_ARCH_CRU_RK3308_H
#include <common.h>
#define MHz 1000000
#define OSC_HZ (24 * MHz)

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_GRF_rk3308_H
#define _ASM_ARCH_GRF_rk3308_H
#include <common.h>
struct rk3308_grf {
unsigned int gpio0a_iomux;
unsigned int reserved0;

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_CRU_PX30_H
#define _ASM_ARCH_CRU_PX30_H
#include <common.h>
#define MHz 1000000
#define KHz 1000
#define OSC_HZ (24 * MHz)

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_CRU_RK3036_H
#define _ASM_ARCH_CRU_RK3036_H
#include <common.h>
#define OSC_HZ (24 * 1000 * 1000)
#define APLL_HZ (600 * 1000000)

View File

@ -6,8 +6,6 @@
#ifndef _ASM_ARCH_CRU_RK3128_H
#define _ASM_ARCH_CRU_RK3128_H
#include <common.h>
#define MHz 1000000
#define OSC_HZ (24 * MHz)

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_CRU_RK322X_H
#define _ASM_ARCH_CRU_RK322X_H
#include <common.h>
#define MHz 1000000
#define OSC_HZ (24 * MHz)

View File

@ -6,8 +6,6 @@
#ifndef __ASM_ARCH_CRU_RK3328_H_
#define __ASM_ARCH_CRU_RK3328_H_
#include <common.h>
struct rk3328_clk_priv {
struct rk3328_cru *cru;
ulong rate;

View File

@ -6,9 +6,6 @@
#ifndef _ASM_ARCH_CRU_RK3368_H
#define _ASM_ARCH_CRU_RK3368_H
#include <common.h>
/* RK3368 clock numbers */
enum rk3368_pll_id {
APLLB,

View File

@ -6,8 +6,6 @@
#ifndef __ASM_ARCH_CRU_RK3399_H_
#define __ASM_ARCH_CRU_RK3399_H_
#include <common.h>
/* Private data for the clock driver - used by rockchip_get_cru() */
struct rk3399_clk_priv {
struct rockchip_cru *cru;

View File

@ -6,8 +6,6 @@
#ifndef _ASM_ARCH_CRU_RV1108_H
#define _ASM_ARCH_CRU_RV1108_H
#include <common.h>
#define OSC_HZ (24 * 1000 * 1000)
#define APLL_HZ (600 * 1000000)

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_GRF_px30_H
#define _ASM_ARCH_GRF_px30_H
#include <common.h>
struct px30_grf {
unsigned int gpio1al_iomux;
unsigned int gpio1ah_iomux;

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_GRF_RK3036_H
#define _ASM_ARCH_GRF_RK3036_H
#include <common.h>
struct rk3036_grf {
unsigned int reserved[0x2a];
unsigned int gpio0a_iomux;

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_GRF_RK3128_H
#define _ASM_ARCH_GRF_RK3128_H
#include <common.h>
struct rk3128_grf {
unsigned int reserved[0x2a];
unsigned int gpio0a_iomux;

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_GRF_RK322X_H
#define _ASM_ARCH_GRF_RK322X_H
#include <common.h>
struct rk322x_grf {
unsigned int gpio0a_iomux;
unsigned int gpio0b_iomux;

View File

@ -6,8 +6,6 @@
#ifndef _ASM_ARCH_GRF_RK3368_H
#define _ASM_ARCH_GRF_RK3368_H
#include <common.h>
struct rk3368_grf {
u32 gpio1a_iomux;
u32 gpio1b_iomux;

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_GRF_RV1108_H
#define _ASM_ARCH_GRF_RV1108_H
#include <common.h>
struct rv1108_grf {
u32 reserved[4];
u32 gpio1a_iomux;

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_SDRAM_RK3036_H
#define _ASM_ARCH_SDRAM_RK3036_H
#include <common.h>
struct rk3036_ddr_pctl {
u32 scfg;
u32 sctl;

View File

@ -5,8 +5,6 @@
#ifndef _ASM_ARCH_SDRAM_RK322X_H
#define _ASM_ARCH_SDRAM_RK322X_H
#include <common.h>
struct rk322x_sdram_channel {
/*
* bit width in address, eg:

View File

@ -6,8 +6,6 @@
#ifndef __ASM_ARCH_CLOCK_H
#define __ASM_ARCH_CLOCK_H
#include <common.h>
enum mxc_clock {
MXC_ARM_CLK = 0,
MXC_BUS_CLK,

View File

@ -11,7 +11,6 @@
#ifndef __SUNXI_RSB_H
#define __SUNXI_RSB_H
#include <common.h>
#include <asm/io.h>
struct sunxi_rsb_reg {

View File

@ -6,8 +6,6 @@
#ifndef _ASM_ARCH_TEGRA_IVC_H
#define _ASM_ARCH_TEGRA_IVC_H
#include <common.h>
/*
* Tegra IVC is a communication protocol that transfers fixed-size frames
* bi-directionally and in-order between the local CPU and some remote entity.

View File

@ -8,7 +8,6 @@
#ifndef __TEGRA_MMC_H_
#define __TEGRA_MMC_H_
#include <common.h>
#include <clk.h>
#include <reset.h>
#include <fdtdec.h>

View File

@ -6,8 +6,6 @@
#ifndef __ASM_ARCH_CLOCK_H
#define __ASM_ARCH_CLOCK_H
#include <common.h>
enum mxc_clock {
MXC_ARM_CLK = 0,
MXC_BUS_CLK,

View File

@ -7,10 +7,10 @@
#ifndef __ASM_ARM_DMA_MAPPING_H
#define __ASM_ARM_DMA_MAPPING_H
#include <common.h>
#include <asm/cache.h>
#include <cpu_func.h>
#include <linux/dma-direction.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <malloc.h>

View File

@ -13,7 +13,6 @@
#ifndef _EMIF_H_
#define _EMIF_H_
#include <asm/types.h>
#include <common.h>
#include <asm/io.h>
/* Base address */

View File

@ -10,7 +10,7 @@
#ifndef __MACH_IOMUX_V3_H__
#define __MACH_IOMUX_V3_H__
#include <common.h>
#include <linux/types.h>
/*
* build IOMUX_PAD structure

View File

@ -10,9 +10,11 @@
#include <asm/io.h>
#include <asm/mach-imx/regs-common.h>
#include <asm/mach-imx/module_fuse.h>
#include <common.h>
#include <linux/bitops.h>
#include "../arch-imx/cpu.h"
struct bd_info;
#define soc_rev() (get_cpu_rev() & 0xFF)
#define is_soc_rev(rev) (soc_rev() == rev)
@ -182,7 +184,7 @@ char nxp_board_rev_string(void);
* Initializes on-chip ethernet controllers.
* to override, implement board_eth_init()
*/
int fecmxc_initialize(bd_t *bis);
int fecmxc_initialize(struct bd_info *bis);
u32 get_ahb_clk(void);
u32 get_periph_clk(void);

View File

@ -10,10 +10,12 @@
#ifndef __ASSEMBLY__
#include <common.h>
#include <linux/types.h>
#define NUM_SYS_CLKS 7
struct bd_info;
struct prcm_regs {
/* cm1.ckgen */
u32 cm_clksel_core;
@ -683,9 +685,9 @@ void omap_die_id(unsigned int *die_id);
void gpi2c_init(void);
/* Common FDT Fixups */
int ft_hs_disable_rng(void *fdt, bd_t *bd);
int ft_hs_fixup_dram(void *fdt, bd_t *bd);
int ft_hs_add_tee(void *fdt, bd_t *bd);
int ft_hs_disable_rng(void *fdt, struct bd_info *bd);
int ft_hs_fixup_dram(void *fdt, struct bd_info *bd);
int ft_hs_add_tee(void *fdt, struct bd_info *bd);
/* ABB */
#define OMAP_ABB_NOMINAL_OPP 0

View File

@ -8,8 +8,6 @@
#ifndef _OMAP_SEC_COMMON_H_
#define _OMAP_SEC_COMMON_H_
#include <common.h>
/*
* Invoke secure ROM API on high-security (HS) device variants. It formats
* the variable argument list into the format expected by the ROM code before

View File

@ -18,6 +18,10 @@
#ifndef __ARM_PSCI_H__
#define __ARM_PSCI_H__
#ifndef __ASSEMBLY__
#include <linux/bitops.h>
#endif
#define ARM_PSCI_VER_1_0 (0x00010000)
#define ARM_PSCI_VER_0_2 (0x00000002)

View File

@ -1,7 +1,6 @@
#ifndef __ASM_ARM_SYSTEM_H
#define __ASM_ARM_SYSTEM_H
#include <common.h>
#include <linux/compiler.h>
#include <asm/barriers.h>
@ -110,6 +109,8 @@
#ifndef __ASSEMBLY__
struct pt_regs;
u64 get_page_table_size(void);
#define PGTABLE_SIZE get_page_table_size()

View File

@ -6,6 +6,7 @@
* Copyright 2013 Freescale Semiconductor, Inc.
*/
#include <common.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux-vf610.h>

View File

@ -2,6 +2,8 @@
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*/
#include <common.h>
#include <cpu_func.h>
#include <init.h>
#include <asm/io.h>

View File

@ -7,6 +7,7 @@
#include <asm/arch/iomux.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
int setup_sata(void)

View File

@ -5,6 +5,7 @@
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
*/
#include <common.h>
#include <asm/arch/cpu.h>
#include <asm/arch/ddr_defs.h>
#include <asm/arch/sys_proto.h>

View File

@ -9,6 +9,7 @@
* Aneesh V <aneesh@ti.com>
*/
#include <common.h>
#include <asm/emif.h>
#include <asm/arch/sys_proto.h>

View File

@ -10,6 +10,7 @@
* Sricharan R <r.sricharan@ti.com>
*/
#include <common.h>
#include <asm/emif.h>
#include <asm/arch/sys_proto.h>

View File

@ -2,6 +2,8 @@
/*
* (C) Copyright 2019 Rockchip Electronics Co., Ltd
*/
#include <common.h>
#include <asm/io.h>
#include <asm/arch-rockchip/grf_rk3036.h>
#include <asm/arch-rockchip/hardware.h>

View File

@ -10,6 +10,7 @@
#ifndef _CM_T54_MUX_DATA_H
#define _CM_T54_MUX_DATA_H
#include <common.h>
#include <asm/arch/mux_omap5.h>
#include <asm/arch/sys_proto.h>

View File

@ -5,6 +5,7 @@
* Based on other i.MX6 boards
*/
#include <common.h>
#include <init.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>

View File

@ -12,6 +12,7 @@
* Copyright (C) 2013 Jon Nettleton <jon.nettleton@gmail.com>.
*/
#include <common.h>
#include <init.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>

View File

@ -5,6 +5,7 @@
* Author: Tim Harvey <tharvey@gateworks.com>
*/
#include <common.h>
#include <asm/arch/clock.h>
#include <asm/arch/mx6-pins.h>
#include <asm/arch/sys_proto.h>

View File

@ -4,6 +4,7 @@
* Copyright (C) 2016 Grinn
*/
#include <common.h>
#include <command.h>
#include <init.h>
#include <asm/arch/clock.h>

View File

@ -11,6 +11,8 @@
* (C) Copyright 2004-2008
* Texas Instruments, <www.ti.com>
*/
#include <common.h>
#include <asm/io.h>
#include <asm/arch/mem.h>
#include <asm/arch/sys_proto.h>

View File

@ -3,6 +3,7 @@
* Copyright (C) 2016 Stefano Babic <sbabic@denx.de>
*/
#include <common.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>

View File

@ -13,6 +13,7 @@
* Ported to SolidRun microSOM by Rabeeh Khoury <rabeeh@solid-run.com>
*/
#include <common.h>
#include <init.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>

View File

@ -6,6 +6,7 @@
* Fabio Estevam <festevam@gmail.com>
*/
#include <common.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>

View File

@ -5,6 +5,7 @@
* Author: Richard Hu <richard.hu@technexion.com>
*/
#include <common.h>
#include <cpu_func.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>

View File

@ -6,6 +6,7 @@
* Based on board/wandboard/spl.c
*/
#include <common.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>

View File

@ -5,6 +5,7 @@
* Richard Hu <hakahu@gmail.com>
*/
#include <common.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>

View File

@ -6,6 +6,7 @@
* Author: Fabio Estevam <fabio.estevam@freescale.com>
*/
#include <common.h>
#include <init.h>
#include <asm/arch/clock.h>
#include <asm/arch/crm_regs.h>

View File

@ -11,6 +11,8 @@
#include <dm/device_compat.h>
#include <dm/devres.h>
#include <linux/bitfield.h>
#include <linux/delay.h>
#include <linux/dma-direction.h>
#include <linux/dma-mapping.h>
#include <linux/err.h>
#include <linux/errno.h>

View File

@ -7,6 +7,8 @@
#include <clk.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <linux/bug.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/printk.h>

View File

@ -4,7 +4,10 @@
*/
#include <console.h>
#include <time.h>
#include <watchdog.h>
#include <linux/delay.h>
#include <linux/errno.h>
/* USB Vendor Requests */
#define USB_VENDOR_REQUEST_WRITE_REGISTER 0xA0
@ -122,6 +125,10 @@ int lan7x_write_reg(struct usb_device *udev, u32 index, u32 data);
int lan7x_read_reg(struct usb_device *udev, u32 index, u32 *data);
/*
* FIXME: Code should not be in header files. Nive this to a file common to
* the two drivers.
*/
static inline int lan7x_wait_for_bit(struct usb_device *udev,
const char *prefix, const u32 reg,
const u32 mask, const bool set,

View File

@ -1,6 +1,7 @@
#ifndef _LINUX_COMPAT_H_
#define _LINUX_COMPAT_H_
#include <log.h>
#include <malloc.h>
#include <linux/types.h>
#include <linux/err.h>

View File

@ -16,6 +16,7 @@
#include <config.h>
#include <dm/device.h>
#include <linux/bitops.h>
#include <linux/compat.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/flashchip.h>

View File

@ -15,9 +15,13 @@
#include <asm/cache.h>
#include <asm/byteorder.h> /* for nton* / ntoh* stuff */
#include <env.h>
#include <log.h>
#include <time.h>
#include <linux/if_ether.h>
#include <rand.h>
struct cmd_tbl_s;
#define DEBUG_LL_STATE 0 /* Link local state machine changes */
#define DEBUG_DEV_PKT 0 /* Packets or info directed to the device */
#define DEBUG_NET_PKT 0 /* Packets on info on the network at large */
@ -59,7 +63,7 @@ struct in_addr {
* @argv: List of arguments
* @return result (see enum command_ret_t)
*/
int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
int do_tftpb(struct cmd_tbl_s *cmdtp, int flag, int argc, char *const argv[]);
/**
* An incoming packet handler.

View File

@ -26,6 +26,8 @@ struct image_header;
#define MMCSD_MODE_FS 2
#define MMCSD_MODE_EMMCBOOT 3
struct image_header;
/*
* u_boot_first_phase() - check if this is the first U-Boot phase
*