|
@@ -187,18 +187,11 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port);
|
|
static int mxc_audmux_v2_init(void)
|
|
static int mxc_audmux_v2_init(void)
|
|
{
|
|
{
|
|
int ret;
|
|
int ret;
|
|
-#if defined(CONFIG_ARCH_MX5)
|
|
|
|
if (cpu_is_mx51()) {
|
|
if (cpu_is_mx51()) {
|
|
audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR);
|
|
audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR);
|
|
- ret = 0;
|
|
|
|
- return ret;
|
|
|
|
- }
|
|
|
|
-#endif
|
|
|
|
-#if defined(CONFIG_ARCH_MX3)
|
|
|
|
- if (cpu_is_mx31())
|
|
|
|
|
|
+ } else if (cpu_is_mx31()) {
|
|
audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);
|
|
audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);
|
|
-
|
|
|
|
- else if (cpu_is_mx35()) {
|
|
|
|
|
|
+ } else if (cpu_is_mx35()) {
|
|
audmux_clk = clk_get(NULL, "audmux");
|
|
audmux_clk = clk_get(NULL, "audmux");
|
|
if (IS_ERR(audmux_clk)) {
|
|
if (IS_ERR(audmux_clk)) {
|
|
ret = PTR_ERR(audmux_clk);
|
|
ret = PTR_ERR(audmux_clk);
|
|
@@ -207,10 +200,7 @@ static int mxc_audmux_v2_init(void)
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);
|
|
audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);
|
|
- }
|
|
|
|
-#endif
|
|
|
|
-#if defined(CONFIG_SOC_IMX25)
|
|
|
|
- if (cpu_is_mx25()) {
|
|
|
|
|
|
+ } else if (cpu_is_mx25()) {
|
|
audmux_clk = clk_get(NULL, "audmux");
|
|
audmux_clk = clk_get(NULL, "audmux");
|
|
if (IS_ERR(audmux_clk)) {
|
|
if (IS_ERR(audmux_clk)) {
|
|
ret = PTR_ERR(audmux_clk);
|
|
ret = PTR_ERR(audmux_clk);
|
|
@@ -220,7 +210,7 @@ static int mxc_audmux_v2_init(void)
|
|
}
|
|
}
|
|
audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR);
|
|
audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR);
|
|
}
|
|
}
|
|
-#endif /* if defined(CONFIG_SOC_IMX25) */
|
|
|
|
|
|
+
|
|
audmux_debugfs_init();
|
|
audmux_debugfs_init();
|
|
|
|
|
|
return 0;
|
|
return 0;
|