diff options
| author | Vishal Singh <vissingh@nvidia.com> | 2012-04-03 17:45:02 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-04-05 09:09:39 -0700 |
| commit | d529521e727928245cf16df01f440d3857a8f53d (patch) | |
| tree | dcc55cd22c7d5b6e7eb91b73ada131bd2bd6df9a /arch/arm/mach-tegra/p852 | |
| parent | 0cb53fae6561d2ba7d43fd39f5ee8a7ea2b7570a (diff) | |
ARM: tegra: p852: fix kernel boot
CSUS clock can't be driven from any clk other than clk_m. So
updating its parent to clk_m.
Removing pll_m's entry as it's already enabled and running at
666 MHz which is our requirement.
Removing tegra_init_suspend() as it's not needed on p852.
Bug 938667.
Bug 949584.
Change-Id: Id62401de11d213d4e0b87b52fe30e2b37372bbea
Signed-off-by: Vishal Singh <vissingh@nvidia.com>
Reviewed-on: http://git-master/r/94237
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Manoj Chourasia <mchourasia@nvidia.com>
Reviewed-by: Sandeep Trasi <strasi@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/p852')
| -rw-r--r-- | arch/arm/mach-tegra/p852/board-p852-power.c | 11 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/p852/board-p852.c | 5 |
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/mach-tegra/p852/board-p852-power.c b/arch/arm/mach-tegra/p852/board-p852-power.c index 71f6e85d25c5..949537ed5d94 100644 --- a/arch/arm/mach-tegra/p852/board-p852-power.c +++ b/arch/arm/mach-tegra/p852/board-p852-power.c @@ -161,16 +161,6 @@ static struct i2c_board_info __initdata p852_regulators[] = { }, }; -static struct tegra_suspend_platform_data p852_suspend_data = { - .cpu_timer = 2000, - .cpu_off_timer = 0, - .suspend_mode = TEGRA_SUSPEND_LP1, - .core_timer = 0x7e7e, - .core_off_timer = 0, - .corereq_high = false, - .sysclkreq_high = true, -}; - static void __init tps6586x_rtc_preinit(void) { int i; @@ -201,7 +191,6 @@ int __init p852_regulator_init(void) pmc_ctrl = readl(pmc + PMC_CTRL); writel(pmc_ctrl | PMC_CTRL_INTR_LOW, pmc + PMC_CTRL); i2c_register_board_info(3, p852_regulators, 1); - tegra_init_suspend(&p852_suspend_data); tps6586x_rtc_preinit(); diff --git a/arch/arm/mach-tegra/p852/board-p852.c b/arch/arm/mach-tegra/p852/board-p852.c index 8e6551ed8c5c..21b867e15177 100644 --- a/arch/arm/mach-tegra/p852/board-p852.c +++ b/arch/arm/mach-tegra/p852/board-p852.c @@ -45,13 +45,12 @@ static __initdata struct tegra_clk_init_table p852_clk_init_table[] = { {"uartb", "pll_p", 216000000, true}, {"uartc", "pll_p", 216000000, true}, {"uartd", "pll_p", 216000000, true}, - {"pll_m", "clk_m", 600000000, true}, {"pll_m_out1", "pll_m", 240000000, true}, {"pll_p_out4", "pll_p", 240000000, true}, {"host1x", "pll_p", 166000000, true}, {"disp1", "pll_p", 216000000, true}, {"vi", "pll_m", 100000000, true}, - {"csus", "pll_m", 100000000, true}, + {"csus", "clk_m", 12000000, true}, {"emc", "pll_m", 600000000, true}, {"pll_c", "clk_m", 600000000, true}, {"pll_c_out1", "pll_c", 240000000, true}, @@ -667,7 +666,7 @@ void __init p852_common_init(void) platform_add_devices(p852_devices, ARRAY_SIZE(p852_devices)); - //p852_panel_init(); + p852_panel_init(); p852_spi_init(); |