sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

arm, davinci: Move pinmux functions from board to arch tree 

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Cc: Syed Mohammed Khasim <sm.khasim@gmail.com>
Cc: Sughosh Ganu <urwithsughosh@gmail.com>
Cc: Nick Thompson <nick.thompson@ge.com>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
Acked-by: Nick Thompson <nick.thompson@ge.com>
This commit is contained in:
Christian Riesch 2011-11-28 23:46:14 +00:00 committed by Albert ARIBAUD
parent ca4b55800e
commit 964930bcfd
9 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/arm926ejs/davinci/Makefile
View File

@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
COBJS-y += cpu.o timer.o psc.o
COBJS-y += cpu.o timer.o psc.o pinmux.o
COBJS-$(CONFIG_DA850_LOWLEVEL) += da850_lowlevel.o
COBJS-$(CONFIG_SOC_DM355) += dm355.o
COBJS-$(CONFIG_SOC_DM365) += dm365.o

0
board/davinci/common/davinci_pinmux.c → arch/arm/cpu/arm926ejs/davinci/pinmux.c
View File

2
arch/arm/include/asm/arch-davinci/hardware.h
View File

@ -480,6 +480,8 @@ struct davinci_syscfg_regs {
#define davinci_syscfg_regs \
((struct davinci_syscfg_regs *)DAVINCI_BOOTCFG_BASE)
#define pinmux(x) (&davinci_syscfg_regs->pinmux[x])
/* Emulation suspend bits */
#define DAVINCI_SYSCFG_SUSPSRC_EMAC (1 << 5)
#define DAVINCI_SYSCFG_SUSPSRC_I2C (1 << 16)

2
board/davinci/common/Makefile
View File

@ -29,7 +29,7 @@ endif
LIB = $(obj)lib$(VENDOR).o
COBJS := misc.o davinci_pinmux.o
COBJS := misc.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))

2
board/davinci/da8xxevm/da830evm.c
View File

@ -46,8 +46,6 @@
DECLARE_GLOBAL_DATA_PTR;
#define pinmux(x) (&davinci_syscfg_regs->pinmux[x])
/* SPI0 pin muxer settings */
static const struct pinmux_config spi0_pins[] = {
{ pinmux(7), 1, 3 },

2
board/davinci/da8xxevm/da850evm.c
View File

@ -34,8 +34,6 @@
DECLARE_GLOBAL_DATA_PTR;
#define pinmux(x) (&davinci_syscfg_regs->pinmux[x])
/* SPI0 pin muxer settings */
static const struct pinmux_config spi1_pins[] = {
{ pinmux(5), 1, 1 },

2
board/davinci/da8xxevm/hawkboard_nand_spl.c
View File

@ -32,8 +32,6 @@
DECLARE_GLOBAL_DATA_PTR;
#define pinmux(x) (&davinci_syscfg_regs->pinmux[x])
static const struct pinmux_config mii_pins[] = {
{ pinmux(2), 8, 1 },
{ pinmux(2), 8, 2 },

2
board/davinci/ea20/ea20.c
View File

@ -40,8 +40,6 @@
DECLARE_GLOBAL_DATA_PTR;
#define pinmux(x) (&davinci_syscfg_regs->pinmux[x])
static const struct da8xx_panel lcd_panel = {
/* Casio COM57H531x */
.name = "Casio_COM57H531x",

6
nand_spl/board/davinci/da8xxevm/Makefile
View File

@ -42,7 +42,7 @@ SOBJS = _divsi3.o \
COBJS = cpu.o \
davinci_nand.o \
davinci_pinmux.o \
pinmux.o \
div0.o \
hawkboard_nand_spl.o \
memsize.o \
@ -78,9 +78,9 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# create symbolic links for common files
# from board directory
$(obj)davinci_pinmux.c:
$(obj)pinmux.c:
@rm -f $@
@ln -s $(TOPDIR)/board/davinci/common/davinci_pinmux.c $@
@ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/pinmux.c $@
# from drivers/mtd/nand directory
$(obj)davinci_nand.c: