omap: mux: Add new style pin multiplexing data for 34xx (ddaa912a) · Commits · 戴 / test

Add new style mux data for 34xx. This should also work with 3630 easily by adding the processor subset and ball data. Note that this data is __initdata, and gets optimized out except for the GPIO pins if CONFIG_OMAP_MUX is not set. Also note that this data uses omap3630 naming for the SDMMC registers instead of 34xx naming with just MMC. Cc: Benoit Cousson <b-cousson@ti.com> Signed-off-by:

Paul Walmsley <paul@pwsan.com> Signed-off-by:

Tony Lindgren <tony@atomide.com>

arch/arm/mach-omap2/Kconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,15 @@ config ARCH_OMAP3430
		depends on ARCH_OMAP3 && ARCH_OMAP34XX
		select ARCH_OMAP_OTG

		config OMAP_PACKAGE_CBC
		bool

		config OMAP_PACKAGE_CBB
		bool

		config OMAP_PACKAGE_CUS
		bool

		comment "OMAP Board Type"
		depends on ARCH_OMAP2 \|\| ARCH_OMAP3 \|\| ARCH_OMAP4

arch/arm/mach-omap2/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,9 @@ obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o
		obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o
		obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o

		# Pin multiplexing
		obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o

		# SMS/SDRC
		obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o
		# obj-$(CONFIG_ARCH_OMAP3) += sdrc3xxx.o

arch/arm/mach-omap2/mux.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,8 @@
		* published by the Free Software Foundation.
		*/

		#include "mux34xx.h"

		#define OMAP_MUX_TERMINATOR 0xffff

		/* 34xx mux mode options for each pin. See TRM for options */

Admin message