diff options
| author | Tom Warren <twarren@nvidia.com> | 2011-11-10 14:50:56 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-11-15 03:06:57 -0800 |
| commit | 47d81fa441edaf8d142e0ac1e4c858f619b9a31d (patch) | |
| tree | 80918364636beb6ccefce8d24ad2e71e0340619f /arch/arm | |
| parent | 86e1bf03e7cc73a544ba114e4a589b4c2dc6eb87 (diff) | |
arm: Tegra: power: make power.c/.h common for future Tegra3 LCD use
Signed-off-by: Tom Warren <twarren@nvidia.com>
BUG=none
TEST=built Seaboard and Waluigi OK. Booted Waluigi OK.
Change-Id: I1bfbe03945d7dae44e0840349b9698fc08cef07d
Reviewed-on: https://gerrit.chromium.org/gerrit/11504
Tested-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Commit-Ready: Che-Liang Chiou <clchiou@chromium.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/power.c (renamed from arch/arm/cpu/armv7/tegra2/power.c) | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/power.h (renamed from arch/arm/include/asm/arch-tegra2/power.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/tegra-common/Makefile b/arch/arm/cpu/armv7/tegra-common/Makefile index 577a342694..226d190447 100644 --- a/arch/arm/cpu/armv7/tegra-common/Makefile +++ b/arch/arm/cpu/armv7/tegra-common/Makefile @@ -31,7 +31,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)libtegra-common.o SOBJS-y := lowlevel_init.o -COBJS-y := ap20.o board.o clock.o timer.o +COBJS-y := ap20.o board.o clock.o power.o timer.o SOBJS := $(SOBJS-y) COBJS := $(COBJS-y) diff --git a/arch/arm/cpu/armv7/tegra2/power.c b/arch/arm/cpu/armv7/tegra-common/power.c index 1ae53c7fff..d337bf0955 100644 --- a/arch/arm/cpu/armv7/tegra2/power.c +++ b/arch/arm/cpu/armv7/tegra-common/power.c @@ -25,7 +25,7 @@ #include <asm/arch-tegra/bitfield.h> #include <asm/arch/clock.h> #include <asm/arch-tegra/pmc.h> -#include <asm/arch/power.h> +#include <asm/arch-tegra/power.h> #include <asm/arch/tegra.h> #include <common.h> diff --git a/arch/arm/cpu/armv7/tegra2/Makefile b/arch/arm/cpu/armv7/tegra2/Makefile index 4e0b22f4a6..ff2168483d 100644 --- a/arch/arm/cpu/armv7/tegra2/Makefile +++ b/arch/arm/cpu/armv7/tegra2/Makefile @@ -33,7 +33,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o SOBJS-y := -COBJS-y := board.o display.o pinmux.o power.o pwfm.o sys_info.o +COBJS-y := board.o display.o pinmux.o pwfm.o sys_info.o COBJS-$(CONFIG_TEGRA2_LP0) += warmboot.o COBJS-$(CONFIG_TEGRA2_LP0) += warmboot_avp.o diff --git a/arch/arm/include/asm/arch-tegra2/power.h b/arch/arm/include/asm/arch-tegra/power.h index 9d168ebe2f..9d168ebe2f 100644 --- a/arch/arm/include/asm/arch-tegra2/power.h +++ b/arch/arm/include/asm/arch-tegra/power.h |