From: Jagan Teki Date: Thu, 15 Dec 2016 16:36:47 +0000 (+0100) Subject: spi: Zap mpc52xx_spi.c, config and related code X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-favicon.png?a=commitdiff_plain;h=353f6a770f2ab50bdc38081e29e5ec5f586a05db;p=u-boot.git spi: Zap mpc52xx_spi.c, config and related code armada100_spi.c, related config options and related codes are zapping becuase of "no DM conversion". Cc: Werner Pfister Signed-off-by: Jagan Teki Reviewed-by: Tom Rini --- diff --git a/board/intercontrol/digsy_mtc/Makefile b/board/intercontrol/digsy_mtc/Makefile index fd0c2f9d16..4d13eadf5b 100644 --- a/board/intercontrol/digsy_mtc/Makefile +++ b/board/intercontrol/digsy_mtc/Makefile @@ -4,5 +4,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := digsy_mtc.o cmd_mtc.o +obj-y := digsy_mtc.o obj-$(CONFIG_VIDEO) += cmd_disp.o diff --git a/board/intercontrol/digsy_mtc/cmd_mtc.c b/board/intercontrol/digsy_mtc/cmd_mtc.c deleted file mode 100644 index f17ec55095..0000000000 --- a/board/intercontrol/digsy_mtc/cmd_mtc.c +++ /dev/null @@ -1,369 +0,0 @@ -/* - * (C) Copyright 2009 - * Werner Pfister - * - * (C) Copyright 2009 Semihalf, Grzegorz Bernacki - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#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", - " - get state of digital input (1 or 2)\n"), - U_BOOT_CMD_MKENT(digout, 2, 1, do_mtc_digout, - "sets digital outputs", - " - 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 - sets state of two digital outputs\n" - "state - displays state\n" - "help [subcommand] - get help for subcommand\n" -); diff --git a/board/intercontrol/digsy_mtc/cmd_mtc.h b/board/intercontrol/digsy_mtc/cmd_mtc.h deleted file mode 100644 index 449343386d..0000000000 --- a/board/intercontrol/digsy_mtc/cmd_mtc.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2009 - * Werner Pfister - * - * (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 diff --git a/board/intercontrol/digsy_mtc/digsy_mtc.c b/board/intercontrol/digsy_mtc/digsy_mtc.c index 2e52d51b6b..37eb6c7624 100644 --- a/board/intercontrol/digsy_mtc/digsy_mtc.c +++ b/board/intercontrol/digsy_mtc/digsy_mtc.c @@ -250,9 +250,6 @@ static inline void exbo_hw_init(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 @@ -269,12 +266,6 @@ 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); } diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig index 71fa0b77fb..66c3393ef2 100644 --- a/configs/digsy_mtc_RAMBOOT_defconfig +++ b/configs/digsy_mtc_RAMBOOT_defconfig @@ -13,7 +13,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y -CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig index 20491a4498..daf08ce3c5 100644 --- a/configs/digsy_mtc_defconfig +++ b/configs/digsy_mtc_defconfig @@ -11,7 +11,6 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR=" " CONFIG_LOOPW=y -CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig index 0db5f928b1..e55653bf03 100644 --- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig +++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig @@ -13,7 +13,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y -CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig index 713fa3d161..f1f5f2e771 100644 --- a/configs/digsy_mtc_rev5_defconfig +++ b/configs/digsy_mtc_rev5_defconfig @@ -13,7 +13,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y -CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 247c5f6558..70d2e49a96 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -35,7 +35,6 @@ obj-$(CONFIG_FSL_QSPI) += fsl_qspi.o obj-$(CONFIG_ICH_SPI) += ich.o obj-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o obj-$(CONFIG_LPC32XX_SSP) += lpc32xx_ssp.o -obj-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o obj-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o obj-$(CONFIG_MVEBU_A3700_SPI) += mvebu_a3700_spi.o obj-$(CONFIG_MXC_SPI) += mxc_spi.o diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c deleted file mode 100644 index 4613bec2aa..0000000000 --- a/drivers/spi/mpc52xx_spi.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * (C) Copyright 2009 - * Frank Bodammer - * (C) Copyright 2009 Semihalf, Grzegorz Bernacki - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include -#include - -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; -} diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index b2120b9b33..ae0d3d412a 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -215,12 +215,6 @@ #define CONFIG_BOOTCOMMAND "run mtcb_start" -/* - * SPI configuration - */ -#define CONFIG_HARD_SPI 1 -#define CONFIG_MPC52XX_SPI 1 - /* * I2C configuration */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8814841e1f..339c6fdfc9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3095,7 +3095,6 @@ CONFIG_MPC5121ADS_REV2 CONFIG_MPC512x_FEC CONFIG_MPC5200 CONFIG_MPC5200_DDR -CONFIG_MPC52XX_SPI CONFIG_MPC555 CONFIG_MPC5xxx_FEC CONFIG_MPC5xxx_FEC_MII10