diff options
| author | Doug Anderson <dianders@chromium.org> | 2011-10-20 16:19:42 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-10-25 11:46:29 -0700 |
| commit | 6de853962ad258b621c59d65c26cf4ebc60e9669 (patch) | |
| tree | 85c04471f0092f627afb8f8be999ec5791d272fe /board/nvidia | |
| parent | 57fee6619bbf503c170e5ff2a3914a9173e7c01f (diff) | |
pmu: Allow inclusion of PMU code without turning on clock scaling
We may want to use the PMU to adjust various voltages even if we
don't have clock scaling. Separate these two conecpts.
BUG=chromium-os:21540
TEST=Compiled for Seaboard
Change-Id: I376afe7e795fd2dd8035186c58f48a552391b4d1
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/10457
Diffstat (limited to 'board/nvidia')
| -rw-r--r-- | board/nvidia/common/Makefile | 3 | ||||
| -rw-r--r-- | board/nvidia/common/board.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/board/nvidia/common/Makefile b/board/nvidia/common/Makefile index 1fbf94bdb6..45c40179a2 100644 --- a/board/nvidia/common/Makefile +++ b/board/nvidia/common/Makefile @@ -28,7 +28,8 @@ LIB = $(obj)lib$(VENDOR).o COBJS-y += board.o COBJS-$(CONFIG_USB_EHCI_TEGRA) += usb.o COBJS-$(CONFIG_SPI_UART_SWITCH) += uart-spi-fix.o -COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o pmu.o +COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o +COBJS-$(CONFIG_TEGRA_PMU) += pmu.o COBJS-$(CONFIG_TEGRA2_KEYBOARD) += generic_kbc.o COBJS-$(CONFIG_TEGRA2_LP0) += crypto/aes_ref.o COBJS-$(CONFIG_TEGRA2_LP0) += crypto/crypto.o diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index b3e5590f9c..7f1254447f 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -73,6 +73,10 @@ DECLARE_GLOBAL_DATA_PTR; #error "tegra: We need CONFIG_TEGRA_I2C to support CONFIG_TEGRA_CLOCK_SCALING" #endif +#if defined(CONFIG_TEGRA_CLOCK_SCALING) && !defined(CONFIG_TEGRA_PMU) +#error "tegra: We need CONFIG_TEGRA_PMU to support CONFIG_TEGRA_CLOCK_SCALING" +#endif + enum { /* UARTs which we can enable */ UARTA = 1 << 0, |