diff options
author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /arch/arm/mach-tegra/tegra124 | |
parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'arch/arm/mach-tegra/tegra124')
-rw-r--r-- | arch/arm/mach-tegra/tegra124/clock.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra124/cpu.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra124/funcmux.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra124/xusb-padctl.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c index 70916ea3c1..79e67f5194 100644 --- a/arch/arm/mach-tegra/tegra124/clock.c +++ b/arch/arm/mach-tegra/tegra124/clock.c @@ -7,6 +7,8 @@ /* Tegra124 Clock control functions */ #include <common.h> +#include <init.h> +#include <log.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/sysctr.h> @@ -15,6 +17,7 @@ #include <asm/arch-tegra/timer.h> #include <div64.h> #include <fdtdec.h> +#include <linux/delay.h> /* * Clock types that we can use as a source. The Tegra124 has muxes for the diff --git a/arch/arm/mach-tegra/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c index abc050c27b..d5f2683b26 100644 --- a/arch/arm/mach-tegra/tegra124/cpu.c +++ b/arch/arm/mach-tegra/tegra124/cpu.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/arch/ahb.h> #include <asm/arch/clock.h> @@ -14,6 +15,7 @@ #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/ap.h> +#include <linux/delay.h> #include "../cpu.h" /* Tegra124-specific CPU init code */ diff --git a/arch/arm/mach-tegra/tegra124/funcmux.c b/arch/arm/mach-tegra/tegra124/funcmux.c index a8fcac6038..e7ad85fde2 100644 --- a/arch/arm/mach-tegra/tegra124/funcmux.c +++ b/arch/arm/mach-tegra/tegra124/funcmux.c @@ -7,6 +7,7 @@ /* Tegra124 high-level function multiplexing */ #include <common.h> +#include <log.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c index 09ab8c78cf..38afc3cbe6 100644 --- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c +++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c @@ -7,8 +7,10 @@ #include <common.h> #include <errno.h> +#include <log.h> #include <dm/of_access.h> #include <dm/ofnode.h> +#include <linux/delay.h> #include "../xusb-padctl-common.h" |