diff options
| author | Nikesh Oswal <noswal@nvidia.com> | 2011-02-08 17:49:27 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-02-08 18:20:55 -0800 |
| commit | 61e45968dc24a96becbcaabfb3cc29997e2a3bba (patch) | |
| tree | b4d2616fac4b227766c0e8d9c1240bc5f215a0f4 /arch | |
| parent | 23340cbd27bc002868c295f5b94eeccb903deb0f (diff) | |
[ARM] tegra: whistler: set pinmux, das and i2s settings
- enable pinmux for DAP 1,2,3,4 and CDEV 1,2
- change das default table to short i2s2 to dap4 for bt-sco
- make i2s settings for codec and bt-sco
Change-Id: Iea0af9317339fe42eca336ac4b29863ffa04c274
Reviewed-on: http://git-master/r/18715
Tested-by: Nikesh Oswal <noswal@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler-pinmux.c | 14 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 17 |
2 files changed, 16 insertions, 15 deletions
diff --git a/arch/arm/mach-tegra/board-whistler-pinmux.c b/arch/arm/mach-tegra/board-whistler-pinmux.c index d2e1de48b70a..2eb9029f9cba 100644 --- a/arch/arm/mach-tegra/board-whistler-pinmux.c +++ b/arch/arm/mach-tegra/board-whistler-pinmux.c @@ -45,14 +45,14 @@ static __initdata struct tegra_pingroup_config whistler_pinmux[] = { {TEGRA_PINGROUP_ATC, TEGRA_MUX_SDIO4, TEGRA_PUPD_PULL_UP, TEGRA_TRI_NORMAL}, {TEGRA_PINGROUP_ATD, TEGRA_MUX_SDIO4, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, {TEGRA_PINGROUP_ATE, TEGRA_MUX_GMI, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, - {TEGRA_PINGROUP_CDEV1, TEGRA_MUX_OSC, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE}, - {TEGRA_PINGROUP_CDEV2, TEGRA_MUX_OSC, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE}, + {TEGRA_PINGROUP_CDEV1, TEGRA_MUX_OSC, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL}, + {TEGRA_PINGROUP_CDEV2, TEGRA_MUX_OSC, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL}, {TEGRA_PINGROUP_CRTP, TEGRA_MUX_CRT, TEGRA_PUPD_NORMAL, TEGRA_TRI_TRISTATE}, - {TEGRA_PINGROUP_CSUS, TEGRA_MUX_VI_SENSOR_CLK, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, - {TEGRA_PINGROUP_DAP1, TEGRA_MUX_DAP1, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE}, - {TEGRA_PINGROUP_DAP2, TEGRA_MUX_DAP2, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE}, - {TEGRA_PINGROUP_DAP3, TEGRA_MUX_DAP3, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE}, - {TEGRA_PINGROUP_DAP4, TEGRA_MUX_DAP4, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE}, + {TEGRA_PINGROUP_CSUS, TEGRA_MUX_VI_SENSOR_CLK, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, + {TEGRA_PINGROUP_DAP1, TEGRA_MUX_DAP1, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, + {TEGRA_PINGROUP_DAP2, TEGRA_MUX_DAP2, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, + {TEGRA_PINGROUP_DAP3, TEGRA_MUX_DAP3, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, + {TEGRA_PINGROUP_DAP4, TEGRA_MUX_DAP4, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, {TEGRA_PINGROUP_DDC, TEGRA_MUX_I2C2, TEGRA_PUPD_PULL_UP, TEGRA_TRI_NORMAL}, {TEGRA_PINGROUP_DTA, TEGRA_MUX_VI, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL}, {TEGRA_PINGROUP_DTB, TEGRA_MUX_VI, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL}, diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 87445a41779e..f6c4c76931b8 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -281,10 +281,12 @@ static struct tegra_das_platform_data tegra_das_pdata = { .tegra_das_con_table = { [0] = { .con_id = tegra_das_port_con_id_hifi, - .num_entries = 2, + .num_entries = 4, .con_line = { [0] = {tegra_das_port_i2s1, tegra_das_port_dap1, true}, [1] = {tegra_das_port_dap1, tegra_das_port_i2s1, false}, + [2] = {tegra_das_port_i2s2, tegra_das_port_dap4, true}, + [3] = {tegra_das_port_dap4, tegra_das_port_i2s2, false}, }, }, } @@ -308,11 +310,10 @@ static struct tegra_audio_platform_data tegra_audio_pdata[] = { /* For I2S1 */ [0] = { .i2s_master = true, - .dsp_master = false, .dma_on = true, /* use dma by default */ .i2s_master_clk = 44100, - .dsp_master_clk = 8000, - .i2s_clk_rate = 240000000, + .dsp_master_clk = 44100, + .i2s_clk_rate = 2822400, .dap_clk = "clk_dev1", .audio_sync_clk = "audio_2x", .mode = I2S_BIT_FORMAT_I2S, @@ -323,12 +324,11 @@ static struct tegra_audio_platform_data tegra_audio_pdata[] = { }, /* For I2S2 */ [1] = { - .i2s_master = false, - .dsp_master = true, + .i2s_master = true, .dma_on = true, /* use dma by default */ - .i2s_master_clk = 44100, + .i2s_master_clk = 8000, .dsp_master_clk = 8000, - .i2s_clk_rate = 240000000, + .i2s_clk_rate = 2000000, .dap_clk = "clk_dev1", .audio_sync_clk = "audio_2x", .mode = I2S_BIT_FORMAT_DSP, @@ -340,6 +340,7 @@ static struct tegra_audio_platform_data tegra_audio_pdata[] = { }; + #define GPIO_SCROLL(_pinaction, _gpio, _desc) \ { \ .pinaction = GPIO_SCROLLWHEEL_PIN_##_pinaction, \ |