diff options
| author | Sumit Bhattacharya <sumitb@nvidia.com> | 2011-09-28 17:59:22 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:16 -0800 |
| commit | 424330657d9a2d998f5e7c200468122586e349e0 (patch) | |
| tree | 677701b98023a977ad9bac3e59cd54e358fd5ca6 /arch | |
| parent | f9a5b245b86304c60338543e9aefa7d294e699e3 (diff) | |
arch: arm: Enable SPDIF driver for Tegra30
Bug 872652
Change-Id: Ic170dc2fc86f74d9e67d3b73a6f83368597dafcb
Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-on: http://git-master/r/54975
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R96e76083f2cf154be6c450aff9005a0057bf5cb4
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra3_clocks.c | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index d27bde7710f0..137b6257c2fa 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -191,6 +191,7 @@ static __initdata struct tegra_clk_init_table cardhu_clk_init_table[] = { { "pwm", "pll_p", 3187500, false}, { "blink", "clk_32k", 32768, true}, { "i2s1", "pll_a_out0", 0, false}, + { "spdif_out", "pll_a_out0", 0, false}, { "vi_sensor", "pll_p", 150000000, false}, { NULL, NULL, 0, 0}, }; @@ -488,6 +489,8 @@ static struct platform_device *cardhu_devices[] __initdata = { #endif &tegra_ahub_device, &tegra_i2s_device1, + &tegra_spdif_device, + &spdif_dit_device, &tegra_pcm_device, &cardhu_audio_device, #if defined(CONFIG_CRYPTO_DEV_TEGRA_AES) diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index f01fdc9cf573..eb7f7ebe88f5 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -186,6 +186,7 @@ static __initdata struct tegra_clk_init_table enterprise_clk_init_table[] = { { "pll_a", NULL, 564480000, false}, { "pll_a_out0", NULL, 11289600, false}, { "i2s0", "pll_a_out0", 0, false}, + { "spdif_out", "pll_a_out0", 0, false}, { NULL, NULL, 0, 0}, }; @@ -488,6 +489,8 @@ static struct platform_device *enterprise_devices[] __initdata = { &tegra_camera, &tegra_ahub_device, &tegra_i2s_device0, + &tegra_spdif_device, + &spdif_dit_device, &tegra_pcm_device, &enterprise_audio_device, &tegra_spi_device4, diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index cbbb00709d0c..2776e25754cc 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -1016,7 +1016,7 @@ static struct resource spdif_resource[] = { }; struct platform_device tegra_spdif_device = { - .name = "spdif_out", + .name = "tegra30-spdif", .id = -1, .resource = spdif_resource, .num_resources = ARRAY_SIZE(spdif_resource), diff --git a/arch/arm/mach-tegra/tegra3_clocks.c b/arch/arm/mach-tegra/tegra3_clocks.c index 6e644958af7a..3bc8be3d80aa 100644 --- a/arch/arm/mach-tegra/tegra3_clocks.c +++ b/arch/arm/mach-tegra/tegra3_clocks.c @@ -3879,8 +3879,8 @@ struct clk tegra_list_clks[] = { PERIPH_CLK("i2s2", "tegra30-i2s.2", NULL, 18, 0x104, 26000000, mux_pllaout0_audio2_2x_pllp_clkm, MUX | DIV_U71 | PERIPH_ON_APB), PERIPH_CLK("i2s3", "tegra30-i2s.3", NULL, 101, 0x3bc, 26000000, mux_pllaout0_audio3_2x_pllp_clkm, MUX | DIV_U71 | PERIPH_ON_APB), PERIPH_CLK("i2s4", "tegra30-i2s.4", NULL, 102, 0x3c0, 26000000, mux_pllaout0_audio4_2x_pllp_clkm, MUX | DIV_U71 | PERIPH_ON_APB), - PERIPH_CLK("spdif_out", "spdif_out", NULL, 10, 0x108, 100000000, mux_pllaout0_audio_2x_pllp_clkm, MUX | DIV_U71 | PERIPH_ON_APB), - PERIPH_CLK("spdif_in", "spdif_in", NULL, 10, 0x10c, 100000000, mux_pllp_pllc_pllm, MUX | DIV_U71 | PERIPH_ON_APB), + PERIPH_CLK("spdif_out", "tegra30-spdif", "spdif_out", 10, 0x108, 100000000, mux_pllaout0_audio_2x_pllp_clkm, MUX | DIV_U71 | PERIPH_ON_APB), + PERIPH_CLK("spdif_in", "tegra30-spdif", "spdif_in", 10, 0x10c, 100000000, mux_pllp_pllc_pllm, MUX | DIV_U71 | PERIPH_ON_APB), PERIPH_CLK("pwm", "pwm", NULL, 17, 0x110, 432000000, mux_pllp_pllc_clk32_clkm, MUX | MUX_PWM | DIV_U71 | PERIPH_ON_APB), PERIPH_CLK("d_audio", "tegra30-ahub", "d_audio", 106, 0x3d0, 48000000, mux_plla_pllc_pllp_clkm, MUX | DIV_U71), PERIPH_CLK("dam0", "dam.0", NULL, 108, 0x3d8, 48000000, mux_plla_pllc_pllp_clkm, MUX | DIV_U71), |