diff options
| author | Simon Glass <sjg@chromium.org> | 2011-11-29 16:40:10 -0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-12-01 17:08:10 -0800 |
| commit | dbd0840a39a15a950869901dd9668951fd35d01a (patch) | |
| tree | 0a1f757ed598e60a911ad35c615caff12b064ead /board | |
| parent | 8d1c7cb54d17a831c8063e27a5187ca30f8d4874 (diff) | |
tegra: Move tegra_get_chip_type() to ap20.c
This function is better off in architecture code than board code.
This is quite an invasive change unfortunately.
BUG=chromium-os:23496
TEST=build and boot on Seaboard, T33, Kaen
Change-Id: I17764b134c25b684666d2c0fae2d255ac80e61b1
Reviewed-on: https://gerrit.chromium.org/gerrit/12244
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Simon Glass <sjg@chromium.org>
Commit-Ready: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/nvidia/common/board.c | 33 | ||||
| -rw-r--r-- | board/nvidia/common/board.h | 1 | ||||
| -rw-r--r-- | board/nvidia/common/emc.c | 4 | ||||
| -rw-r--r-- | board/nvidia/common/pmu.c | 2 |
4 files changed, 3 insertions, 37 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 7d0f9c9236..599d082e4d 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -26,8 +26,6 @@ #include <asm/clocks.h> #include <asm/io.h> -#include <asm/arch-tegra/fuse.h> - /* TBD: bring these over when Tegra3 is ready, then remove these #ifdefs */ #include <asm/arch-tegra/bitfield.h> #include <asm/arch-tegra/clk_rst.h> @@ -393,37 +391,6 @@ int board_mmc_init(bd_t *bd) } #endif -int tegra_get_chip_type(void) -{ - uint tegra_sku_id; - - struct fuse_regs *fuse = (struct fuse_regs *)NV_PA_FUSE_BASE; - - tegra_sku_id = readl(&fuse->sku_info) & 0xff; - - switch (tegra_sku_id) { - case SKU_ID_T20: - return TEGRA_SOC_T20; - case SKU_ID_T25SE: - case SKU_ID_AP25: - case SKU_ID_T25: - case SKU_ID_AP25E: - case SKU_ID_T25E: - return TEGRA_SOC_T25; - case SKU_ID_T30: -#ifdef CONFIG_SYS_PLLP_BASE_IS_408MHZ - return TEGRA_SOC_T30_408MHZ; -#else - return TEGRA_SOC_T30; -#endif - - default: - /* unknown sku id */ - return TEGRA_SOC_UNKNOWN; - } -} - - /* * Possible UART locations: we ignore UARTC at 0x70006200 and UARTE at * 0x70006400, since we don't have code to init them diff --git a/board/nvidia/common/board.h b/board/nvidia/common/board.h index 9ad9a731f5..67048fe369 100644 --- a/board/nvidia/common/board.h +++ b/board/nvidia/common/board.h @@ -30,6 +30,5 @@ void gpio_config_mmc(void); int tegra_mmc_init(const void *blob); void lcd_early_init(const void *blob); int lcd_pinmux_early_init(const void *blob); -int tegra_get_chip_type(void); #endif /* BOARD_H */ diff --git a/board/nvidia/common/emc.c b/board/nvidia/common/emc.c index 53d6711ff4..c74837aa3a 100644 --- a/board/nvidia/common/emc.c +++ b/board/nvidia/common/emc.c @@ -6,13 +6,13 @@ #include <common.h> #include <asm/io.h> +#include <asm/arch-tegra/ap20.h> #include <asm/arch-tegra/bitfield.h> +#include <asm/arch-tegra/clk_rst.h> #include <asm/arch/tegra.h> #include <asm/arch/sys_proto.h> -#include <asm/arch-tegra/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/emc.h> -#include "board.h" #include "pmu.h" static const struct tegra_emc_table *tegra_emc_table; diff --git a/board/nvidia/common/pmu.c b/board/nvidia/common/pmu.c index 266d2c5cc6..0ff3167a8c 100644 --- a/board/nvidia/common/pmu.c +++ b/board/nvidia/common/pmu.c @@ -28,9 +28,9 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/pmu.h> +#include <asm/arch-tegra/ap20.h> #include <asm/arch-tegra/pmc.h> #include <i2c.h> -#include "board.h" #include "pmu.h" /* |