diff options
| author | Simon Glass <[email protected]> | 2020-10-30 21:38:53 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-02-02 15:33:42 -0500 |
| commit | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (patch) | |
| tree | 0122abb2a3f1ea9837eaccc6150d2dae9570388e /arch/arm/include | |
| parent | fdcb93e1709ab1a2ebb562455621617c29e2099c (diff) | |
common: Drop asm/global_data.h from common header
Move this out of the common header and include it only where needed. In
a number of cases this requires adding "struct udevice;" to avoid adding
another large header or in other cases replacing / adding missing header
files that had been pulled in, very indirectly. Finally, we have a few
cases where we did not need to include <asm/global_data.h> at all, so
remove that include.
Signed-off-by: Simon Glass <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-rockchip/clock.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/clock.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/tegra_i2c.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/secure.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/ti-common/sys_proto.h | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h index 22de0aef8dc..5108180ea77 100644 --- a/arch/arm/include/asm/arch-rockchip/clock.h +++ b/arch/arm/include/asm/arch-rockchip/clock.h @@ -6,6 +6,8 @@ #ifndef _ASM_ARCH_CLOCK_H #define _ASM_ARCH_CLOCK_H +struct udevice; + /* define pll mode */ #define RKCLK_PLL_MODE_SLOW 0 #define RKCLK_PLL_MODE_NORMAL 1 diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h index 8aa90d5c0c5..1d80d9e9461 100644 --- a/arch/arm/include/asm/arch-tegra/clock.h +++ b/arch/arm/include/asm/arch-tegra/clock.h @@ -8,6 +8,8 @@ #ifndef _TEGRA_CLOCK_H_ #define _TEGRA_CLOCK_H_ +struct udevice; + /* Set of oscillator frequencies supported in the internal API. */ enum clock_osc_freq { /* All in MHz, so 13_0 is 13.0MHz */ diff --git a/arch/arm/include/asm/arch-tegra/tegra_i2c.h b/arch/arm/include/asm/arch-tegra/tegra_i2c.h index 5316bc47e4b..e57b9ef9c47 100644 --- a/arch/arm/include/asm/arch-tegra/tegra_i2c.h +++ b/arch/arm/include/asm/arch-tegra/tegra_i2c.h @@ -10,6 +10,8 @@ #include <asm/types.h> +struct udevice; + enum { I2C_TIMEOUT_USEC = 10000, /* Wait time for completion */ I2C_FIFO_DEPTH = 8, /* I2C fifo depth */ diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 2aafc6d2062..5a935d34e20 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -7,6 +7,9 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#include <asm/types.h> +#include <linux/types.h> + /* Architecture-specific global data */ struct arch_global_data { #if defined(CONFIG_FSL_ESDHC) || defined(CONFIG_FSL_ESDHC_IMX) diff --git a/arch/arm/include/asm/secure.h b/arch/arm/include/asm/secure.h index 50582c972b7..64e5582c1f2 100644 --- a/arch/arm/include/asm/secure.h +++ b/arch/arm/include/asm/secure.h @@ -2,6 +2,7 @@ #define __ASM_SECURE_H #include <config.h> +#include <asm/global_data.h> #define __secure __attribute__ ((section ("._secure.text"))) #define __secure_data __attribute__ ((section ("._secure.data"))) diff --git a/arch/arm/include/asm/ti-common/sys_proto.h b/arch/arm/include/asm/ti-common/sys_proto.h index db042a1aef2..a96a8382fb6 100644 --- a/arch/arm/include/asm/ti-common/sys_proto.h +++ b/arch/arm/include/asm/ti-common/sys_proto.h @@ -6,6 +6,8 @@ #ifndef _TI_COMMON_SYS_PROTO_H_ #define _TI_COMMON_SYS_PROTO_H_ +#include <asm/global_data.h> + DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_ARCH_OMAP2PLUS |