Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
This commit is contained in:
Wolfgang Denk
commit
bec9cab929
|
|
@ -7,7 +7,7 @@ include $(TOPDIR)/config.mk
|
|||
|
||||
LIB = $(obj)lib$(BOARD).a
|
||||
|
||||
COBJS := $(BOARD).o
|
||||
COBJS := $(BOARD).o cmd_mtc.o
|
||||
|
||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(COBJS))
|
||||
|
|
|
|||
|
|
@ -0,0 +1,350 @@
|
|||
/*
|
||||
* (C) Copyright 2009
|
||||
* Werner Pfister <Pfister_Werner@intercontrol.de>
|
||||
*
|
||||
* (C) Copyright 2009 Semihalf, Grzegorz Bernacki
|
||||
*
|
||||
* 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 <command.h>
|
||||
#include <mpc5xxx.h>
|
||||
#include "spi.h"
|
||||
#include "cmd_mtc.h"
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
static const char *led_names[] = {
|
||||
"diag",
|
||||
"can1",
|
||||
"can2",
|
||||
"can3",
|
||||
"can4",
|
||||
"usbpwr",
|
||||
"usbbusy",
|
||||
"user1",
|
||||
"user2",
|
||||
""
|
||||
};
|
||||
|
||||
static void mtc_calculate_checksum(tx_msp_cmd *packet)
|
||||
{
|
||||
int i;
|
||||
uchar *buff;
|
||||
|
||||
buff = (uchar *) packet;
|
||||
|
||||
for (i = 0; i < 6; i++)
|
||||
packet->cks += buff[i];
|
||||
}
|
||||
|
||||
static int do_mtc_led(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
tx_msp_cmd pcmd;
|
||||
rx_msp_cmd prx;
|
||||
int err = 0;
|
||||
int i;
|
||||
|
||||
if (argc < 2) {
|
||||
cmd_usage(cmdtp);
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(&pcmd, 0, sizeof(pcmd));
|
||||
memset(&prx, 0, sizeof(prx));
|
||||
|
||||
pcmd.cmd = CMD_SET_LED;
|
||||
|
||||
pcmd.cmd_val0 = 0xff;
|
||||
for (i = 0; strlen(led_names[i]) != 0; i++) {
|
||||
if (strncmp(argv[1], led_names[i], strlen(led_names[i])) == 0) {
|
||||
pcmd.cmd_val0 = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (pcmd.cmd_val0 == 0xff) {
|
||||
printf("Usage:\n%s\n", cmdtp->help);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (argc >= 3) {
|
||||
if (strncmp(argv[2], "red", 3) == 0)
|
||||
pcmd.cmd_val1 = 1;
|
||||
else if (strncmp(argv[2], "green", 5) == 0)
|
||||
pcmd.cmd_val1 = 2;
|
||||
else if (strncmp(argv[2], "orange", 6) == 0)
|
||||
pcmd.cmd_val1 = 3;
|
||||
else
|
||||
pcmd.cmd_val1 = 0;
|
||||
}
|
||||
|
||||
if (argc >= 4)
|
||||
pcmd.cmd_val2 = simple_strtol(argv[3], NULL, 10);
|
||||
else
|
||||
pcmd.cmd_val2 = 0;
|
||||
|
||||
mtc_calculate_checksum(&pcmd);
|
||||
err = spi_xfer(NULL, MTC_TRANSFER_SIZE, &pcmd, &prx,
|
||||
SPI_XFER_BEGIN | SPI_XFER_END);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int do_mtc_key(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
tx_msp_cmd pcmd;
|
||||
rx_msp_cmd prx;
|
||||
int err = 0;
|
||||
|
||||
memset(&pcmd, 0, sizeof(pcmd));
|
||||
memset(&prx, 0, sizeof(prx));
|
||||
|
||||
pcmd.cmd = CMD_GET_VIM;
|
||||
|
||||
mtc_calculate_checksum(&pcmd);
|
||||
err = spi_xfer(NULL, MTC_TRANSFER_SIZE, &pcmd, &prx,
|
||||
SPI_XFER_BEGIN | SPI_XFER_END);
|
||||
|
||||
if (!err) {
|
||||
/* function returns '0' if key is pressed */
|
||||
err = (prx.input & 0x80) ? 0 : 1;
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int do_mtc_digout(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
tx_msp_cmd pcmd;
|
||||
rx_msp_cmd prx;
|
||||
int err = 0;
|
||||
uchar channel_mask = 0;
|
||||
|
||||
if (argc < 3) {
|
||||
cmd_usage(cmdtp);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (strncmp(argv[1], "on", 2) == 0)
|
||||
channel_mask |= 1;
|
||||
if (strncmp(argv[2], "on", 2) == 0)
|
||||
channel_mask |= 2;
|
||||
|
||||
memset(&pcmd, 0, sizeof(pcmd));
|
||||
memset(&prx, 0, sizeof(prx));
|
||||
|
||||
pcmd.cmd = CMD_GET_VIM;
|
||||
pcmd.user_out = channel_mask;
|
||||
|
||||
mtc_calculate_checksum(&pcmd);
|
||||
err = spi_xfer(NULL, MTC_TRANSFER_SIZE, &pcmd, &prx,
|
||||
SPI_XFER_BEGIN | SPI_XFER_END);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int do_mtc_digin(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
tx_msp_cmd pcmd;
|
||||
rx_msp_cmd prx;
|
||||
int err = 0;
|
||||
uchar channel_num = 0;
|
||||
|
||||
if (argc < 2) {
|
||||
cmd_usage(cmdtp);
|
||||
return -1;
|
||||
}
|
||||
|
||||
channel_num = simple_strtol(argv[1], NULL, 10);
|
||||
if ((channel_num != 1) && (channel_num != 2)) {
|
||||
printf("mtc digin: invalid parameter - must be '1' or '2'\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(&pcmd, 0, sizeof(pcmd));
|
||||
memset(&prx, 0, sizeof(prx));
|
||||
|
||||
pcmd.cmd = CMD_GET_VIM;
|
||||
|
||||
mtc_calculate_checksum(&pcmd);
|
||||
err = spi_xfer(NULL, MTC_TRANSFER_SIZE, &pcmd, &prx,
|
||||
SPI_XFER_BEGIN | SPI_XFER_END);
|
||||
|
||||
if (!err) {
|
||||
/* function returns '0' when digin is on */
|
||||
err = (prx.input & channel_num) ? 0 : 1;
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int do_mtc_appreg(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
tx_msp_cmd pcmd;
|
||||
rx_msp_cmd prx;
|
||||
int err;
|
||||
char buf[5];
|
||||
|
||||
/* read appreg */
|
||||
memset(&pcmd, 0, sizeof(pcmd));
|
||||
memset(&prx, 0, sizeof(prx));
|
||||
|
||||
pcmd.cmd = CMD_WD_PARA;
|
||||
pcmd.cmd_val0 = 5; /* max. Count */
|
||||
pcmd.cmd_val1 = 5; /* max. Time */
|
||||
pcmd.cmd_val2 = 0; /* =0 means read appreg */
|
||||
|
||||
mtc_calculate_checksum(&pcmd);
|
||||
err = spi_xfer(NULL, MTC_TRANSFER_SIZE, &pcmd, &prx,
|
||||
SPI_XFER_BEGIN | SPI_XFER_END);
|
||||
if (!err) {
|
||||
sprintf(buf, "%d", prx.ack2);
|
||||
setenv("appreg", buf);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int do_mtc_version(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
tx_msp_cmd pcmd;
|
||||
rx_msp_cmd prx;
|
||||
int err = 0;
|
||||
|
||||
memset(&pcmd, 0, sizeof(pcmd));
|
||||
memset(&prx, 0, sizeof(prx));
|
||||
|
||||
pcmd.cmd = CMD_FW_VERSION;
|
||||
|
||||
mtc_calculate_checksum(&pcmd);
|
||||
err = spi_xfer(NULL, MTC_TRANSFER_SIZE, &pcmd, &prx,
|
||||
SPI_XFER_BEGIN | SPI_XFER_END);
|
||||
|
||||
if (!err) {
|
||||
printf("FW V%d.%d.%d / HW %d\n",
|
||||
prx.ack0, prx.ack1, prx.ack3, prx.ack2);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int do_mtc_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||
|
||||
cmd_tbl_t cmd_mtc_sub[] = {
|
||||
U_BOOT_CMD_MKENT(led, 3, 1, do_mtc_led,
|
||||
"set state of leds",
|
||||
"[ledname] [state] [blink]\n"
|
||||
" - lednames: diag can1 can2 can3 can4 usbpwr usbbusy user1 user2\n"
|
||||
" - state: off red green orange\n"
|
||||
" - blink: blink interval in 100ms steps (1 - 10; 0 = static)\n"),
|
||||
U_BOOT_CMD_MKENT(key, 0, 1, do_mtc_key,
|
||||
"returns state of user key\n", ""),
|
||||
U_BOOT_CMD_MKENT(version, 0, 1, do_mtc_version,
|
||||
"returns firmware version of supervisor uC\n", ""),
|
||||
U_BOOT_CMD_MKENT(appreg, 0, 1, do_mtc_appreg,
|
||||
"reads appreg value and stores in environment variable 'appreg'\n", ""),
|
||||
U_BOOT_CMD_MKENT(digin, 1, 1, do_mtc_digin,
|
||||
"returns state of digital input",
|
||||
"<channel_num> - get state of digital input (1 or 2)\n"),
|
||||
U_BOOT_CMD_MKENT(digout, 2, 1, do_mtc_digout,
|
||||
"sets digital outputs",
|
||||
"<on|off> <on|off>- set state of digital output 1 and 2\n"),
|
||||
U_BOOT_CMD_MKENT(help, 4, 1, do_mtc_help, "get help",
|
||||
"[command] - get help for command\n"),
|
||||
};
|
||||
|
||||
static int do_mtc_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
extern int _do_help(cmd_tbl_t *cmd_start, int cmd_items,
|
||||
cmd_tbl_t *cmdtp, int flag,
|
||||
int argc, char *argv[]);
|
||||
#ifdef CONFIG_SYS_LONGHELP
|
||||
puts("mtc ");
|
||||
#endif
|
||||
return _do_help(&cmd_mtc_sub[0],
|
||||
ARRAY_SIZE(cmd_mtc_sub), cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
/* Relocate the command table function pointers when running in RAM */
|
||||
int mtc_cmd_init_r(void)
|
||||
{
|
||||
cmd_tbl_t *cmdtp;
|
||||
|
||||
for (cmdtp = &cmd_mtc_sub[0]; cmdtp !=
|
||||
&cmd_mtc_sub[ARRAY_SIZE(cmd_mtc_sub)]; cmdtp++) {
|
||||
ulong addr;
|
||||
|
||||
addr = (ulong)(cmdtp->cmd) + gd->reloc_off;
|
||||
cmdtp->cmd =
|
||||
(int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
|
||||
|
||||
addr = (ulong)(cmdtp->name) + gd->reloc_off;
|
||||
cmdtp->name = (char *)addr;
|
||||
|
||||
if (cmdtp->usage) {
|
||||
addr = (ulong)(cmdtp->usage) + gd->reloc_off;
|
||||
cmdtp->usage = (char *)addr;
|
||||
}
|
||||
#ifdef CONFIG_SYS_LONGHELP
|
||||
if (cmdtp->help) {
|
||||
addr = (ulong)(cmdtp->help) + gd->reloc_off;
|
||||
cmdtp->help = (char *)addr;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cmd_mtc(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
cmd_tbl_t *c;
|
||||
int err = 0;
|
||||
|
||||
c = find_cmd_tbl(argv[1], &cmd_mtc_sub[0], ARRAY_SIZE(cmd_mtc_sub));
|
||||
if (c) {
|
||||
argc--;
|
||||
argv++;
|
||||
return c->cmd(c, flag, argc, argv);
|
||||
} else {
|
||||
/* Unrecognized command */
|
||||
cmd_usage(cmdtp);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
U_BOOT_CMD(mtc, 5, 1, cmd_mtc,
|
||||
"mtc - special commands for digsyMTC\n",
|
||||
"[subcommand] [args...]\n"
|
||||
"Subcommands list:\n"
|
||||
"led [ledname] [state] [blink] - set state of leds\n"
|
||||
" [ledname]: diag can1 can2 can3 can4 usbpwr usbbusy user1 user2\n"
|
||||
" [state]: off red green orange\n"
|
||||
" [blink]: blink interval in 100ms steps (1 - 10; 0 = static)\n"
|
||||
"key - returns state of user key\n"
|
||||
"version - returns firmware version of supervisor uC\n"
|
||||
"appreg - reads appreg value and stores in environment variable"
|
||||
" 'appreg'\n"
|
||||
"digin [channel] - returns state of digital input (1 or 2)\n"
|
||||
"digout <on|off> <on|off> - sets state of two digital outputs\n"
|
||||
"help [subcommand] - get help for subcommand\n");
|
||||
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
/*
|
||||
* (C) Copyright 2009
|
||||
* Werner Pfister <Pfister_Werner@intercontrol.de>
|
||||
*
|
||||
* (C) Copyright 2009 Semihalf, Grzegorz Bernacki
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef CMD_MTC_H
|
||||
#define CMD_MTC_H
|
||||
|
||||
#define CMD_WD_PARA 0x02
|
||||
#define CMD_FW_VERSION 0x10
|
||||
#define CMD_GET_VIM 0x30
|
||||
#define CMD_SET_LED 0x40
|
||||
|
||||
typedef struct {
|
||||
u8 cmd;
|
||||
u8 sys_in;
|
||||
u8 cmd_val0;
|
||||
u8 cmd_val1;
|
||||
u8 cmd_val2;
|
||||
u8 user_out;
|
||||
u8 cks;
|
||||
u8 dummy1;
|
||||
u8 dummy2;
|
||||
} tx_msp_cmd;
|
||||
|
||||
typedef struct {
|
||||
u8 input;
|
||||
u8 state;
|
||||
u8 ack2;
|
||||
u8 ack3;
|
||||
u8 ack0;
|
||||
u8 ack1;
|
||||
u8 ack;
|
||||
u8 dummy;
|
||||
u8 cks;
|
||||
} rx_msp_cmd;
|
||||
|
||||
#define MTC_TRANSFER_SIZE (sizeof(tx_msp_cmd) * 8)
|
||||
|
||||
#endif
|
||||
|
|
@ -186,6 +186,9 @@ int checkboard(void)
|
|||
|
||||
int board_early_init_r(void)
|
||||
{
|
||||
#ifdef CONFIG_MPC52XX_SPI
|
||||
struct mpc5xxx_gpt *gpt = (struct mpc5xxx_gpt*)MPC5XXX_GPT;
|
||||
#endif
|
||||
/*
|
||||
* Now, when we are in RAM, enable flash write access for detection
|
||||
* process. Note that CS_BOOT cannot be cleared when executing in
|
||||
|
|
@ -202,6 +205,13 @@ int board_early_init_r(void)
|
|||
/* Low level USB init, required for proper kernel operation */
|
||||
usb_cpu_init();
|
||||
#endif
|
||||
#ifdef CONFIG_MPC52XX_SPI
|
||||
/* GPT 6 Output Enable */
|
||||
out_be32(&gpt[6].emsr, 0x00000034);
|
||||
/* GPT 7 Output Enable */
|
||||
out_be32(&gpt[7].emsr, 0x00000034);
|
||||
#endif
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
|
@ -230,6 +240,7 @@ void board_get_enetaddr (uchar * enet)
|
|||
|
||||
int misc_init_r(void)
|
||||
{
|
||||
extern int mtc_cmd_init_r (void);
|
||||
uchar enetaddr[6];
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
|
||||
|
|
@ -237,6 +248,7 @@ int misc_init_r(void)
|
|||
eth_setenv_enetaddr("ethaddr", enetaddr);
|
||||
}
|
||||
|
||||
mtc_cmd_init_r();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ LIB := $(obj)libspi.a
|
|||
COBJS-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o
|
||||
COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o
|
||||
COBJS-$(CONFIG_BFIN_SPI) += bfin_spi.o
|
||||
COBJS-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o
|
||||
COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
|
||||
COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o
|
||||
COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,109 @@
|
|||
/*
|
||||
* (C) Copyright 2009
|
||||
* Frank Bodammer <frank.bodammer@gcd-solutions.de>
|
||||
* (C) Copyright 2009 Semihalf, Grzegorz Bernacki
|
||||
*
|
||||
* 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 <asm/io.h>
|
||||
#include <malloc.h>
|
||||
#include <spi.h>
|
||||
#include <mpc5xxx.h>
|
||||
|
||||
void spi_init(void)
|
||||
{
|
||||
struct mpc5xxx_spi *spi = (struct mpc5xxx_spi *)MPC5XXX_SPI;
|
||||
/*
|
||||
* Its important to use the correct order when initializing the
|
||||
* registers
|
||||
*/
|
||||
out_8(&spi->ddr, 0x0F); /* set all SPI pins as output */
|
||||
out_8(&spi->pdr, 0x00); /* set SS low */
|
||||
/* SPI is master, SS is general purpose output */
|
||||
out_8(&spi->cr1, SPI_CR_MSTR | SPI_CR_SPE);
|
||||
out_8(&spi->cr2, 0x00); /* normal operation */
|
||||
out_8(&spi->brr, 0x77); /* baud rate: IPB clock / 2048 */
|
||||
}
|
||||
|
||||
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
|
||||
unsigned int max_hz, unsigned int mode)
|
||||
{
|
||||
struct spi_slave *slave;
|
||||
|
||||
slave = malloc(sizeof(struct spi_slave));
|
||||
if (!slave)
|
||||
return NULL;
|
||||
|
||||
slave->bus = bus;
|
||||
slave->cs = cs;
|
||||
|
||||
return slave;
|
||||
}
|
||||
|
||||
void spi_free_slave(struct spi_slave *slave)
|
||||
{
|
||||
free(slave);
|
||||
}
|
||||
|
||||
int spi_claim_bus(struct spi_slave *slave)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void spi_release_bus(struct spi_slave *slave)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
|
||||
void *din, unsigned long flags)
|
||||
{
|
||||
struct mpc5xxx_spi *spi = (struct mpc5xxx_spi *)MPC5XXX_SPI;
|
||||
int i, iter = bitlen >> 3;
|
||||
const uchar *txp = dout;
|
||||
uchar *rxp = din;
|
||||
|
||||
debug("spi_xfer: slave %u:%u dout %08X din %08X bitlen %u\n",
|
||||
slave->bus, slave->cs, *(uint *) dout, *(uint *) din, bitlen);
|
||||
|
||||
if (flags & SPI_XFER_BEGIN)
|
||||
setbits_8(&spi->pdr, SPI_PDR_SS);
|
||||
|
||||
for (i = 0; i < iter; i++) {
|
||||
udelay(1000);
|
||||
debug("spi_xfer: sending %x\n", txp[i]);
|
||||
out_8(&spi->dr, txp[i]);
|
||||
while (!(in_8(&spi->sr) & SPI_SR_SPIF)) {
|
||||
udelay(1000);
|
||||
if (in_8(&spi->sr) & SPI_SR_WCOL) {
|
||||
rxp[i] = in_8(&spi->dr);
|
||||
puts("spi_xfer: write collision\n");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
rxp[i] = in_8(&spi->dr);
|
||||
debug("spi_xfer: received %x\n", rxp[i]);
|
||||
}
|
||||
if (flags & SPI_XFER_END)
|
||||
clrbits_8(&spi->pdr, SPI_PDR_SS);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -100,6 +100,7 @@
|
|||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_REGINFO
|
||||
#define CONFIG_CMD_SAVES
|
||||
#define CONFIG_CMD_SPI
|
||||
#define CONFIG_CMD_USB
|
||||
|
||||
#if (TEXT_BASE == 0xFF000000)
|
||||
|
|
@ -136,6 +137,12 @@
|
|||
"protect on FFF00000 +${filesize}\0" \
|
||||
""
|
||||
|
||||
/*
|
||||
* SPI configuration
|
||||
*/
|
||||
#define CONFIG_HARD_SPI 1
|
||||
#define CONFIG_MPC52XX_SPI 1
|
||||
|
||||
/*
|
||||
* I2C configuration
|
||||
*/
|
||||
|
|
@ -241,6 +248,22 @@
|
|||
|
||||
/*
|
||||
* GPIO configuration
|
||||
* use pin gpio_wkup_6 as second SDRAM chip select (mem_cs1)
|
||||
* Bit 0 (mask 0x80000000) : 0x1
|
||||
* SPI on Tmr2/3/4/5 pins
|
||||
* Bit 2:3 (mask 0x30000000) : 0x2
|
||||
* ATA cs0/1 on csb_4/5
|
||||
* Bit 6:7 (mask 0x03000000) : 0x2
|
||||
* Ethernet 100Mbit with MD
|
||||
* Bits 12:15 (mask 0x000f0000): 0x5
|
||||
* USB - Two UARTs
|
||||
* Bits 18:19 (mask 0x00003000) : 0x2
|
||||
* PSC3 - USB2 on PSC3
|
||||
* Bits 20:23 (mask 0x00000f00) : 0x1
|
||||
* PSC2 - CAN1&2 on PSC2 pins
|
||||
* Bits 25:27 (mask 0x00000070) : 0x1
|
||||
* PSC1 - AC97 functionality
|
||||
* Bits 29:31 (mask 0x00000007) : 0x2
|
||||
*/
|
||||
#define CONFIG_SYS_GPS_PORT_CONFIG 0xA2552112
|
||||
|
||||
|
|
|
|||
|
|
@ -392,6 +392,24 @@
|
|||
#define I2C_IF 0x02
|
||||
#define I2C_RXAK 0x01
|
||||
|
||||
/* SPI control register 1 bits */
|
||||
#define SPI_CR_LSBFE 0x01
|
||||
#define SPI_CR_SSOE 0x02
|
||||
#define SPI_CR_CPHA 0x04
|
||||
#define SPI_CR_CPOL 0x08
|
||||
#define SPI_CR_MSTR 0x10
|
||||
#define SPI_CR_SWOM 0x20
|
||||
#define SPI_CR_SPE 0x40
|
||||
#define SPI_CR_SPIE 0x80
|
||||
|
||||
/* SPI status register bits */
|
||||
#define SPI_SR_MODF 0x10
|
||||
#define SPI_SR_WCOL 0x40
|
||||
#define SPI_SR_SPIF 0x80
|
||||
|
||||
/* SPI port data register bits */
|
||||
#define SPI_PDR_SS 0x08
|
||||
|
||||
/* Programmable Serial Controller (PSC) status register bits */
|
||||
#define PSC_SR_CDE 0x0080
|
||||
#define PSC_SR_RXRDY 0x0100
|
||||
|
|
|
|||
Loading…
Reference in New Issue