From 0da4df6d395e7e693c45d92d6d82be9e49ec7bb7 Mon Sep 17 00:00:00 2001 From: Vinod G Date: Wed, 11 May 2011 17:53:29 -0700 Subject: arm: tegra: Set 48Khz default samplerate bug 804696 Setting 48Khz as default samplerate as DAM SRC has issue with 44.1Khz Change-Id: I57119564c170a5d379df8917b82f6ea8992cc138 Reviewed-on: http://git-master/r/31269 Reviewed-by: Varun Colbert Tested-by: Varun Colbert --- arch/arm/mach-tegra/board-cardhu.c | 12 ++++++------ arch/arm/mach-tegra/spdif.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index fa0a0c63daf0..64f108eb4b5f 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -221,9 +221,9 @@ static __initdata struct tegra_clk_init_table cardhu_clk_init_table[] = { { "hda2codec_2x","pll_p", 48000000, false}, { "pwm", "clk_32k", 32768, false}, { "blink", "clk_32k", 32768, true}, - { "pll_a", NULL, 56448000, false}, - { "pll_a_out0", NULL, 11289600, false}, - { "d_audio","pll_a_out0", 11289600, false}, + { "pll_a", NULL, 73728000, false}, + { "pll_a_out0", NULL, 12288000, false}, + { "d_audio","pll_a_out0", 12288000, false}, { NULL, NULL, 0, 0}, }; @@ -321,8 +321,8 @@ static struct tegra_audio_platform_data tegra_i2s_pdata[] = { [0] = { .i2s_master = true, .dma_on = true, /* use dma by default */ - .i2s_master_clk = 44100, - .dev_clk_rate = 11289600, + .i2s_master_clk = 48000, + .dev_clk_rate = 12288000, .mode = AUDIO_FRAME_FORMAT_I2S, .fifo_fmt = AUDIO_FIFO_PACK_16, .bit_size = AUDIO_BIT_SIZE_16, @@ -355,7 +355,7 @@ static struct tegra_audio_platform_data tegra_i2s_pdata[] = { static struct tegra_audio_platform_data tegra_spdif_pdata = { .dma_on = true, /* use dma by default */ - .dev_clk_rate = 5644800, + .dev_clk_rate = 6144000, .mode = SPDIF_BIT_MODE_MODE16BIT, .fifo_fmt = AUDIO_FIFO_PACK_16, }; diff --git a/arch/arm/mach-tegra/spdif.c b/arch/arm/mach-tegra/spdif.c index 845ecfd8c663..9fa736546cbc 100644 --- a/arch/arm/mach-tegra/spdif.c +++ b/arch/arm/mach-tegra/spdif.c @@ -248,7 +248,7 @@ int spdif_initialize(unsigned long base, int mode) spdif_set_bit_mode(base, SPDIF_BIT_MODE_MODE16BIT); spdif_set_fifo_packed(base, 1); - spdif_set_sample_rate(0, mode, 44100); + spdif_set_sample_rate(0, mode, 48000); return 0; } -- cgit v1.2.3