Merge branch 'master' of git://git.denx.de/u-boot-mpc512x
This commit is contained in:
commit
4b13860e74
9
Makefile
9
Makefile
@ -750,12 +750,11 @@ motionpro_config: unconfig
|
||||
## MPC512x Systems
|
||||
#########################################################################
|
||||
ads5121_config \
|
||||
ads5121_PCI_config \
|
||||
: unconfig
|
||||
ads5121_rev2_config \
|
||||
: unconfig
|
||||
@mkdir -p $(obj)include
|
||||
@if [ "$(findstring _PCI_,$@)" ] ; then \
|
||||
echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with PCI enabled" ; \
|
||||
@if [ "$(findstring rev2,$@)" ] ; then \
|
||||
echo "#define CONFIG_ADS5121_REV2 1" > $(obj)include/config.h; \
|
||||
fi
|
||||
@$(MKCONFIG) -a ads5121 ppc mpc512x ads5121
|
||||
|
||||
|
@ -27,7 +27,7 @@ $(shell mkdir -p $(OBJTREE)/board/freescale/common)
|
||||
|
||||
LIB = $(obj)lib$(BOARD).a
|
||||
|
||||
COBJS-y := $(BOARD).o
|
||||
COBJS-y := $(BOARD).o iopin.o
|
||||
COBJS-${CONFIG_FSL_DIU_FB} += ads5121_diu.o
|
||||
COBJS-${CONFIG_FSL_DIU_FB} += ../freescale/common/fsl_diu_fb.o
|
||||
COBJS-${CONFIG_FSL_DIU_FB} += ../freescale/common/fsl_logo_bmp.o
|
||||
|
9
board/ads5121/README
Normal file
9
board/ads5121/README
Normal file
@ -0,0 +1,9 @@
|
||||
To configure for the current (Rev 3.x) ADS5121
|
||||
make ads5121_config
|
||||
This will automatically include PCI, the Real Time CLock, add backup flash
|
||||
ability and set the correct frequency and memory configuration.
|
||||
|
||||
To configure for the older Rev 2 ADS5121 type (this will not have PCI)
|
||||
make ads5121_rev2_config
|
||||
|
||||
|
@ -26,7 +26,9 @@
|
||||
#include <asm/bitops.h>
|
||||
#include <command.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
#ifdef CONFIG_MISC_INIT_R
|
||||
#include <i2c.h>
|
||||
#endif
|
||||
/* Clocks in use */
|
||||
#define SCCR1_CLOCKS_EN (CLOCK_SCCR1_CFG_EN | \
|
||||
CLOCK_SCCR1_LPC_EN | \
|
||||
@ -45,28 +47,12 @@
|
||||
#define CSAW_START(start) ((start) & 0xFFFF0000)
|
||||
#define CSAW_STOP(start, size) (((start) + (size) - 1) >> 16)
|
||||
|
||||
#define MPC5121_IOCTL_PSC6_0 (0x284/4)
|
||||
#define MPC5121_IO_DIU_START (0x288/4)
|
||||
#define MPC5121_IO_DIU_END (0x2fc/4)
|
||||
|
||||
/* Functional pin muxing */
|
||||
#define MPC5121_IO_FUNC1 (0 << 7)
|
||||
#define MPC5121_IO_FUNC2 (1 << 7)
|
||||
#define MPC5121_IO_FUNC3 (2 << 7)
|
||||
#define MPC5121_IO_FUNC4 (3 << 7)
|
||||
#define MPC5121_IO_ST (1 << 2)
|
||||
#define MPC5121_IO_DS_1 (0)
|
||||
#define MPC5121_IO_DS_2 (1)
|
||||
#define MPC5121_IO_DS_3 (2)
|
||||
#define MPC5121_IO_DS_4 (3)
|
||||
|
||||
long int fixed_sdram(void);
|
||||
|
||||
int board_early_init_f (void)
|
||||
{
|
||||
volatile immap_t *im = (immap_t *) CFG_IMMR;
|
||||
u32 lpcaw, tmp32;
|
||||
volatile ioctrl512x_t *ioctl = &(im->io_ctrl);
|
||||
int i;
|
||||
|
||||
/*
|
||||
@ -91,24 +77,27 @@ int board_early_init_f (void)
|
||||
* Without this the flash identification routine fails, as it needs to issue
|
||||
* write commands in order to establish the device ID.
|
||||
*/
|
||||
*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
|
||||
|
||||
#ifdef CONFIG_ADS5121_REV2
|
||||
*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
|
||||
#else
|
||||
if (*((u8 *)(CFG_CPLD_BASE + 0x08)) & 0x04) {
|
||||
*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
|
||||
} else {
|
||||
/* running from Backup flash */
|
||||
*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0x32;
|
||||
}
|
||||
#endif
|
||||
/*
|
||||
* Configure Flash Speed
|
||||
*/
|
||||
*((volatile u32 *)(CFG_IMMR + LPC_OFFSET + CS0_CONFIG)) = CFG_CS0_CFG;
|
||||
/*
|
||||
* Enable clocks
|
||||
*/
|
||||
im->clk.sccr[0] = SCCR1_CLOCKS_EN;
|
||||
im->clk.sccr[1] = SCCR2_CLOCKS_EN;
|
||||
|
||||
/* Configure DIU clock pin */
|
||||
tmp32 = ioctl->regs[MPC5121_IOCTL_PSC6_0];
|
||||
tmp32 &= ~0x1ff;
|
||||
tmp32 |= MPC5121_IO_FUNC3 | MPC5121_IO_DS_4;
|
||||
ioctl->regs[MPC5121_IOCTL_PSC6_0] = tmp32;
|
||||
|
||||
/* Initialize IO pins (pin mux) for DIU function */
|
||||
for (i = MPC5121_IO_DIU_START; i < MPC5121_IO_DIU_END; i++)
|
||||
ioctl->regs[i] |= (MPC5121_IO_FUNC3 | MPC5121_IO_DS_4);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -250,17 +239,12 @@ int checkboard (void)
|
||||
{
|
||||
ushort brd_rev = *(vu_short *) (CFG_CPLD_BASE + 0x00);
|
||||
uchar cpld_rev = *(vu_char *) (CFG_CPLD_BASE + 0x02);
|
||||
volatile immap_t *im = (immap_t *) CFG_IMMR;
|
||||
volatile unsigned long *reg;
|
||||
int i;
|
||||
|
||||
printf ("Board: ADS5121 rev. 0x%04x (CPLD rev. 0x%02x)\n",
|
||||
brd_rev, cpld_rev);
|
||||
/* initialize function mux & slew rate IO inter alia on IO Pins */
|
||||
iopin_initialize();
|
||||
|
||||
/* change the slew rate on all pata pins to max */
|
||||
reg = (unsigned long *) &(im->io_ctrl.regs[PATA_CE1_IDX]);
|
||||
for (i = 0; i < 9; i++)
|
||||
reg[i] |= 0x00000003;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
96
board/ads5121/iopin.c
Normal file
96
board/ads5121/iopin.c
Normal file
@ -0,0 +1,96 @@
|
||||
/*
|
||||
* (C) Copyright 2008
|
||||
* Martha J Marx, Silicon Turnkey Express, mmarx@silicontkx.com
|
||||
* mpc512x I/O pin/pad initialization for the ADS5121 board
|
||||
* 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.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <linux/types.h>
|
||||
#include "iopin.h"
|
||||
|
||||
/*
|
||||
* IO PAD TYPES
|
||||
* for all types fmux is used to select the funtion
|
||||
* ds sets the slew rate
|
||||
* STD pins nothing extra (can set ds & fmux only)
|
||||
* STD_PU pue=1 to enable pull & pud sets whether up or down resistors
|
||||
* STD_ST st sets the Schmitt trigger
|
||||
* STD_PU_ST pue & pud sets pull-up/down resistors as in STD_PU
|
||||
* st sets the Schmitt trigger
|
||||
* PCI hold sets output delay
|
||||
* PCI_ST hold sets output delay and st sets the Schmitt trigger
|
||||
*/
|
||||
|
||||
static struct iopin_t {
|
||||
u_short p_offset; /* offset from IOCTL_MEM_OFFSET */
|
||||
u_short p_no; /* number of pins to set this way */
|
||||
u_short bit_or:7; /* Do bitwise OR instead of setting */
|
||||
u_short fmux:2; /* pad function select 0-3 */
|
||||
u_short hold:2; /* PCI pad types only; */
|
||||
u_short pud:1; /* pull resistor; PU types only; */
|
||||
/* if pue=1 then 0=pull-down, 1=pull-up */
|
||||
u_short pue:1; /* Pull resistor enable; _PU types only */
|
||||
u_short st:1; /* Schmitt trigger enable; _ST types only */
|
||||
u_short ds:2; /* Slew rate class, 0=class1, ..., 3=class4 */
|
||||
} ioregs_init[] = {
|
||||
/* FUNC1=FEC_RX_DV Sets Next 3 to FEC pads */
|
||||
{IOCTL_SPDIF_TXCLK, 3, 0, 1, 0, 0, 0, 0, 3},
|
||||
/* Set highest Slew on 9 PATA pins */
|
||||
{IOCTL_PATA_CE1, 9, 1, 0, 0, 0, 0, 0, 3},
|
||||
/* FUNC1=FEC_COL Sets Next 15 to FEC pads */
|
||||
{IOCTL_PSC0_0, 15, 0, 1, 0, 0, 0, 0, 3},
|
||||
/* FUNC1=SPDIF_TXCLK */
|
||||
{IOCTL_LPC_CS1, 1, 0, 1, 0, 0, 0, 1, 3},
|
||||
/* FUNC2=SPDIF_TX and sets Next pin to SPDIF_RX */
|
||||
{IOCTL_I2C1_SCL, 2, 0, 2, 0, 0, 0, 1, 3},
|
||||
/* FUNC2=DIU CLK */
|
||||
{IOCTL_PSC6_0, 1, 0, 2, 0, 0, 0, 1, 3},
|
||||
/* FUNC2=DIU_HSYNC */
|
||||
{IOCTL_PSC6_1, 1, 0, 2, 0, 0, 0, 0, 3},
|
||||
/* FUNC2=DIUVSYNC Sets Next 26 to DIU Pads */
|
||||
{IOCTL_PSC6_4, 26, 0, 2, 0, 0, 0, 0, 3}
|
||||
};
|
||||
|
||||
void iopin_initialize(void)
|
||||
{
|
||||
short i, j, n, p;
|
||||
u_long *reg;
|
||||
|
||||
if (sizeof(ioregs_init) == 0)
|
||||
return;
|
||||
|
||||
immap_t *im = (immap_t *)CFG_IMMR;
|
||||
reg = (u_long *)&(im->io_ctrl.regs[0]);
|
||||
n = sizeof(ioregs_init) / sizeof(ioregs_init[0]);
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
for (p = 0, j = ioregs_init[i].p_offset / sizeof(u_long);
|
||||
p < ioregs_init[i].p_no; p++, j++) {
|
||||
/* lowest 9 bits sets the register */
|
||||
if (ioregs_init[i].bit_or)
|
||||
reg[j] |= *((u_long *) &ioregs_init[i].p_no)
|
||||
& 0x000001ff;
|
||||
else
|
||||
reg[j] = *((u_long *) &ioregs_init[i].p_no)
|
||||
& 0x000001ff;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
222
board/ads5121/iopin.h
Normal file
222
board/ads5121/iopin.h
Normal file
@ -0,0 +1,222 @@
|
||||
/*
|
||||
* (C) Copyright 2008
|
||||
* Martha J Marx, Silicon Turnkey Express, mmarx@silicontkx.com
|
||||
* mpc512x I/O pin/pad initialization for the ADS5121 board
|
||||
* 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.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#define IOCTL_MEM 0x000
|
||||
#define IOCTL_GP 0x004
|
||||
#define IOCTL_LPC_CLK 0x008
|
||||
#define IOCTL_LPC_OE 0x00C
|
||||
#define IOCTL_LPC_RWB 0x010
|
||||
#define IOCTL_LPC_ACK 0x014
|
||||
#define IOCTL_LPC_CS0 0x018
|
||||
#define IOCTL_NFC_CE0 0x01C
|
||||
#define IOCTL_LPC_CS1 0x020
|
||||
#define IOCTL_LPC_CS2 0x024
|
||||
#define IOCTL_LPC_AX03 0x028
|
||||
#define IOCTL_EMB_AX02 0x02C
|
||||
#define IOCTL_EMB_AX01 0x030
|
||||
#define IOCTL_EMB_AX00 0x034
|
||||
#define IOCTL_EMB_AD31 0x038
|
||||
#define IOCTL_EMB_AD30 0x03C
|
||||
#define IOCTL_EMB_AD29 0x040
|
||||
#define IOCTL_EMB_AD28 0x044
|
||||
#define IOCTL_EMB_AD27 0x048
|
||||
#define IOCTL_EMB_AD26 0x04C
|
||||
#define IOCTL_EMB_AD25 0x050
|
||||
#define IOCTL_EMB_AD24 0x054
|
||||
#define IOCTL_EMB_AD23 0x058
|
||||
#define IOCTL_EMB_AD22 0x05C
|
||||
#define IOCTL_EMB_AD21 0x060
|
||||
#define IOCTL_EMB_AD20 0x064
|
||||
#define IOCTL_EMB_AD19 0x068
|
||||
#define IOCTL_EMB_AD18 0x06C
|
||||
#define IOCTL_EMB_AD17 0x070
|
||||
#define IOCTL_EMB_AD16 0x074
|
||||
#define IOCTL_EMB_AD15 0x078
|
||||
#define IOCTL_EMB_AD14 0x07C
|
||||
#define IOCTL_EMB_AD13 0x080
|
||||
#define IOCTL_EMB_AD12 0x084
|
||||
#define IOCTL_EMB_AD11 0x088
|
||||
#define IOCTL_EMB_AD10 0x08C
|
||||
#define IOCTL_EMB_AD09 0x090
|
||||
#define IOCTL_EMB_AD08 0x094
|
||||
#define IOCTL_EMB_AD07 0x098
|
||||
#define IOCTL_EMB_AD06 0x09C
|
||||
#define IOCTL_EMB_AD05 0x0A0
|
||||
#define IOCTL_EMB_AD04 0x0A4
|
||||
#define IOCTL_EMB_AD03 0x0A8
|
||||
#define IOCTL_EMB_AD02 0x0AC
|
||||
#define IOCTL_EMB_AD01 0x0B0
|
||||
#define IOCTL_EMB_AD00 0x0B4
|
||||
#define IOCTL_PATA_CE1 0x0B8
|
||||
#define IOCTL_PATA_CE2 0x0BC
|
||||
#define IOCTL_PATA_ISOLATE 0x0C0
|
||||
#define IOCTL_PATA_IOR 0x0C4
|
||||
#define IOCTL_PATA_IOW 0x0C8
|
||||
#define IOCTL_PATA_IOCHRDY 0x0CC
|
||||
#define IOCTL_PATA_INTRQ 0x0D0
|
||||
#define IOCTL_PATA_DRQ 0x0D4
|
||||
#define IOCTL_PATA_DACK 0x0D8
|
||||
#define IOCTL_NFC_WP 0x0DC
|
||||
#define IOCTL_NFC_RB 0x0E0
|
||||
#define IOCTL_NFC_ALE 0x0E4
|
||||
#define IOCTL_NFC_CLE 0x0E8
|
||||
#define IOCTL_NFC_WE 0x0EC
|
||||
#define IOCTL_NFC_RE 0x0F0
|
||||
#define IOCTL_PCI_AD31 0x0F4
|
||||
#define IOCTL_PCI_AD30 0x0F8
|
||||
#define IOCTL_PCI_AD29 0x0FC
|
||||
#define IOCTL_PCI_AD28 0x100
|
||||
#define IOCTL_PCI_AD27 0x104
|
||||
#define IOCTL_PCI_AD26 0x108
|
||||
#define IOCTL_PCI_AD25 0x10C
|
||||
#define IOCTL_PCI_AD24 0x110
|
||||
#define IOCTL_PCI_AD23 0x114
|
||||
#define IOCTL_PCI_AD22 0x118
|
||||
#define IOCTL_PCI_AD21 0x11C
|
||||
#define IOCTL_PCI_AD20 0x120
|
||||
#define IOCTL_PCI_AD19 0x124
|
||||
#define IOCTL_PCI_AD18 0x128
|
||||
#define IOCTL_PCI_AD17 0x12C
|
||||
#define IOCTL_PCI_AD16 0x130
|
||||
#define IOCTL_PCI_AD15 0x134
|
||||
#define IOCTL_PCI_AD14 0x138
|
||||
#define IOCTL_PCI_AD13 0x13C
|
||||
#define IOCTL_PCI_AD12 0x140
|
||||
#define IOCTL_PCI_AD11 0x144
|
||||
#define IOCTL_PCI_AD10 0x148
|
||||
#define IOCTL_PCI_AD09 0x14C
|
||||
#define IOCTL_PCI_AD08 0x150
|
||||
#define IOCTL_PCI_AD07 0x154
|
||||
#define IOCTL_PCI_AD06 0x158
|
||||
#define IOCTL_PCI_AD05 0x15C
|
||||
#define IOCTL_PCI_AD04 0x160
|
||||
#define IOCTL_PCI_AD03 0x164
|
||||
#define IOCTL_PCI_AD02 0x168
|
||||
#define IOCTL_PCI_AD01 0x16C
|
||||
#define IOCTL_PCI_AD00 0x170
|
||||
#define IOCTL_PCI_CBE0 0x174
|
||||
#define IOCTL_PCI_CBE1 0x178
|
||||
#define IOCTL_PCI_CBE2 0x17C
|
||||
#define IOCTL_PCI_CBE3 0x180
|
||||
#define IOCTL_PCI_GNT2 0x184
|
||||
#define IOCTL_PCI_REQ2 0x188
|
||||
#define IOCTL_PCI_GNT1 0x18C
|
||||
#define IOCTL_PCI_REQ1 0x190
|
||||
#define IOCTL_PCI_GNT0 0x194
|
||||
#define IOCTL_PCI_REQ0 0x198
|
||||
#define IOCTL_PCI_INTA 0x19C
|
||||
#define IOCTL_PCI_CLK 0x1A0
|
||||
#define IOCTL_PCI_RST_OUT 0x1A4
|
||||
#define IOCTL_PCI_FRAME 0x1A8
|
||||
#define IOCTL_PCI_IDSEL 0x1AC
|
||||
#define IOCTL_PCI_DEVSEL 0x1B0
|
||||
#define IOCTL_PCI_IRDY 0x1B4
|
||||
#define IOCTL_PCI_TRDY 0x1B8
|
||||
#define IOCTL_PCI_STOP 0x1BC
|
||||
#define IOCTL_PCI_PAR 0x1C0
|
||||
#define IOCTL_PCI_PERR 0x1C4
|
||||
#define IOCTL_PCI_SERR 0x1C8
|
||||
#define IOCTL_SPDIF_TXCLK 0x1CC
|
||||
#define IOCTL_SPDIF_TX 0x1D0
|
||||
#define IOCTL_SPDIF_RX 0x1D4
|
||||
#define IOCTL_I2C0_SCL 0x1D8
|
||||
#define IOCTL_I2C0_SDA 0x1DC
|
||||
#define IOCTL_I2C1_SCL 0x1E0
|
||||
#define IOCTL_I2C1_SDA 0x1E4
|
||||
#define IOCTL_I2C2_SCL 0x1E8
|
||||
#define IOCTL_I2C2_SDA 0x1EC
|
||||
#define IOCTL_IRQ0 0x1F0
|
||||
#define IOCTL_IRQ1 0x1F4
|
||||
#define IOCTL_CAN1_TX 0x1F8
|
||||
#define IOCTL_CAN2_TX 0x1FC
|
||||
#define IOCTL_J1850_TX 0x200
|
||||
#define IOCTL_J1850_RX 0x204
|
||||
#define IOCTL_PSC_MCLK_IN 0x208
|
||||
#define IOCTL_PSC0_0 0x20C
|
||||
#define IOCTL_PSC0_1 0x210
|
||||
#define IOCTL_PSC0_2 0x214
|
||||
#define IOCTL_PSC0_3 0x218
|
||||
#define IOCTL_PSC0_4 0x21C
|
||||
#define IOCTL_PSC1_0 0x220
|
||||
#define IOCTL_PSC1_1 0x224
|
||||
#define IOCTL_PSC1_2 0x228
|
||||
#define IOCTL_PSC1_3 0x22C
|
||||
#define IOCTL_PSC1_4 0x230
|
||||
#define IOCTL_PSC2_0 0x234
|
||||
#define IOCTL_PSC2_1 0x238
|
||||
#define IOCTL_PSC2_2 0x23C
|
||||
#define IOCTL_PSC2_3 0x240
|
||||
#define IOCTL_PSC2_4 0x244
|
||||
#define IOCTL_PSC3_0 0x248
|
||||
#define IOCTL_PSC3_1 0x24C
|
||||
#define IOCTL_PSC3_2 0x250
|
||||
#define IOCTL_PSC3_3 0x254
|
||||
#define IOCTL_PSC3_4 0x258
|
||||
#define IOCTL_PSC4_0 0x25C
|
||||
#define IOCTL_PSC4_1 0x260
|
||||
#define IOCTL_PSC4_2 0x264
|
||||
#define IOCTL_PSC4_3 0x268
|
||||
#define IOCTL_PSC4_4 0x26C
|
||||
#define IOCTL_PSC5_0 0x270
|
||||
#define IOCTL_PSC5_1 0x274
|
||||
#define IOCTL_PSC5_2 0x278
|
||||
#define IOCTL_PSC5_3 0x27C
|
||||
#define IOCTL_PSC5_4 0x280
|
||||
#define IOCTL_PSC6_0 0x284
|
||||
#define IOCTL_PSC6_1 0x288
|
||||
#define IOCTL_PSC6_2 0x28C
|
||||
#define IOCTL_PSC6_3 0x290
|
||||
#define IOCTL_PSC6_4 0x294
|
||||
#define IOCTL_PSC7_0 0x298
|
||||
#define IOCTL_PSC7_1 0x29C
|
||||
#define IOCTL_PSC7_2 0x2A0
|
||||
#define IOCTL_PSC7_3 0x2A4
|
||||
#define IOCTL_PSC7_4 0x2A8
|
||||
#define IOCTL_PSC8_0 0x2AC
|
||||
#define IOCTL_PSC8_1 0x2B0
|
||||
#define IOCTL_PSC8_2 0x2B4
|
||||
#define IOCTL_PSC8_3 0x2B8
|
||||
#define IOCTL_PSC8_4 0x2BC
|
||||
#define IOCTL_PSC9_0 0x2C0
|
||||
#define IOCTL_PSC9_1 0x2C4
|
||||
#define IOCTL_PSC9_2 0x2C8
|
||||
#define IOCTL_PSC9_3 0x2CC
|
||||
#define IOCTL_PSC9_4 0x2D0
|
||||
#define IOCTL_PSC10_0 0x2D4
|
||||
#define IOCTL_PSC10_1 0x2D8
|
||||
#define IOCTL_PSC10_2 0x2DC
|
||||
#define IOCTL_PSC10_3 0x2E0
|
||||
#define IOCTL_PSC10_4 0x2E4
|
||||
#define IOCTL_PSC11_0 0x2E8
|
||||
#define IOCTL_PSC11_1 0x2EC
|
||||
#define IOCTL_PSC11_2 0x2F0
|
||||
#define IOCTL_PSC11_3 0x2F4
|
||||
#define IOCTL_PSC11_4 0x2F8
|
||||
#define IOCTL_HRESET 0x2FC
|
||||
#define IOCTL_SRESET 0x300
|
||||
#define IOCTL_CKSTP_OUT 0x304
|
||||
#define IOCTL_USB2_VBUS_PWR_FAULT 0x308
|
||||
#define IOCTL_USB2_VBUS_PWR_SELECT 0x30C
|
||||
#define IOCTL_USB2_PHY_DRVV_BUS 0x310
|
||||
|
||||
extern void iopin_initialize(void);
|
@ -133,8 +133,9 @@ void watchdog_reset (void)
|
||||
#ifdef CONFIG_OF_LIBFDT
|
||||
void ft_cpu_setup(void *blob, bd_t *bd)
|
||||
{
|
||||
char * cpu_path = "/cpus/" OF_CPU;
|
||||
char * eth_path = "/" OF_SOC "/ethernet@2800";
|
||||
char *cpu_path = "/cpus/" OF_CPU;
|
||||
char *eth_path = "/" OF_SOC "/ethernet@2800";
|
||||
char *eth_path_old = "/" OF_SOC_OLD "/ethernet@2800";
|
||||
|
||||
do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
|
||||
do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1);
|
||||
@ -144,5 +145,8 @@ void ft_cpu_setup(void *blob, bd_t *bd)
|
||||
|
||||
/* this is so old kernels with old device trees will boot */
|
||||
do_fixup_by_path_u32(blob, "/" OF_SOC_OLD, "bus-frequency", bd->bi_ipsfreq, 0);
|
||||
do_fixup_by_path(blob, eth_path_old, "local-mac-address",
|
||||
bd->bi_enetaddr, 6, 0);
|
||||
do_fixup_by_path(blob, eth_path_old, "address", bd->bi_enetaddr, 6, 0);
|
||||
}
|
||||
#endif
|
||||
|
@ -604,13 +604,10 @@ static int mpc512x_fec_recv (struct eth_device *dev)
|
||||
/********************************************************************/
|
||||
int mpc512x_fec_initialize (bd_t * bis)
|
||||
{
|
||||
|
||||
immap_t *im = (immap_t*) CFG_IMMR;
|
||||
mpc512x_fec_priv *fec;
|
||||
struct eth_device *dev;
|
||||
int i;
|
||||
char *tmp, *end, env_enetaddr[6];
|
||||
uint32 *reg;
|
||||
void * bd;
|
||||
|
||||
fec = (mpc512x_fec_priv *) malloc (sizeof(*fec));
|
||||
@ -639,18 +636,6 @@ int mpc512x_fec_initialize (bd_t * bis)
|
||||
fec512x_miiphy_read, fec512x_miiphy_write);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Initialize I\O pins
|
||||
*/
|
||||
reg = (uint32 *) &(im->io_ctrl.regs[PSC0_0_IDX]);
|
||||
|
||||
for (i = 0; i < 15; i++)
|
||||
reg[i] = IOCTRL_MUX_FEC | 0x00000001;
|
||||
|
||||
im->io_ctrl.regs[SPDIF_TXCLOCK_IDX] = IOCTRL_MUX_FEC | 0x00000001;
|
||||
im->io_ctrl.regs[SPDIF_TX_IDX] = IOCTRL_MUX_FEC | 0x00000001;
|
||||
im->io_ctrl.regs[SPDIF_RX_IDX] = IOCTRL_MUX_FEC | 0x00000001;
|
||||
|
||||
/* Clean up space FEC's MIB and FIFO RAM ...*/
|
||||
memset ((void *) MPC512X_FEC + 0x200, 0x00, 0x400);
|
||||
|
||||
|
@ -27,6 +27,7 @@
|
||||
#ifndef __CONFIG_H
|
||||
#define __CONFIG_H
|
||||
|
||||
#define CONFIG_ADS5121 1
|
||||
/*
|
||||
* Memory map for the ADS5121 board:
|
||||
*
|
||||
@ -57,7 +58,12 @@
|
||||
|
||||
/* CONFIG_PCI is defined at config time */
|
||||
|
||||
#ifdef CONFIG_ADS5121_REV2
|
||||
#define CFG_MPC512X_CLKIN 66000000 /* in Hz */
|
||||
#else
|
||||
#define CFG_MPC512X_CLKIN 33333333 /* in Hz */
|
||||
#define CONFIG_PCI
|
||||
#endif
|
||||
|
||||
#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */
|
||||
#define CONFIG_MISC_INIT_R
|
||||
@ -71,7 +77,11 @@
|
||||
/*
|
||||
* DDR Setup - manually set all parameters as there's no SPD etc.
|
||||
*/
|
||||
#ifdef CONFIG_ADS5121_REV2
|
||||
#define CFG_DDR_SIZE 256 /* MB */
|
||||
#else
|
||||
#define CFG_DDR_SIZE 512 /* MB */
|
||||
#endif
|
||||
#define CFG_DDR_BASE 0x00000000 /* DDR is system memory*/
|
||||
#define CFG_SDRAM_BASE CFG_DDR_BASE
|
||||
|
||||
@ -119,14 +129,20 @@
|
||||
* [09:05] DRAM tRP:
|
||||
* [04:00] DRAM tRPA
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_ADS5121_REV2
|
||||
#define CFG_MDDRC_SYS_CFG 0xF8604A00
|
||||
#define CFG_MDDRC_SYS_CFG_RUN 0xE8604A00
|
||||
#define CFG_MDDRC_TIME_CFG1 0x54EC1168
|
||||
#define CFG_MDDRC_TIME_CFG2 0x35210864
|
||||
#else
|
||||
#define CFG_MDDRC_SYS_CFG 0xFA804A00
|
||||
#define CFG_MDDRC_SYS_CFG_RUN 0xEA804A00
|
||||
#define CFG_MDDRC_TIME_CFG1 0x68EC1168
|
||||
#define CFG_MDDRC_TIME_CFG2 0x34310864
|
||||
#endif
|
||||
#define CFG_MDDRC_SYS_CFG_EN 0xF0000000
|
||||
#define CFG_MDDRC_TIME_CFG0 0x00003D2E
|
||||
#define CFG_MDDRC_TIME_CFG0_RUN 0x06183D2E
|
||||
#define CFG_MDDRC_TIME_CFG1 0x54EC1168
|
||||
#define CFG_MDDRC_TIME_CFG2 0x35210864
|
||||
|
||||
#define CFG_MICRON_NOP 0x01380000
|
||||
#define CFG_MICRON_PCHG_ALL 0x01100400
|
||||
@ -165,12 +181,17 @@
|
||||
/*
|
||||
* NOR FLASH on the Local Bus
|
||||
*/
|
||||
#undef CONFIG_BKUP_FLASH
|
||||
#define CFG_FLASH_CFI /* use the Common Flash Interface */
|
||||
#define CFG_FLASH_CFI_DRIVER /* use the CFI driver */
|
||||
#ifdef CONFIG_BKUP_FLASH
|
||||
#define CFG_FLASH_BASE 0xFF800000 /* start of FLASH */
|
||||
#define CFG_FLASH_SIZE 0x00800000 /* max flash size in bytes */
|
||||
#else
|
||||
#define CFG_FLASH_BASE 0xFC000000 /* start of FLASH */
|
||||
#define CFG_FLASH_SIZE 0x04000000 /* max flash size in bytes */
|
||||
#endif
|
||||
#define CFG_FLASH_USE_BUFFER_WRITE
|
||||
|
||||
#define CFG_MAX_FLASH_BANKS 1 /* number of banks */
|
||||
#define CFG_FLASH_BANKS_LIST {CFG_FLASH_BASE}
|
||||
#define CFG_MAX_FLASH_SECT 256 /* max sectors per device */
|
||||
@ -286,14 +307,13 @@
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_PHY_ADDR 0x1
|
||||
#define CONFIG_MII 1 /* MII PHY management */
|
||||
#define CONFIG_FEC_AN_TIMEOUT 1
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Configure on-board RTC
|
||||
*/
|
||||
#define CONFIG_RTC_DS1374 /* use ds1374 rtc via i2c */
|
||||
#define CONFIG_RTC_M41T62 /* use M41T62 rtc via i2 */
|
||||
#define CFG_I2C_RTC_ADDR 0x68 /* at address 0x68 */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Environment
|
||||
@ -302,7 +322,11 @@
|
||||
/* This has to be a multiple of the Flash sector size */
|
||||
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
|
||||
#define CFG_ENV_SIZE 0x2000
|
||||
#ifdef CONFIG_BKUP_FLASH
|
||||
#define CFG_ENV_SECT_SIZE 0x20000 /* one sector (256K) for env */
|
||||
#else
|
||||
#define CFG_ENV_SECT_SIZE 0x40000 /* one sector (256K) for env */
|
||||
#endif
|
||||
|
||||
/* Address and size of Redundant Environment Sector */
|
||||
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
|
||||
@ -321,6 +345,7 @@
|
||||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_REGINFO
|
||||
#define CONFIG_CMD_EEPROM
|
||||
#define CONFIG_CMD_DATE
|
||||
|
||||
#if defined(CONFIG_PCI)
|
||||
#define CONFIG_CMD_PCI
|
||||
|
Loading…
Reference in New Issue
Block a user