diff options
| author | Tom Rini <trini@konsulko.com> | 2023-11-28 10:05:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-28 10:05:25 -0500 |
| commit | b2bf18d5e584dd6d65b0b35de19354f9ac615808 (patch) | |
| tree | adc54b991509501f0d6268d37994d9741b49c7ef /arch | |
| parent | acae7eb5fe063dcfe2dbdb1e1804cf3e12cc2f3f (diff) | |
| parent | 470682ace1e03a6573d6eef9a00b524d608ddfa7 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-samsung
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/gpio.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/soc.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/include/mach/gpio.h b/arch/arm/mach-exynos/include/mach/gpio.h index f9975d7919f..9eeeb769996 100644 --- a/arch/arm/mach-exynos/include/mach/gpio.h +++ b/arch/arm/mach-exynos/include/mach/gpio.h @@ -8,6 +8,9 @@ #define __ASM_ARCH_GPIO_H #ifndef __ASSEMBLY__ + +#include <asm/arch/cpu.h> + struct s5p_gpio_bank { unsigned int con; unsigned int dat; diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c index a07c87a2c8e..aff2b5e1b6e 100644 --- a/arch/arm/mach-exynos/soc.c +++ b/arch/arm/mach-exynos/soc.c @@ -9,6 +9,7 @@ #include <asm/cache.h> #include <asm/io.h> #include <asm/system.h> +#include <asm/arch/cpu.h> #ifdef CONFIG_TARGET_ESPRESSO7420 /* @@ -20,12 +21,14 @@ extern void _main(void); void *secondary_boot_addr = (void *)_main; #endif /* CONFIG_TARGET_ESPRESSO7420 */ +#if !CONFIG_IS_ENABLED(SYSRESET) void reset_cpu(void) { #ifdef CONFIG_CPU_V7A writel(0x1, samsung_get_base_swreset()); #endif } +#endif #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) void enable_caches(void) |