Skip to content

Commit

Permalink
mpc512x: add ifm ac14xx board
Browse files Browse the repository at this point in the history
Add new mpc5121e based ac14xx board and a new pinmux config
function for setting individual pinmux bit groups. This
function is used in ac14xx board code.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
  • Loading branch information
vdsao authored and wdenx committed Mar 9, 2013
1 parent 5643709 commit fcc7fe4
Show file tree
Hide file tree
Showing 7 changed files with 1,311 additions and 0 deletions.
1 change: 1 addition & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ Wolfgang Grandegger <wg@denx.de>

Anatolij Gustschin <agust@denx.de>

ac14xx MPC5121e
O2D MPC5200
O2D300 MPC5200
O2DNT2 MPC5200
Expand Down
54 changes: 54 additions & 0 deletions arch/powerpc/cpu/mpc512x/iopin.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,57 @@ void iopin_initialize(iopin_t *ioregs_init, int len)
}
return;
}

void iopin_initialize_bits(iopin_t *ioregs_init, int len)
{
short i, j, p;
u32 *reg, mask;
immap_t *im = (immap_t *)CONFIG_SYS_IMMR;

reg = (u32 *)&(im->io_ctrl);

/* iterate over table entries */
for (i = 0; i < len; i++) {
/* iterate over pins within a table entry */
for (p = 0, j = ioregs_init[i].p_offset / sizeof(u_long);
p < ioregs_init[i].nr_pins; p++, j++) {
if (ioregs_init[i].bit_or & IO_PIN_OVER_EACH) {
/* replace all settings at once */
out_be32(reg + j, ioregs_init[i].val);
} else {
/*
* only replace individual parts, but
* REPLACE them instead of just ORing
* them in and "inheriting" previously
* set bits which we don't want
*/
mask = 0;
if (ioregs_init[i].bit_or & IO_PIN_OVER_FMUX)
mask |= IO_PIN_FMUX(3);

if (ioregs_init[i].bit_or & IO_PIN_OVER_HOLD)
mask |= IO_PIN_HOLD(3);

if (ioregs_init[i].bit_or & IO_PIN_OVER_PULL)
mask |= IO_PIN_PUD(1) | IO_PIN_PUE(1);

if (ioregs_init[i].bit_or & IO_PIN_OVER_STRIG)
mask |= IO_PIN_ST(1);

if (ioregs_init[i].bit_or & IO_PIN_OVER_DRVSTR)
mask |= IO_PIN_DS(3);
/*
* DON'T do the "mask, then insert"
* in place on the register, it may
* break access to external hardware
* (like boot ROMs) when configuring
* LPB related pins, while the code to
* configure the pin is read from this
* very address region
*/
clrsetbits_be32(reg + j, mask,
ioregs_init[i].val & mask);
}
}
}
}
13 changes: 13 additions & 0 deletions arch/powerpc/include/asm/immap_512x.h
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,19 @@ typedef struct iopin_t {

void iopin_initialize(iopin_t *,int);

/*
* support to adjust individual parts of the IO pin setup
*/

#define IO_PIN_OVER_EACH (1 << 0) /* for compatibility */
#define IO_PIN_OVER_FMUX (1 << 1)
#define IO_PIN_OVER_HOLD (1 << 2)
#define IO_PIN_OVER_PULL (1 << 3)
#define IO_PIN_OVER_STRIG (1 << 4)
#define IO_PIN_OVER_DRVSTR (1 << 5)

void iopin_initialize_bits(iopin_t *, int);

/*
* IIM
*/
Expand Down
34 changes: 34 additions & 0 deletions board/ifm/ac14xx/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#
# (C) Copyright 2009 Wolfgang Denk <wd@denx.de>
#
# See file CREDITS for list of people who contributed to this
# project.
#
# 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 the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.
#

include $(TOPDIR)/config.mk

LIB = $(obj)lib$(BOARD).o

COBJS-y := $(BOARD).o

COBJS := $(COBJS-y)
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
SOBJS := $(addprefix $(obj),$(SOBJS))

$(LIB): $(obj).depend $(OBJS)
$(call cmd_link_o_target, $(OBJS))

#########################################################################

# defines $(obj).depend target
include $(SRCTREE)/rules.mk

sinclude $(obj).depend

#########################################################################
Loading

0 comments on commit fcc7fe4

Please sign in to comment.