diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-15 10:16:45 -0500 |
| commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
| tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /arch/arm/include/asm | |
| parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'arch/arm/include/asm')
| -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 22de0aef8d..5108180ea7 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 8aa90d5c0c..1d80d9e946 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 5316bc47e4..e57b9ef9c4 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 2aafc6d206..5a935d34e2 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 50582c972b..64e5582c1f 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 db042a1aef..a96a8382fb 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 |