Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a041a52c authored by Benoit Cousson's avatar Benoit Cousson
Browse files

OMAP4: mux: Add CBL package data for OMAP4430 ES1 



Add data for OMAP4430 generated from HW pinout & register database.
The data set is split in two partitions for both core and wkup.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
parent 112485e9

arch/arm/mach-omap2/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ config OMAP_PACKAGE_CUS 
config OMAP_PACKAGE_CBP

       bool



config OMAP_PACKAGE_CBL

       bool



comment "OMAP Board Type"

	depends on ARCH_OMAP2PLUS

arch/arm/mach-omap2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ AFLAGS_sram34xx.o :=-Wa,-march=armv7-a 
obj-$(CONFIG_ARCH_OMAP2420)		+= mux2420.o

obj-$(CONFIG_ARCH_OMAP2430)		+= mux2430.o

obj-$(CONFIG_ARCH_OMAP3)		+= mux34xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= mux44xx.o



# SMS/SDRC

obj-$(CONFIG_ARCH_OMAP2)		+= sdrc2xxx.o

arch/arm/mach-omap2/mux.h

+12 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "mux2420.h"

#include "mux2430.h"

#include "mux34xx.h"

#include "mux44xx.h"



#define OMAP_MUX_TERMINATOR	0xffff
@@ -37,6 +38,9 @@ 
#define OMAP_OFF_PULL_UP		(1 << 13)

#define OMAP_WAKEUP_EN			(1 << 14)



/* 44xx specific mux bit defines */

#define OMAP_WAKEUP_EVENT		(1 << 15)



/* Active pin states */

#define OMAP_PIN_OUTPUT			0

#define OMAP_PIN_INPUT			OMAP_INPUT_EN
@@ -58,6 +62,7 @@ 


/* Flags for omapX_mux_init */

#define OMAP_PACKAGE_MASK		0xffff

#define OMAP_PACKAGE_CBL		7		/* 547-pin 0.40 0.40 */

#define OMAP_PACKAGE_CBP		6		/* 515-pin 0.40 0.50 */

#define OMAP_PACKAGE_CUS		5		/* 423-pin 0.65 */

#define OMAP_PACKAGE_CBB		4		/* 515-pin 0.40 0.50 */
@@ -239,6 +244,13 @@ int omap2430_mux_init(struct omap_board_mux *board_mux, int flags); 
 */

int omap3_mux_init(struct omap_board_mux *board_mux, int flags);



/**

 * omap4_mux_init() - initialize mux system with board specific set

 * @board_mux:		Board specific mux table

 * @flags:		OMAP package type used for the board

 */

int omap4_mux_init(struct omap_board_mux *board_mux, int flags);



/**

 * omap_mux_init - private mux init function, do not call

 */