diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
| commit | d25f27034e1e3ca1f86c3e748ce0f565f13bff7f (patch) | |
| tree | 9914ad9ce84d779ee83326d109ebed034523ea5e /arch/arm/mach-tegra/board-cardhu.c | |
| parent | 56db5e2dc402ec8dd7ba922ec5ae1b450ed95d43 (diff) | |
| parent | 82685ba23c803d10f678f25e92ca62aa575d24d9 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
reverted to current driver supporting ACM rather than CSI2
drivers/media/video/videobuf2-dma-nvmap.c
drivers/video/tegra/host/Makefile
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 4b03ddc03b7b..809dfd2b4970 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -1,8 +1,8 @@ /* * arch/arm/mach-tegra/board-cardhu.c * - * Copyright (c) 2011-2012, NVIDIA Corporation. All rights reserved. - * Copyright (c) 2011-2012, NVIDIA Corporation. + * Copyright (c) 2011-2013, NVIDIA Corporation. All rights reserved. + * Copyright (c) 2011-2013, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -218,6 +218,7 @@ static noinline void __init cardhu_setup_bluesleep(void) static __initdata struct tegra_clk_init_table cardhu_clk_init_table[] = { /* name parent rate enabled */ { "pll_m", NULL, 0, false}, + { "pll_a", NULL, 564480000, true}, { "hda", "pll_p", 108000000, false}, { "hda2codec_2x","pll_p", 48000000, false}, { "pwm", "pll_p", 3187500, false}, @@ -1057,6 +1058,11 @@ static int __init cardhu_touch_init(void) struct board_info BoardInfo, DisplayBoardInfo; tegra_get_board_info(&BoardInfo); + + /* Beaver board does not have any touch hardware*/ + if (BoardInfo.board_id == BOARD_PM315) + return 0; + tegra_get_display_board_info(&DisplayBoardInfo); if (DisplayBoardInfo.board_id == BOARD_DISPLAY_PM313) { tegra_clk_init_from_table(spi_clk_init_table); |