aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-03-05 09:30:54 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-05 19:03:04 -0500
commitaf4872fb39301bbe196d0778f80d22ec51d8884b (patch)
treec2c72d11003bd24141c03ab9faefbd9529a7760e
parent3c77c29c49c6213c55ad8dacc687817b3568c0ce (diff)
ASoC: imx: rename audmux prefix mxc to imx
It renames the legacy name mxc used in audmux function and macro to imx. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/imx/eukrea-tlv320.c44
-rw-r--r--sound/soc/imx/imx-audmux.c30
-rw-r--r--sound/soc/imx/imx-audmux.h58
-rw-r--r--sound/soc/imx/mx27vis-aic32x4.c18
-rw-r--r--sound/soc/imx/phycore-ac97.c40
-rw-r--r--sound/soc/imx/wm1133-ev1.c22
6 files changed, 106 insertions, 106 deletions
diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c
index b375ed4541f6..7d4475cfdb24 100644
--- a/sound/soc/imx/eukrea-tlv320.c
+++ b/sound/soc/imx/eukrea-tlv320.c
@@ -101,35 +101,35 @@ static int __init eukrea_tlv320_init(void)
101 int int_port = 0, ext_port; 101 int int_port = 0, ext_port;
102 102
103 if (machine_is_eukrea_cpuimx27()) { 103 if (machine_is_eukrea_cpuimx27()) {
104 mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, 104 imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
105 MXC_AUDMUX_V1_PCR_SYN | 105 IMX_AUDMUX_V1_PCR_SYN |
106 MXC_AUDMUX_V1_PCR_TFSDIR | 106 IMX_AUDMUX_V1_PCR_TFSDIR |
107 MXC_AUDMUX_V1_PCR_TCLKDIR | 107 IMX_AUDMUX_V1_PCR_TCLKDIR |
108 MXC_AUDMUX_V1_PCR_RFSDIR | 108 IMX_AUDMUX_V1_PCR_RFSDIR |
109 MXC_AUDMUX_V1_PCR_RCLKDIR | 109 IMX_AUDMUX_V1_PCR_RCLKDIR |
110 MXC_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) | 110 IMX_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) |
111 MXC_AUDMUX_V1_PCR_RFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) | 111 IMX_AUDMUX_V1_PCR_RFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) |
112 MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) 112 IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4)
113 ); 113 );
114 mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR3_SSI_PINS_4, 114 imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR3_SSI_PINS_4,
115 MXC_AUDMUX_V1_PCR_SYN | 115 IMX_AUDMUX_V1_PCR_SYN |
116 MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0) 116 IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0)
117 ); 117 );
118 } else if (machine_is_eukrea_cpuimx25sd() || 118 } else if (machine_is_eukrea_cpuimx25sd() ||
119 machine_is_eukrea_cpuimx35sd() || 119 machine_is_eukrea_cpuimx35sd() ||
120 machine_is_eukrea_cpuimx51sd()) { 120 machine_is_eukrea_cpuimx51sd()) {
121 ext_port = machine_is_eukrea_cpuimx25sd() ? 4 : 3; 121 ext_port = machine_is_eukrea_cpuimx25sd() ? 4 : 3;
122 mxc_audmux_v2_configure_port(int_port, 122 imx_audmux_v2_configure_port(int_port,
123 MXC_AUDMUX_V2_PTCR_SYN | 123 IMX_AUDMUX_V2_PTCR_SYN |
124 MXC_AUDMUX_V2_PTCR_TFSDIR | 124 IMX_AUDMUX_V2_PTCR_TFSDIR |
125 MXC_AUDMUX_V2_PTCR_TFSEL(ext_port) | 125 IMX_AUDMUX_V2_PTCR_TFSEL(ext_port) |
126 MXC_AUDMUX_V2_PTCR_TCLKDIR | 126 IMX_AUDMUX_V2_PTCR_TCLKDIR |
127 MXC_AUDMUX_V2_PTCR_TCSEL(ext_port), 127 IMX_AUDMUX_V2_PTCR_TCSEL(ext_port),
128 MXC_AUDMUX_V2_PDCR_RXDSEL(ext_port) 128 IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port)
129 ); 129 );
130 mxc_audmux_v2_configure_port(ext_port, 130 imx_audmux_v2_configure_port(ext_port,
131 MXC_AUDMUX_V2_PTCR_SYN, 131 IMX_AUDMUX_V2_PTCR_SYN,
132 MXC_AUDMUX_V2_PDCR_RXDSEL(int_port) 132 IMX_AUDMUX_V2_PDCR_RXDSEL(int_port)
133 ); 133 );
134 } else { 134 } else {
135 /* return happy. We might run on a totally different machine */ 135 /* return happy. We might run on a totally different machine */
diff --git a/sound/soc/imx/imx-audmux.c b/sound/soc/imx/imx-audmux.c
index 7b162662fe6b..87f8768e1cdc 100644
--- a/sound/soc/imx/imx-audmux.c
+++ b/sound/soc/imx/imx-audmux.c
@@ -32,8 +32,8 @@
32static struct clk *audmux_clk; 32static struct clk *audmux_clk;
33static void __iomem *audmux_base; 33static void __iomem *audmux_base;
34 34
35#define MXC_AUDMUX_V2_PTCR(x) ((x) * 8) 35#define IMX_AUDMUX_V2_PTCR(x) ((x) * 8)
36#define MXC_AUDMUX_V2_PDCR(x) ((x) * 8 + 4) 36#define IMX_AUDMUX_V2_PDCR(x) ((x) * 8 + 4)
37 37
38#ifdef CONFIG_DEBUG_FS 38#ifdef CONFIG_DEBUG_FS
39static struct dentry *audmux_debugfs_root; 39static struct dentry *audmux_debugfs_root;
@@ -80,8 +80,8 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
80 if (audmux_clk) 80 if (audmux_clk)
81 clk_enable(audmux_clk); 81 clk_enable(audmux_clk);
82 82
83 ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port)); 83 ptcr = readl(audmux_base + IMX_AUDMUX_V2_PTCR(port));
84 pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port)); 84 pdcr = readl(audmux_base + IMX_AUDMUX_V2_PDCR(port));
85 85
86 if (audmux_clk) 86 if (audmux_clk)
87 clk_disable(audmux_clk); 87 clk_disable(audmux_clk);
@@ -89,7 +89,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
89 ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n", 89 ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
90 pdcr, ptcr); 90 pdcr, ptcr);
91 91
92 if (ptcr & MXC_AUDMUX_V2_PTCR_TFSDIR) 92 if (ptcr & IMX_AUDMUX_V2_PTCR_TFSDIR)
93 ret += snprintf(buf + ret, PAGE_SIZE - ret, 93 ret += snprintf(buf + ret, PAGE_SIZE - ret,
94 "TxFS output from %s, ", 94 "TxFS output from %s, ",
95 audmux_port_string((ptcr >> 27) & 0x7)); 95 audmux_port_string((ptcr >> 27) & 0x7));
@@ -97,7 +97,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
97 ret += snprintf(buf + ret, PAGE_SIZE - ret, 97 ret += snprintf(buf + ret, PAGE_SIZE - ret,
98 "TxFS input, "); 98 "TxFS input, ");
99 99
100 if (ptcr & MXC_AUDMUX_V2_PTCR_TCLKDIR) 100 if (ptcr & IMX_AUDMUX_V2_PTCR_TCLKDIR)
101 ret += snprintf(buf + ret, PAGE_SIZE - ret, 101 ret += snprintf(buf + ret, PAGE_SIZE - ret,
102 "TxClk output from %s", 102 "TxClk output from %s",
103 audmux_port_string((ptcr >> 22) & 0x7)); 103 audmux_port_string((ptcr >> 22) & 0x7));
@@ -107,11 +107,11 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
107 107
108 ret += snprintf(buf + ret, PAGE_SIZE - ret, "\n"); 108 ret += snprintf(buf + ret, PAGE_SIZE - ret, "\n");
109 109
110 if (ptcr & MXC_AUDMUX_V2_PTCR_SYN) { 110 if (ptcr & IMX_AUDMUX_V2_PTCR_SYN) {
111 ret += snprintf(buf + ret, PAGE_SIZE - ret, 111 ret += snprintf(buf + ret, PAGE_SIZE - ret,
112 "Port is symmetric"); 112 "Port is symmetric");
113 } else { 113 } else {
114 if (ptcr & MXC_AUDMUX_V2_PTCR_RFSDIR) 114 if (ptcr & IMX_AUDMUX_V2_PTCR_RFSDIR)
115 ret += snprintf(buf + ret, PAGE_SIZE - ret, 115 ret += snprintf(buf + ret, PAGE_SIZE - ret,
116 "RxFS output from %s, ", 116 "RxFS output from %s, ",
117 audmux_port_string((ptcr >> 17) & 0x7)); 117 audmux_port_string((ptcr >> 17) & 0x7));
@@ -119,7 +119,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
119 ret += snprintf(buf + ret, PAGE_SIZE - ret, 119 ret += snprintf(buf + ret, PAGE_SIZE - ret,
120 "RxFS input, "); 120 "RxFS input, ");
121 121
122 if (ptcr & MXC_AUDMUX_V2_PTCR_RCLKDIR) 122 if (ptcr & IMX_AUDMUX_V2_PTCR_RCLKDIR)
123 ret += snprintf(buf + ret, PAGE_SIZE - ret, 123 ret += snprintf(buf + ret, PAGE_SIZE - ret,
124 "RxClk output from %s", 124 "RxClk output from %s",
125 audmux_port_string((ptcr >> 12) & 0x7)); 125 audmux_port_string((ptcr >> 12) & 0x7));
@@ -201,7 +201,7 @@ static const uint8_t port_mapping[] = {
201 0x0, 0x4, 0x8, 0x10, 0x14, 0x1c, 201 0x0, 0x4, 0x8, 0x10, 0x14, 0x1c,
202}; 202};
203 203
204int mxc_audmux_v1_configure_port(unsigned int port, unsigned int pcr) 204int imx_audmux_v1_configure_port(unsigned int port, unsigned int pcr)
205{ 205{
206 if (audmux_type != IMX21_AUDMUX) 206 if (audmux_type != IMX21_AUDMUX)
207 return -EINVAL; 207 return -EINVAL;
@@ -216,9 +216,9 @@ int mxc_audmux_v1_configure_port(unsigned int port, unsigned int pcr)
216 216
217 return 0; 217 return 0;
218} 218}
219EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port); 219EXPORT_SYMBOL_GPL(imx_audmux_v1_configure_port);
220 220
221int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, 221int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
222 unsigned int pdcr) 222 unsigned int pdcr)
223{ 223{
224 if (audmux_type != IMX31_AUDMUX) 224 if (audmux_type != IMX31_AUDMUX)
@@ -230,15 +230,15 @@ int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
230 if (audmux_clk) 230 if (audmux_clk)
231 clk_enable(audmux_clk); 231 clk_enable(audmux_clk);
232 232
233 writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port)); 233 writel(ptcr, audmux_base + IMX_AUDMUX_V2_PTCR(port));
234 writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port)); 234 writel(pdcr, audmux_base + IMX_AUDMUX_V2_PDCR(port));
235 235
236 if (audmux_clk) 236 if (audmux_clk)
237 clk_disable(audmux_clk); 237 clk_disable(audmux_clk);
238 238
239 return 0; 239 return 0;
240} 240}
241EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port); 241EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
242 242
243static int __init imx_audmux_probe(struct platform_device *pdev) 243static int __init imx_audmux_probe(struct platform_device *pdev)
244{ 244{
diff --git a/sound/soc/imx/imx-audmux.h b/sound/soc/imx/imx-audmux.h
index 5136d9483f46..04ebbab8d7b9 100644
--- a/sound/soc/imx/imx-audmux.h
+++ b/sound/soc/imx/imx-audmux.h
@@ -24,37 +24,37 @@
24#define MX51_AUDMUX_PORT7 6 24#define MX51_AUDMUX_PORT7 6
25 25
26/* Register definitions for the i.MX21/27 Digital Audio Multiplexer */ 26/* Register definitions for the i.MX21/27 Digital Audio Multiplexer */
27#define MXC_AUDMUX_V1_PCR_INMMASK(x) ((x) & 0xff) 27#define IMX_AUDMUX_V1_PCR_INMMASK(x) ((x) & 0xff)
28#define MXC_AUDMUX_V1_PCR_INMEN (1 << 8) 28#define IMX_AUDMUX_V1_PCR_INMEN (1 << 8)
29#define MXC_AUDMUX_V1_PCR_TXRXEN (1 << 10) 29#define IMX_AUDMUX_V1_PCR_TXRXEN (1 << 10)
30#define MXC_AUDMUX_V1_PCR_SYN (1 << 12) 30#define IMX_AUDMUX_V1_PCR_SYN (1 << 12)
31#define MXC_AUDMUX_V1_PCR_RXDSEL(x) (((x) & 0x7) << 13) 31#define IMX_AUDMUX_V1_PCR_RXDSEL(x) (((x) & 0x7) << 13)
32#define MXC_AUDMUX_V1_PCR_RFCSEL(x) (((x) & 0xf) << 20) 32#define IMX_AUDMUX_V1_PCR_RFCSEL(x) (((x) & 0xf) << 20)
33#define MXC_AUDMUX_V1_PCR_RCLKDIR (1 << 24) 33#define IMX_AUDMUX_V1_PCR_RCLKDIR (1 << 24)
34#define MXC_AUDMUX_V1_PCR_RFSDIR (1 << 25) 34#define IMX_AUDMUX_V1_PCR_RFSDIR (1 << 25)
35#define MXC_AUDMUX_V1_PCR_TFCSEL(x) (((x) & 0xf) << 26) 35#define IMX_AUDMUX_V1_PCR_TFCSEL(x) (((x) & 0xf) << 26)
36#define MXC_AUDMUX_V1_PCR_TCLKDIR (1 << 30) 36#define IMX_AUDMUX_V1_PCR_TCLKDIR (1 << 30)
37#define MXC_AUDMUX_V1_PCR_TFSDIR (1 << 31) 37#define IMX_AUDMUX_V1_PCR_TFSDIR (1 << 31)
38 38
39/* Register definitions for the i.MX25/31/35/51 Digital Audio Multiplexer */ 39/* Register definitions for the i.MX25/31/35/51 Digital Audio Multiplexer */
40#define MXC_AUDMUX_V2_PTCR_TFSDIR (1 << 31) 40#define IMX_AUDMUX_V2_PTCR_TFSDIR (1 << 31)
41#define MXC_AUDMUX_V2_PTCR_TFSEL(x) (((x) & 0xf) << 27) 41#define IMX_AUDMUX_V2_PTCR_TFSEL(x) (((x) & 0xf) << 27)
42#define MXC_AUDMUX_V2_PTCR_TCLKDIR (1 << 26) 42#define IMX_AUDMUX_V2_PTCR_TCLKDIR (1 << 26)
43#define MXC_AUDMUX_V2_PTCR_TCSEL(x) (((x) & 0xf) << 22) 43#define IMX_AUDMUX_V2_PTCR_TCSEL(x) (((x) & 0xf) << 22)
44#define MXC_AUDMUX_V2_PTCR_RFSDIR (1 << 21) 44#define IMX_AUDMUX_V2_PTCR_RFSDIR (1 << 21)
45#define MXC_AUDMUX_V2_PTCR_RFSEL(x) (((x) & 0xf) << 17) 45#define IMX_AUDMUX_V2_PTCR_RFSEL(x) (((x) & 0xf) << 17)
46#define MXC_AUDMUX_V2_PTCR_RCLKDIR (1 << 16) 46#define IMX_AUDMUX_V2_PTCR_RCLKDIR (1 << 16)
47#define MXC_AUDMUX_V2_PTCR_RCSEL(x) (((x) & 0xf) << 12) 47#define IMX_AUDMUX_V2_PTCR_RCSEL(x) (((x) & 0xf) << 12)
48#define MXC_AUDMUX_V2_PTCR_SYN (1 << 11) 48#define IMX_AUDMUX_V2_PTCR_SYN (1 << 11)
49 49
50#define MXC_AUDMUX_V2_PDCR_RXDSEL(x) (((x) & 0x7) << 13) 50#define IMX_AUDMUX_V2_PDCR_RXDSEL(x) (((x) & 0x7) << 13)
51#define MXC_AUDMUX_V2_PDCR_TXRXEN (1 << 12) 51#define IMX_AUDMUX_V2_PDCR_TXRXEN (1 << 12)
52#define MXC_AUDMUX_V2_PDCR_MODE(x) (((x) & 0x3) << 8) 52#define IMX_AUDMUX_V2_PDCR_MODE(x) (((x) & 0x3) << 8)
53#define MXC_AUDMUX_V2_PDCR_INMMASK(x) ((x) & 0xff) 53#define IMX_AUDMUX_V2_PDCR_INMMASK(x) ((x) & 0xff)
54 54
55int mxc_audmux_v1_configure_port(unsigned int port, unsigned int pcr); 55int imx_audmux_v1_configure_port(unsigned int port, unsigned int pcr);
56 56
57int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, 57int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
58 unsigned int pdcr); 58 unsigned int pdcr);
59 59
60#endif /* __IMX_AUDMUX_H */ 60#endif /* __IMX_AUDMUX_H */
diff --git a/sound/soc/imx/mx27vis-aic32x4.c b/sound/soc/imx/mx27vis-aic32x4.c
index dbfad0f62511..976f857151f0 100644
--- a/sound/soc/imx/mx27vis-aic32x4.c
+++ b/sound/soc/imx/mx27vis-aic32x4.c
@@ -207,16 +207,16 @@ static int __init mx27vis_aic32x4_init(void)
207 } 207 }
208 208
209 /* Connect SSI0 as clock slave to SSI1 external pins */ 209 /* Connect SSI0 as clock slave to SSI1 external pins */
210 mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, 210 imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
211 MXC_AUDMUX_V1_PCR_SYN | 211 IMX_AUDMUX_V1_PCR_SYN |
212 MXC_AUDMUX_V1_PCR_TFSDIR | 212 IMX_AUDMUX_V1_PCR_TFSDIR |
213 MXC_AUDMUX_V1_PCR_TCLKDIR | 213 IMX_AUDMUX_V1_PCR_TCLKDIR |
214 MXC_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_PPCR1_SSI_PINS_1) | 214 IMX_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_PPCR1_SSI_PINS_1) |
215 MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_PPCR1_SSI_PINS_1) 215 IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_PPCR1_SSI_PINS_1)
216 ); 216 );
217 mxc_audmux_v1_configure_port(MX27_AUDMUX_PPCR1_SSI_PINS_1, 217 imx_audmux_v1_configure_port(MX27_AUDMUX_PPCR1_SSI_PINS_1,
218 MXC_AUDMUX_V1_PCR_SYN | 218 IMX_AUDMUX_V1_PCR_SYN |
219 MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0) 219 IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0)
220 ); 220 );
221 221
222 ret = mxc_gpio_setup_multiple_pins(mx27vis_amp_pins, 222 ret = mxc_gpio_setup_multiple_pins(mx27vis_amp_pins,
diff --git a/sound/soc/imx/phycore-ac97.c b/sound/soc/imx/phycore-ac97.c
index 7dab077f9c30..f8da6dd115ed 100644
--- a/sound/soc/imx/phycore-ac97.c
+++ b/sound/soc/imx/phycore-ac97.c
@@ -53,27 +53,27 @@ static int __init imx_phycore_init(void)
53 int ret; 53 int ret;
54 54
55 if (machine_is_pca100()) { 55 if (machine_is_pca100()) {
56 mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, 56 imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
57 MXC_AUDMUX_V1_PCR_SYN | /* 4wire mode */ 57 IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
58 MXC_AUDMUX_V1_PCR_TFCSEL(3) | 58 IMX_AUDMUX_V1_PCR_TFCSEL(3) |
59 MXC_AUDMUX_V1_PCR_TCLKDIR | /* clock is output */ 59 IMX_AUDMUX_V1_PCR_TCLKDIR | /* clock is output */
60 MXC_AUDMUX_V1_PCR_RXDSEL(3)); 60 IMX_AUDMUX_V1_PCR_RXDSEL(3));
61 mxc_audmux_v1_configure_port(3, 61 imx_audmux_v1_configure_port(3,
62 MXC_AUDMUX_V1_PCR_SYN | /* 4wire mode */ 62 IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
63 MXC_AUDMUX_V1_PCR_TFCSEL(0) | 63 IMX_AUDMUX_V1_PCR_TFCSEL(0) |
64 MXC_AUDMUX_V1_PCR_TFSDIR | 64 IMX_AUDMUX_V1_PCR_TFSDIR |
65 MXC_AUDMUX_V1_PCR_RXDSEL(0)); 65 IMX_AUDMUX_V1_PCR_RXDSEL(0));
66 } else if (machine_is_pcm043()) { 66 } else if (machine_is_pcm043()) {
67 mxc_audmux_v2_configure_port(3, 67 imx_audmux_v2_configure_port(3,
68 MXC_AUDMUX_V2_PTCR_SYN | /* 4wire mode */ 68 IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
69 MXC_AUDMUX_V2_PTCR_TFSEL(0) | 69 IMX_AUDMUX_V2_PTCR_TFSEL(0) |
70 MXC_AUDMUX_V2_PTCR_TFSDIR, 70 IMX_AUDMUX_V2_PTCR_TFSDIR,
71 MXC_AUDMUX_V2_PDCR_RXDSEL(0)); 71 IMX_AUDMUX_V2_PDCR_RXDSEL(0));
72 mxc_audmux_v2_configure_port(0, 72 imx_audmux_v2_configure_port(0,
73 MXC_AUDMUX_V2_PTCR_SYN | /* 4wire mode */ 73 IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
74 MXC_AUDMUX_V2_PTCR_TCSEL(3) | 74 IMX_AUDMUX_V2_PTCR_TCSEL(3) |
75 MXC_AUDMUX_V2_PTCR_TCLKDIR, /* clock is output */ 75 IMX_AUDMUX_V2_PTCR_TCLKDIR, /* clock is output */
76 MXC_AUDMUX_V2_PDCR_RXDSEL(3)); 76 IMX_AUDMUX_V2_PDCR_RXDSEL(3));
77 } else { 77 } else {
78 /* return happy. We might run on a totally different machine */ 78 /* return happy. We might run on a totally different machine */
79 return 0; 79 return 0;
diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c
index 15056d6a1643..fe54a69073e5 100644
--- a/sound/soc/imx/wm1133-ev1.c
+++ b/sound/soc/imx/wm1133-ev1.c
@@ -267,17 +267,17 @@ static int __init wm1133_ev1_audio_init(void)
267 unsigned int ptcr, pdcr; 267 unsigned int ptcr, pdcr;
268 268
269 /* SSI0 mastered by port 5 */ 269 /* SSI0 mastered by port 5 */
270 ptcr = MXC_AUDMUX_V2_PTCR_SYN | 270 ptcr = IMX_AUDMUX_V2_PTCR_SYN |
271 MXC_AUDMUX_V2_PTCR_TFSDIR | 271 IMX_AUDMUX_V2_PTCR_TFSDIR |
272 MXC_AUDMUX_V2_PTCR_TFSEL(MX31_AUDMUX_PORT5_SSI_PINS_5) | 272 IMX_AUDMUX_V2_PTCR_TFSEL(MX31_AUDMUX_PORT5_SSI_PINS_5) |
273 MXC_AUDMUX_V2_PTCR_TCLKDIR | 273 IMX_AUDMUX_V2_PTCR_TCLKDIR |
274 MXC_AUDMUX_V2_PTCR_TCSEL(MX31_AUDMUX_PORT5_SSI_PINS_5); 274 IMX_AUDMUX_V2_PTCR_TCSEL(MX31_AUDMUX_PORT5_SSI_PINS_5);
275 pdcr = MXC_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT5_SSI_PINS_5); 275 pdcr = IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT5_SSI_PINS_5);
276 mxc_audmux_v2_configure_port(MX31_AUDMUX_PORT1_SSI0, ptcr, pdcr); 276 imx_audmux_v2_configure_port(MX31_AUDMUX_PORT1_SSI0, ptcr, pdcr);
277 277
278 ptcr = MXC_AUDMUX_V2_PTCR_SYN; 278 ptcr = IMX_AUDMUX_V2_PTCR_SYN;
279 pdcr = MXC_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0); 279 pdcr = IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0);
280 mxc_audmux_v2_configure_port(MX31_AUDMUX_PORT5_SSI_PINS_5, ptcr, pdcr); 280 imx_audmux_v2_configure_port(MX31_AUDMUX_PORT5_SSI_PINS_5, ptcr, pdcr);
281 281
282 wm1133_ev1_snd_device = platform_device_alloc("soc-audio", -1); 282 wm1133_ev1_snd_device = platform_device_alloc("soc-audio", -1);
283 if (!wm1133_ev1_snd_device) 283 if (!wm1133_ev1_snd_device)