diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-04-06 12:30:52 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-06 12:36:15 -0400 |
commit | 896637ac1be95a239b68dbe61c12a8a9bc00a9a3 (patch) | |
tree | bd6bfa8f1ecb71d1307634354eb6e674576abd93 /sound/soc/tegra/tegra20_das.h | |
parent | ef280d3907cea21b6093802398bbe4193e221a64 (diff) |
ASoC: tegra: complete Tegra->Tegra20 renaming
Rename Tegra20-specific Kconfig variables, module filenames, all internal
symbol names, clocks, and platform devices, to reflect the fact the DAS
and I2S drivers are for a specific HW version.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra/tegra20_das.h')
-rw-r--r-- | sound/soc/tegra/tegra20_das.h | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/sound/soc/tegra/tegra20_das.h b/sound/soc/tegra/tegra20_das.h index 896bf031a801..ade4fe080c45 100644 --- a/sound/soc/tegra/tegra20_das.h +++ b/sound/soc/tegra/tegra20_das.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * tegra20_das.h - Definitions for Tegra20 DAS driver | 2 | * tegra20_das.h - Definitions for Tegra20 DAS driver |
3 | * | 3 | * |
4 | * Author: Stephen Warren <swarren@nvidia.com> | 4 | * Author: Stephen Warren <swarren@nvidia.com> |
5 | * Copyright (C) 2010 - NVIDIA, Inc. | 5 | * Copyright (C) 2010,2012 - NVIDIA, Inc. |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
8 | * modify it under the terms of the GNU General Public License | 8 | * modify it under the terms of the GNU General Public License |
@@ -20,70 +20,70 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __TEGRA_DAS_H__ | 23 | #ifndef __TEGRA20_DAS_H__ |
24 | #define __TEGRA_DAS_H__ | 24 | #define __TEGRA20_DAS_H__ |
25 | 25 | ||
26 | /* Register TEGRA_DAS_DAP_CTRL_SEL */ | 26 | /* Register TEGRA20_DAS_DAP_CTRL_SEL */ |
27 | #define TEGRA_DAS_DAP_CTRL_SEL 0x00 | 27 | #define TEGRA20_DAS_DAP_CTRL_SEL 0x00 |
28 | #define TEGRA_DAS_DAP_CTRL_SEL_COUNT 5 | 28 | #define TEGRA20_DAS_DAP_CTRL_SEL_COUNT 5 |
29 | #define TEGRA_DAS_DAP_CTRL_SEL_STRIDE 4 | 29 | #define TEGRA20_DAS_DAP_CTRL_SEL_STRIDE 4 |
30 | #define TEGRA_DAS_DAP_CTRL_SEL_DAP_MS_SEL_P 31 | 30 | #define TEGRA20_DAS_DAP_CTRL_SEL_DAP_MS_SEL_P 31 |
31 | #define TEGRA_DAS_DAP_CTRL_SEL_DAP_MS_SEL_S 1 | 31 | #define TEGRA20_DAS_DAP_CTRL_SEL_DAP_MS_SEL_S 1 |
32 | #define TEGRA_DAS_DAP_CTRL_SEL_DAP_SDATA1_TX_RX_P 30 | 32 | #define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA1_TX_RX_P 30 |
33 | #define TEGRA_DAS_DAP_CTRL_SEL_DAP_SDATA1_TX_RX_S 1 | 33 | #define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA1_TX_RX_S 1 |
34 | #define TEGRA_DAS_DAP_CTRL_SEL_DAP_SDATA2_TX_RX_P 29 | 34 | #define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA2_TX_RX_P 29 |
35 | #define TEGRA_DAS_DAP_CTRL_SEL_DAP_SDATA2_TX_RX_S 1 | 35 | #define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA2_TX_RX_S 1 |
36 | #define TEGRA_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL_P 0 | 36 | #define TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL_P 0 |
37 | #define TEGRA_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL_S 5 | 37 | #define TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL_S 5 |
38 | 38 | ||
39 | /* Values for field TEGRA_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL */ | 39 | /* Values for field TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL */ |
40 | #define TEGRA_DAS_DAP_SEL_DAC1 0 | 40 | #define TEGRA20_DAS_DAP_SEL_DAC1 0 |
41 | #define TEGRA_DAS_DAP_SEL_DAC2 1 | 41 | #define TEGRA20_DAS_DAP_SEL_DAC2 1 |
42 | #define TEGRA_DAS_DAP_SEL_DAC3 2 | 42 | #define TEGRA20_DAS_DAP_SEL_DAC3 2 |
43 | #define TEGRA_DAS_DAP_SEL_DAP1 16 | 43 | #define TEGRA20_DAS_DAP_SEL_DAP1 16 |
44 | #define TEGRA_DAS_DAP_SEL_DAP2 17 | 44 | #define TEGRA20_DAS_DAP_SEL_DAP2 17 |
45 | #define TEGRA_DAS_DAP_SEL_DAP3 18 | 45 | #define TEGRA20_DAS_DAP_SEL_DAP3 18 |
46 | #define TEGRA_DAS_DAP_SEL_DAP4 19 | 46 | #define TEGRA20_DAS_DAP_SEL_DAP4 19 |
47 | #define TEGRA_DAS_DAP_SEL_DAP5 20 | 47 | #define TEGRA20_DAS_DAP_SEL_DAP5 20 |
48 | 48 | ||
49 | /* Register TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL */ | 49 | /* Register TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL */ |
50 | #define TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL 0x40 | 50 | #define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL 0x40 |
51 | #define TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_COUNT 3 | 51 | #define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_COUNT 3 |
52 | #define TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_STRIDE 4 | 52 | #define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_STRIDE 4 |
53 | #define TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL_P 28 | 53 | #define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL_P 28 |
54 | #define TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL_S 4 | 54 | #define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL_S 4 |
55 | #define TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL_P 24 | 55 | #define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL_P 24 |
56 | #define TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL_S 4 | 56 | #define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL_S 4 |
57 | #define TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL_P 0 | 57 | #define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL_P 0 |
58 | #define TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL_S 4 | 58 | #define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL_S 4 |
59 | 59 | ||
60 | /* | 60 | /* |
61 | * Values for: | 61 | * Values for: |
62 | * TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL | 62 | * TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL |
63 | * TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL | 63 | * TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL |
64 | * TEGRA_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL | 64 | * TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL |
65 | */ | 65 | */ |
66 | #define TEGRA_DAS_DAC_SEL_DAP1 0 | 66 | #define TEGRA20_DAS_DAC_SEL_DAP1 0 |
67 | #define TEGRA_DAS_DAC_SEL_DAP2 1 | 67 | #define TEGRA20_DAS_DAC_SEL_DAP2 1 |
68 | #define TEGRA_DAS_DAC_SEL_DAP3 2 | 68 | #define TEGRA20_DAS_DAC_SEL_DAP3 2 |
69 | #define TEGRA_DAS_DAC_SEL_DAP4 3 | 69 | #define TEGRA20_DAS_DAC_SEL_DAP4 3 |
70 | #define TEGRA_DAS_DAC_SEL_DAP5 4 | 70 | #define TEGRA20_DAS_DAC_SEL_DAP5 4 |
71 | 71 | ||
72 | /* | 72 | /* |
73 | * Names/IDs of the DACs/DAPs. | 73 | * Names/IDs of the DACs/DAPs. |
74 | */ | 74 | */ |
75 | 75 | ||
76 | #define TEGRA_DAS_DAP_ID_1 0 | 76 | #define TEGRA20_DAS_DAP_ID_1 0 |
77 | #define TEGRA_DAS_DAP_ID_2 1 | 77 | #define TEGRA20_DAS_DAP_ID_2 1 |
78 | #define TEGRA_DAS_DAP_ID_3 2 | 78 | #define TEGRA20_DAS_DAP_ID_3 2 |
79 | #define TEGRA_DAS_DAP_ID_4 3 | 79 | #define TEGRA20_DAS_DAP_ID_4 3 |
80 | #define TEGRA_DAS_DAP_ID_5 4 | 80 | #define TEGRA20_DAS_DAP_ID_5 4 |
81 | 81 | ||
82 | #define TEGRA_DAS_DAC_ID_1 0 | 82 | #define TEGRA20_DAS_DAC_ID_1 0 |
83 | #define TEGRA_DAS_DAC_ID_2 1 | 83 | #define TEGRA20_DAS_DAC_ID_2 1 |
84 | #define TEGRA_DAS_DAC_ID_3 2 | 84 | #define TEGRA20_DAS_DAC_ID_3 2 |
85 | 85 | ||
86 | struct tegra_das { | 86 | struct tegra20_das { |
87 | struct device *dev; | 87 | struct device *dev; |
88 | void __iomem *regs; | 88 | void __iomem *regs; |
89 | struct dentry *debug; | 89 | struct dentry *debug; |
@@ -107,29 +107,29 @@ struct tegra_das { | |||
107 | 107 | ||
108 | /* | 108 | /* |
109 | * Connect a DAP to to a DAC | 109 | * Connect a DAP to to a DAC |
110 | * dap_id: DAP to connect: TEGRA_DAS_DAP_ID_* | 110 | * dap_id: DAP to connect: TEGRA20_DAS_DAP_ID_* |
111 | * dac_sel: DAC to connect to: TEGRA_DAS_DAP_SEL_DAC* | 111 | * dac_sel: DAC to connect to: TEGRA20_DAS_DAP_SEL_DAC* |
112 | */ | 112 | */ |
113 | extern int tegra_das_connect_dap_to_dac(int dap_id, int dac_sel); | 113 | extern int tegra20_das_connect_dap_to_dac(int dap_id, int dac_sel); |
114 | 114 | ||
115 | /* | 115 | /* |
116 | * Connect a DAP to to another DAP | 116 | * Connect a DAP to to another DAP |
117 | * dap_id: DAP to connect: TEGRA_DAS_DAP_ID_* | 117 | * dap_id: DAP to connect: TEGRA20_DAS_DAP_ID_* |
118 | * other_dap_sel: DAP to connect to: TEGRA_DAS_DAP_SEL_DAP* | 118 | * other_dap_sel: DAP to connect to: TEGRA20_DAS_DAP_SEL_DAP* |
119 | * master: Is this DAP the master (1) or slave (0) | 119 | * master: Is this DAP the master (1) or slave (0) |
120 | * sdata1rx: Is this DAP's SDATA1 pin RX (1) or TX (0) | 120 | * sdata1rx: Is this DAP's SDATA1 pin RX (1) or TX (0) |
121 | * sdata2rx: Is this DAP's SDATA2 pin RX (1) or TX (0) | 121 | * sdata2rx: Is this DAP's SDATA2 pin RX (1) or TX (0) |
122 | */ | 122 | */ |
123 | extern int tegra_das_connect_dap_to_dap(int dap_id, int other_dap_sel, | 123 | extern int tegra20_das_connect_dap_to_dap(int dap_id, int other_dap_sel, |
124 | int master, int sdata1rx, | 124 | int master, int sdata1rx, |
125 | int sdata2rx); | 125 | int sdata2rx); |
126 | 126 | ||
127 | /* | 127 | /* |
128 | * Connect a DAC's input to a DAP | 128 | * Connect a DAC's input to a DAP |
129 | * (DAC outputs are selected by the DAP) | 129 | * (DAC outputs are selected by the DAP) |
130 | * dac_id: DAC ID to connect: TEGRA_DAS_DAC_ID_* | 130 | * dac_id: DAC ID to connect: TEGRA20_DAS_DAC_ID_* |
131 | * dap_sel: DAP to receive input from: TEGRA_DAS_DAC_SEL_DAP* | 131 | * dap_sel: DAP to receive input from: TEGRA20_DAS_DAC_SEL_DAP* |
132 | */ | 132 | */ |
133 | extern int tegra_das_connect_dac_to_dap(int dac_id, int dap_sel); | 133 | extern int tegra20_das_connect_dac_to_dap(int dac_id, int dap_sel); |
134 | 134 | ||
135 | #endif | 135 | #endif |