aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/audmux-v2.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/plat-mxc/audmux-v2.c')
-rw-r--r--arch/arm/plat-mxc/audmux-v2.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c
index f9e7cdbd0005..175e3647bb27 100644
--- a/arch/arm/plat-mxc/audmux-v2.c
+++ b/arch/arm/plat-mxc/audmux-v2.c
@@ -137,6 +137,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
137static const struct file_operations audmux_debugfs_fops = { 137static const struct file_operations audmux_debugfs_fops = {
138 .open = audmux_open_file, 138 .open = audmux_open_file,
139 .read = audmux_read_file, 139 .read = audmux_read_file,
140 .llseek = default_llseek,
140}; 141};
141 142
142static void audmux_debugfs_init(void) 143static void audmux_debugfs_init(void)
@@ -186,7 +187,13 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port);
186static int mxc_audmux_v2_init(void) 187static int mxc_audmux_v2_init(void)
187{ 188{
188 int ret; 189 int ret;
189 190#if defined(CONFIG_ARCH_MX5)
191 if (cpu_is_mx51()) {
192 audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR);
193 ret = 0;
194 return ret;
195 }
196#endif
190#if defined(CONFIG_ARCH_MX3) 197#if defined(CONFIG_ARCH_MX3)
191 if (cpu_is_mx31()) 198 if (cpu_is_mx31())
192 audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR); 199 audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);
@@ -202,7 +209,7 @@ static int mxc_audmux_v2_init(void)
202 audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR); 209 audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);
203 } 210 }
204#endif 211#endif
205#if defined(CONFIG_ARCH_MX25) 212#if defined(CONFIG_SOC_IMX25)
206 if (cpu_is_mx25()) { 213 if (cpu_is_mx25()) {
207 audmux_clk = clk_get(NULL, "audmux"); 214 audmux_clk = clk_get(NULL, "audmux");
208 if (IS_ERR(audmux_clk)) { 215 if (IS_ERR(audmux_clk)) {
@@ -213,7 +220,7 @@ static int mxc_audmux_v2_init(void)
213 } 220 }
214 audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR); 221 audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR);
215 } 222 }
216#endif 223#endif /* if defined(CONFIG_SOC_IMX25) */
217 audmux_debugfs_init(); 224 audmux_debugfs_init();
218 225
219 return 0; 226 return 0;