diff options
| author | Simon Glass <sjg@chromium.org> | 2011-11-29 16:35:54 -0800 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-12-12 10:23:42 -0800 |
| commit | 6f22f8c501202a48d386465d2808afd1bdc6825e (patch) | |
| tree | 36401c29a0f529d11d03d8aef58de10524c7c097 | |
| parent | ceb5dac413f6d1c0b624ee9466244b5a5bd6091a (diff) | |
tegra: Remove CONFIG_SYS_PLLP_BASE_IS_408MHZ
This setting is now in the fdt, so remove the CONFIG item.
BUG=chromium-os:23496
TEST=build and boot on Seaboard, T33, Kaen
Change-Id: I336a6cc2140c725fdda85330efe617f82f205a90
Reviewed-on: https://gerrit.chromium.org/gerrit/12250
Commit-Ready: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/ap20.c | 23 | ||||
| -rw-r--r-- | common/fdt_decode.c | 4 | ||||
| -rw-r--r-- | include/configs/waluigi.h | 1 |
3 files changed, 11 insertions, 17 deletions
diff --git a/arch/arm/cpu/armv7/tegra-common/ap20.c b/arch/arm/cpu/armv7/tegra-common/ap20.c index 5d1f6045f8..774567374a 100644 --- a/arch/arm/cpu/armv7/tegra-common/ap20.c +++ b/arch/arm/cpu/armv7/tegra-common/ap20.c @@ -152,7 +152,6 @@ int ap20_cpu_is_cortexa9(void) return id == (PG_UP_TAG_0_PID_CPU & 0xff); } -#if defined(CONFIG_SYS_PLLP_BASE_IS_408MHZ) static void adjust_pllp_out_freqs(void) { struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE; @@ -170,7 +169,6 @@ static void adjust_pllp_out_freqs(void) | (IN_408_OUT_102_DIVISOR << PLLP_OUT3_RATIO) | PLLP_OUT3_OVR; writel(reg, &pll->pll_out_b); } -#endif static int pllx_set_rate(struct clk_pll *pll , u32 divn, u32 divm, u32 divp, u32 cpcon) @@ -223,9 +221,10 @@ void ap20_init_pllx(int slow) /* set pllx */ sel = &tegra_pll_x_table[chip_type][osc]; pllx_set_rate(pll, sel->n, sel->m, sel->p, sel->cpcon); -#if defined(CONFIG_SYS_PLLP_BASE_IS_408MHZ) - adjust_pllp_out_freqs(); -#endif + + /* once we are out of slow mode, set up the T30 PLLs also */ + if (!slow && chip_type == TEGRA_SOC_T30_408MHZ) + adjust_pllp_out_freqs(); } static void enable_cpu_clock(int enable) @@ -457,16 +456,14 @@ static void clock_enable_coresight(int enable) * 1.5, giving an effective frequency of 144MHz. * Set PLLP_OUT0 [bits31:30 = 00], and use a 7.1 divisor * (bits 7:0), so 00000001b == 1.5 (n+1 + .5) - */ -#if defined(CONFIG_SYS_PLLP_BASE_IS_408MHZ) - /* + * * Clock divider request for 204MHz would setup CSITE clock as * 144MHz for PLLP base 216MHz and 204MHz for PLLP base 408MHz - */ - src = CLK_DIVIDER(NVBL_PLLP_KHZ, 204000); -#else - src = CLK_DIVIDER(NVBL_PLLP_KHZ, 144000); -#endif + */ + if (tegra_get_chip_type() == TEGRA_SOC_T30_408MHZ) + src = CLK_DIVIDER(NVBL_PLLP_KHZ, 204000); + else + src = CLK_DIVIDER(NVBL_PLLP_KHZ, 144000); clock_ll_set_source_divisor(PERIPH_ID_CSI, 0, src); /* Unlock the CPU CoreSight interfaces */ diff --git a/common/fdt_decode.c b/common/fdt_decode.c index b983710bcd..4f1eb59b2c 100644 --- a/common/fdt_decode.c +++ b/common/fdt_decode.c @@ -306,9 +306,7 @@ int fdt_decode_uart_console(const void *blob, struct fdt_uart *uart, uart->silent = fdt_decode_get_config_int(blob, "silent_console", 0); uart->io_mapped = get_int(blob, node, "io-mapped", 0); uart->compat = fdt_decode_lookup(blob, node); -#if defined(CONFIG_TEGRA3) && !defined(CONFIG_SYS_PLLP_BASE_IS_408MHZ) - uart->clock_freq = 216000000; -#endif + /* Calculate divisor if required */ if ((uart->divisor == -1) && (uart->clock_freq != -1)) fdt_decode_uart_calc_divisor(uart); diff --git a/include/configs/waluigi.h b/include/configs/waluigi.h index 72956b24b5..65dfdbd3ab 100644 --- a/include/configs/waluigi.h +++ b/include/configs/waluigi.h @@ -33,7 +33,6 @@ #define CONFIG_TEGRA3_WALUIGI #define CONFIG_SYS_SKIP_ARM_RELOCATION -#define CONFIG_SYS_PLLP_BASE_IS_408MHZ #define CONFIG_EXTRA_BOOTARGS \ "panel=lvds " \ |