arm/imx/audmux-v1: use SoC-prefixed names (51918075) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/plat-mxc/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,5 @@ obj-$(CONFIG_MXC_PWM) += pwm.o
		obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
		obj-$(CONFIG_MXC_ULPI) += ulpi.o
		obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
		CFLAGS_audmux-v1.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
		obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
		CFLAGS_audmux-v2.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

+12 −2

Original line number	Diff line number	Diff line
		@@ -50,8 +50,18 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port);

		static int mxc_audmux_v1_init(void)
		{
		if (cpu_is_mx27() \|\| cpu_is_mx21())
		audmux_base = IO_ADDRESS(AUDMUX_BASE_ADDR);
		#ifdef CONFIG_MACH_MX21
		if (cpu_is_mx21())
		audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR);
		else
		#endif
		#ifdef CONFIG_MACH_MX27
		if (cpu_is_mx27())
		audmux_base = MX27_IO_ADDRESS(MX27_AUDMUX_BASE_ADDR);
		else
		#endif
		(void)0;

		return 0;
		}