arm/imx/iomux-v1: rename source file and reorganize Kconfig stuff (5e2e95f5) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/plat-mxc/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -9,12 +9,14 @@ choice
		config ARCH_MX1
		bool "MX1-based"
		select CPU_ARM920T
		select IMX_HAVE_IOMUX_V1
		help
		This enables support for systems based on the Freescale i.MX1 family

		config ARCH_MX2
		bool "MX2-based"
		select CPU_ARM926T
		select IMX_HAVE_IOMUX_V1
		help
		This enables support for systems based on the Freescale i.MX2 family

		@@ -68,6 +70,9 @@ config MXC_ULPI
		config ARCH_HAS_RNGA
		bool

		config IMX_HAVE_IOMUX_V1
		bool

		config ARCH_MXC_IOMUX_V3
		bool

+4 −3

Original line number	Diff line number	Diff line
		@@ -5,9 +5,10 @@
		# Common support
		obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o

		obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o
		obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o
		CFLAGS_iomux-mx1-mx2.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
		obj-$(CONFIG_ARCH_MX1) += dma-mx1-mx2.o
		obj-$(CONFIG_ARCH_MX2) += dma-mx1-mx2.o
		obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
		CFLAGS_iomux-v1.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
		obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
		obj-$(CONFIG_MXC_PWM) += pwm.o
		obj-$(CONFIG_USB_EHCI_MXC) += ehci.o

+5 −6

Original line number	Diff line number	Diff line
		/*
		* arch/arm/mach-mxc/generic.c
		* arch/arm/plat-mxc/iomux-v1.c
		*
		* author: Sascha Hauer
		* Created: april 20th, 2004
		* Copyright: Synertronixx GmbH
		*
		* Common code for i.MX machines
		* Common code for i.MX1, i.MX21 and i.MX27
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		@@ -154,4 +154,3 @@ void mxc_gpio_release_multiple_pins(const int *pin_list, int count)

		}
		EXPORT_SYMBOL(mxc_gpio_release_multiple_pins);