mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-26 11:58:52 +09:00
![Lukasz Majewski](/assets/img/avatar_default.png)
This change allows more fine tuning of driver model based SPI support in SPL and TPL. It is now possible to explicitly enable/disable the DM_SPI support in SPL and TPL via Kconfig option. Before this change it was necessary to use: /* SPI Flash Configs */ #if defined(CONFIG_SPL_BUILD) #undef CONFIG_DM_SPI #undef CONFIG_DM_SPI_FLASH #undef CONFIG_SPI_FLASH_MTD #endif in the ./include/configs/<board>.h, which is error prone and shall be avoided when we strive to switch to Kconfig. The goal of this patch: Provide distinction for DM_SPI support in both U-Boot proper and SPL (TPL). Valid use case is when U-Boot proper wants to use DM_SPI, but SPL must still support non DM driver. Another use case is the conversion of non DM/DTS SPI driver to support DM/DTS. When such driver needs to work in both SPL and U-Boot proper, the distinction is needed in Kconfig (also if SPL version of the driver supports OF_PLATDATA). In the end of the day one would have to support following use cases (in single driver file - e.g. mxs_spi.c): - U-Boot proper driver supporting DT/DTS - U-Boot proper driver without DT/DTS support (deprecated) - SPL driver without DT/DTS support - SPL (and TPL) driver with DT/DTS (when the SoC has enough resources to run full blown DT/DTS) - SPL driver with DT/DTS and SPL_OF_PLATDATA (when one have constrained environment with no fitImage and OF_LIBFDT support). Some boards do require SPI support (with DM) in SPL (TPL) and some only have DM_SPI{_FLASH} defined to allow compiling SPL. This patch converts #ifdef CONFIG_DM_SPI* to #if CONFIG_IS_ENABLED(DM_SPI) and provides corresponding defines in Kconfig. Signed-off-by: Lukasz Majewski <lukma@denx.de> Tested-by: Adam Ford <aford173@gmail.com> #da850-evm Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> [trini: Fixup a few platforms] Signed-off-by: Tom Rini <trini@konsulko.com>
175 lines
3.7 KiB
C
175 lines
3.7 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2002
|
|
* Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
|
|
*/
|
|
|
|
/*
|
|
* SPI Read/Write Utilities
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <dm.h>
|
|
#include <errno.h>
|
|
#include <spi.h>
|
|
|
|
/*-----------------------------------------------------------------------
|
|
* Definitions
|
|
*/
|
|
|
|
#ifndef MAX_SPI_BYTES
|
|
# define MAX_SPI_BYTES 32 /* Maximum number of bytes we can handle */
|
|
#endif
|
|
|
|
/*
|
|
* Values from last command.
|
|
*/
|
|
static unsigned int bus;
|
|
static unsigned int cs;
|
|
static unsigned int mode;
|
|
static unsigned int freq;
|
|
static int bitlen;
|
|
static uchar dout[MAX_SPI_BYTES];
|
|
static uchar din[MAX_SPI_BYTES];
|
|
|
|
static int do_spi_xfer(int bus, int cs)
|
|
{
|
|
struct spi_slave *slave;
|
|
int ret = 0;
|
|
|
|
#if CONFIG_IS_ENABLED(DM_SPI)
|
|
char name[30], *str;
|
|
struct udevice *dev;
|
|
|
|
snprintf(name, sizeof(name), "generic_%d:%d", bus, cs);
|
|
str = strdup(name);
|
|
if (!str)
|
|
return -ENOMEM;
|
|
ret = spi_get_bus_and_cs(bus, cs, freq, mode, "spi_generic_drv",
|
|
str, &dev, &slave);
|
|
if (ret)
|
|
return ret;
|
|
#else
|
|
slave = spi_setup_slave(bus, cs, freq, mode);
|
|
if (!slave) {
|
|
printf("Invalid device %d:%d\n", bus, cs);
|
|
return -EINVAL;
|
|
}
|
|
#endif
|
|
|
|
ret = spi_claim_bus(slave);
|
|
if (ret)
|
|
goto done;
|
|
ret = spi_xfer(slave, bitlen, dout, din,
|
|
SPI_XFER_BEGIN | SPI_XFER_END);
|
|
#if !CONFIG_IS_ENABLED(DM_SPI)
|
|
/* We don't get an error code in this case */
|
|
if (ret)
|
|
ret = -EIO;
|
|
#endif
|
|
if (ret) {
|
|
printf("Error %d during SPI transaction\n", ret);
|
|
} else {
|
|
int j;
|
|
|
|
for (j = 0; j < ((bitlen + 7) / 8); j++)
|
|
printf("%02X", din[j]);
|
|
printf("\n");
|
|
}
|
|
done:
|
|
spi_release_bus(slave);
|
|
#if !CONFIG_IS_ENABLED(DM_SPI)
|
|
spi_free_slave(slave);
|
|
#endif
|
|
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* SPI read/write
|
|
*
|
|
* Syntax:
|
|
* spi {dev} {num_bits} {dout}
|
|
* {dev} is the device number for controlling chip select (see TBD)
|
|
* {num_bits} is the number of bits to send & receive (base 10)
|
|
* {dout} is a hexadecimal string of data to send
|
|
* The command prints out the hexadecimal string received via SPI.
|
|
*/
|
|
|
|
int do_spi(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
|
{
|
|
char *cp = 0;
|
|
uchar tmp;
|
|
int j;
|
|
|
|
/*
|
|
* We use the last specified parameters, unless new ones are
|
|
* entered.
|
|
*/
|
|
if (freq == 0)
|
|
freq = 1000000;
|
|
|
|
if ((flag & CMD_FLAG_REPEAT) == 0)
|
|
{
|
|
if (argc >= 2) {
|
|
mode = CONFIG_DEFAULT_SPI_MODE;
|
|
bus = simple_strtoul(argv[1], &cp, 10);
|
|
if (*cp == ':') {
|
|
cs = simple_strtoul(cp+1, &cp, 10);
|
|
} else {
|
|
cs = bus;
|
|
bus = CONFIG_DEFAULT_SPI_BUS;
|
|
}
|
|
if (*cp == '.')
|
|
mode = simple_strtoul(cp+1, &cp, 10);
|
|
if (*cp == '@')
|
|
freq = simple_strtoul(cp+1, &cp, 10);
|
|
}
|
|
if (argc >= 3)
|
|
bitlen = simple_strtoul(argv[2], NULL, 10);
|
|
if (argc >= 4) {
|
|
cp = argv[3];
|
|
for(j = 0; *cp; j++, cp++) {
|
|
tmp = *cp - '0';
|
|
if(tmp > 9)
|
|
tmp -= ('A' - '0') - 10;
|
|
if(tmp > 15)
|
|
tmp -= ('a' - 'A');
|
|
if(tmp > 15) {
|
|
printf("Hex conversion error on %c\n", *cp);
|
|
return 1;
|
|
}
|
|
if((j % 2) == 0)
|
|
dout[j / 2] = (tmp << 4);
|
|
else
|
|
dout[j / 2] |= tmp;
|
|
}
|
|
}
|
|
}
|
|
|
|
if ((bitlen < 0) || (bitlen > (MAX_SPI_BYTES * 8))) {
|
|
printf("Invalid bitlen %d\n", bitlen);
|
|
return 1;
|
|
}
|
|
|
|
if (do_spi_xfer(bus, cs))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/***************************************************/
|
|
|
|
U_BOOT_CMD(
|
|
sspi, 5, 1, do_spi,
|
|
"SPI utility command",
|
|
"[<bus>:]<cs>[.<mode>][@<freq>] <bit_len> <dout> - Send and receive bits\n"
|
|
"<bus> - Identifies the SPI bus\n"
|
|
"<cs> - Identifies the chip select\n"
|
|
"<mode> - Identifies the SPI mode to use\n"
|
|
"<freq> - Identifies the SPI bus frequency in Hz\n"
|
|
"<bit_len> - Number of bits to send (base 10)\n"
|
|
"<dout> - Hexadecimal string that gets sent"
|
|
);
|