Commit 8e998058 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

arm/imx/audmux-v2: use SoC-prefixed names 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 51918075

arch/arm/plat-mxc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -15,4 +15,3 @@ obj-$(CONFIG_USB_EHCI_MXC) += ehci.o 
obj-$(CONFIG_MXC_ULPI) += ulpi.o

obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o

obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
 
CFLAGS_audmux-v2.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

arch/arm/plat-mxc/audmux-v2.c

+5 −4
Original line number Diff line number Diff line
@@ -190,7 +190,10 @@ static int mxc_audmux_v2_init(void) 
{

	int ret;



	if (cpu_is_mx35()) {

	if (cpu_is_mx31())

		audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);



	else if (cpu_is_mx35()) {

		audmux_clk = clk_get(NULL, "audmux");

		if (IS_ERR(audmux_clk)) {

			ret = PTR_ERR(audmux_clk);
@@ -198,11 +201,9 @@ static int mxc_audmux_v2_init(void) 
					ret);

			return ret;

		}

		audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);

	}



	if (cpu_is_mx31() || cpu_is_mx35())

		audmux_base = IO_ADDRESS(AUDMUX_BASE_ADDR);



	audmux_debugfs_init();



	return 0;