armada100_spi.c, related config options and related codes are zapping becuase of "no DM conversion". Cc: Werner Pfister <Pfister_Werner@intercontrol.de> Signed-off-by: Jagan Teki <jagan@openedev.com> Reviewed-by: Tom Rini <trini@konsulko.com>master
Jagan Teki
8 years ago
committed by
Jagan Teki
parent
4cf5c5f1e6
commit
353f6a770f
@ -1,369 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2009 |
||||
* Werner Pfister <Pfister_Werner@intercontrol.de> |
||||
* |
||||
* (C) Copyright 2009 Semihalf, Grzegorz Bernacki |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <command.h> |
||||
#include <mpc5xxx.h> |
||||
#include "spi.h" |
||||
#include "cmd_mtc.h" |
||||
|
||||
DECLARE_GLOBAL_DATA_PTR; |
||||
|
||||
static uchar user_out; |
||||
|
||||
static const char *led_names[] = { |
||||
"diag", |
||||
"can1", |
||||
"can2", |
||||
"can3", |
||||
"can4", |
||||
"usbpwr", |
||||
"usbbusy", |
||||
"user1", |
||||
"user2", |
||||
"" |
||||
}; |
||||
|
||||
static int msp430_xfer(const void *dout, void *din) |
||||
{ |
||||
int err; |
||||
|
||||
err = spi_xfer(NULL, MTC_TRANSFER_SIZE, dout, din, |
||||
SPI_XFER_BEGIN | SPI_XFER_END); |
||||
|
||||
/* The MSP chip needs time to ready itself for the next command */ |
||||
udelay(1000); |
||||
|
||||
return err; |
||||
} |
||||
|
||||
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 * const argv[]) |
||||
{ |
||||
tx_msp_cmd pcmd; |
||||
rx_msp_cmd prx; |
||||
int err; |
||||
int i; |
||||
|
||||
if (argc < 2) |
||||
return cmd_usage(cmdtp); |
||||
|
||||
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; |
||||
|
||||
pcmd.user_out = user_out; |
||||
|
||||
mtc_calculate_checksum(&pcmd); |
||||
err = msp430_xfer(&pcmd, &prx); |
||||
|
||||
return err; |
||||
} |
||||
|
||||
static int do_mtc_key(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) |
||||
{ |
||||
tx_msp_cmd pcmd; |
||||
rx_msp_cmd prx; |
||||
int err; |
||||
|
||||
memset(&pcmd, 0, sizeof(pcmd)); |
||||
memset(&prx, 0, sizeof(prx)); |
||||
|
||||
pcmd.cmd = CMD_GET_VIM; |
||||
pcmd.user_out = user_out; |
||||
|
||||
mtc_calculate_checksum(&pcmd); |
||||
err = msp430_xfer(&pcmd, &prx); |
||||
|
||||
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 * const argv[]) |
||||
{ |
||||
tx_msp_cmd pcmd; |
||||
rx_msp_cmd prx; |
||||
int err; |
||||
uchar channel_mask = 0; |
||||
|
||||
if (argc < 3) |
||||
return cmd_usage(cmdtp); |
||||
|
||||
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; |
||||
user_out = channel_mask; |
||||
|
||||
mtc_calculate_checksum(&pcmd); |
||||
err = msp430_xfer(&pcmd, &prx); |
||||
|
||||
return err; |
||||
} |
||||
|
||||
static int do_mtc_digin(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) |
||||
{ |
||||
tx_msp_cmd pcmd; |
||||
rx_msp_cmd prx; |
||||
int err; |
||||
uchar channel_num = 0; |
||||
|
||||
if (argc < 2) |
||||
return cmd_usage(cmdtp); |
||||
|
||||
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; |
||||
pcmd.user_out = user_out; |
||||
|
||||
mtc_calculate_checksum(&pcmd); |
||||
err = msp430_xfer(&pcmd, &prx); |
||||
|
||||
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 * const argv[]) |
||||
{ |
||||
tx_msp_cmd pcmd; |
||||
rx_msp_cmd prx; |
||||
int err; |
||||
char buf[5]; |
||||
uchar appreg; |
||||
|
||||
/* 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 */ |
||||
pcmd.user_out = user_out; |
||||
|
||||
mtc_calculate_checksum(&pcmd); |
||||
err = msp430_xfer(&pcmd, &prx); |
||||
|
||||
/* on success decide between read or write */ |
||||
if (!err) { |
||||
if (argc == 2) { |
||||
appreg = simple_strtol(argv[1], NULL, 10); |
||||
if (appreg == 0) { |
||||
printf("mtc appreg: invalid parameter - " |
||||
"must be between 1 and 255\n"); |
||||
return -1; |
||||
} |
||||
memset(&pcmd, 0, sizeof(pcmd)); |
||||
pcmd.cmd = CMD_WD_PARA; |
||||
pcmd.cmd_val0 = prx.ack3; /* max. Count */ |
||||
pcmd.cmd_val1 = prx.ack0; /* max. Time */ |
||||
pcmd.cmd_val2 = appreg; /* !=0 means write appreg */ |
||||
pcmd.user_out = user_out; |
||||
memset(&prx, 0, sizeof(prx)); |
||||
|
||||
mtc_calculate_checksum(&pcmd); |
||||
err = msp430_xfer(&pcmd, &prx); |
||||
} else { |
||||
sprintf(buf, "%d", prx.ack2); |
||||
setenv("appreg", buf); |
||||
} |
||||
} |
||||
|
||||
return err; |
||||
} |
||||
|
||||
static int do_mtc_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) |
||||
{ |
||||
tx_msp_cmd pcmd; |
||||
rx_msp_cmd prx; |
||||
int err; |
||||
|
||||
memset(&pcmd, 0, sizeof(pcmd)); |
||||
memset(&prx, 0, sizeof(prx)); |
||||
|
||||
pcmd.cmd = CMD_FW_VERSION; |
||||
pcmd.user_out = user_out; |
||||
|
||||
mtc_calculate_checksum(&pcmd); |
||||
err = msp430_xfer(&pcmd, &prx); |
||||
|
||||
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_state(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) |
||||
{ |
||||
tx_msp_cmd pcmd; |
||||
rx_msp_cmd prx; |
||||
int err; |
||||
|
||||
memset(&pcmd, 0, sizeof(pcmd)); |
||||
memset(&prx, 0, sizeof(prx)); |
||||
|
||||
pcmd.cmd = CMD_WD_WDSTATE; |
||||
pcmd.cmd_val2 = 1; |
||||
pcmd.user_out = user_out; |
||||
|
||||
mtc_calculate_checksum(&pcmd); |
||||
err = msp430_xfer(&pcmd, &prx); |
||||
|
||||
if (!err) { |
||||
printf("State %02Xh\n", prx.state); |
||||
printf("Input %02Xh\n", prx.input); |
||||
printf("UserWD %02Xh\n", prx.ack2); |
||||
printf("Sys WD %02Xh\n", prx.ack3); |
||||
printf("WD Timout %02Xh\n", prx.ack0); |
||||
printf("eSysState %02Xh\n", prx.ack1); |
||||
} |
||||
|
||||
return err; |
||||
} |
||||
|
||||
static int do_mtc_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const 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", ""), |
||||
U_BOOT_CMD_MKENT(version, 0, 1, do_mtc_version, |
||||
"returns firmware version of supervisor uC", ""), |
||||
U_BOOT_CMD_MKENT(appreg, 1, 1, do_mtc_appreg, |
||||
"reads or writes appreg value and stores in environment " |
||||
"variable 'appreg'", |
||||
"[value] - value (1 - 255) to write to appreg"), |
||||
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(state, 0, 1, do_mtc_state, |
||||
"displays state", ""), |
||||
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 * const argv[]) |
||||
{ |
||||
extern int _do_help(cmd_tbl_t *cmd_start, int cmd_items, |
||||
cmd_tbl_t *cmdtp, int flag, |
||||
int argc, char * const argv[]); |
||||
#ifdef CONFIG_SYS_LONGHELP |
||||
puts("mtc "); |
||||
#endif |
||||
return _do_help(&cmd_mtc_sub[0], |
||||
ARRAY_SIZE(cmd_mtc_sub), cmdtp, flag, argc, argv); |
||||
} |
||||
|
||||
int cmd_mtc(cmd_tbl_t *cmdtp, int flag, int argc, char * const 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 */ |
||||
return cmd_usage(cmdtp); |
||||
} |
||||
|
||||
return err; |
||||
} |
||||
|
||||
U_BOOT_CMD(mtc, 5, 1, cmd_mtc, |
||||
"special commands for digsyMTC", |
||||
"[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 [value] - reads (in environment variable 'appreg') or writes" |
||||
" appreg value\n" |
||||
" [value]: value (1 - 255) to write to 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" |
||||
"state - displays state\n" |
||||
"help [subcommand] - get help for subcommand\n" |
||||
); |
||||
@ -1,45 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2009 |
||||
* Werner Pfister <Pfister_Werner@intercontrol.de> |
||||
* |
||||
* (C) Copyright 2009 Semihalf, Grzegorz Bernacki |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef CMD_MTC_H |
||||
#define CMD_MTC_H |
||||
|
||||
#define CMD_WD_PARA 0x02 |
||||
#define CMD_WD_WDSTATE 0x04 |
||||
#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 |
||||
@ -1,90 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2009 |
||||
* Frank Bodammer <frank.bodammer@gcd-solutions.de> |
||||
* (C) Copyright 2009 Semihalf, Grzegorz Bernacki |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#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 = spi_alloc_slave_base(bus, cs); |
||||
if (!slave) |
||||
return NULL; |
||||
|
||||
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; |
||||
} |
||||
Loading…
Reference in new issue