openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

ch347_spi: Add spi clock frequency selection

Browse Source 
CH347 SPI interface supports up to 60M.
For example, to set a 30M spi rate, use -p ch347_spi:spispeed=30M.

Change-Id: If2be48929db540a6598ac0b60b37e64597156db7
Signed-off-by: ZhiYuanNJ Liu <871238103@qq.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/82776
Reviewed-by: Nicholas Chin <nic.c3.14@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
This commit is contained in:
ZhiYuanNJ 2024-06-03 15:38:05 +08:00 committed by Anastasia Klimchuk
parent 6ccfef8ccd
commit 00e02a6184
2 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ch347_spi.c
View File

@ -51,6 +51,11 @@ struct ch347_spi_data {
int interface; int interface;
}; };
struct device_speeds {
const char *name;
const int divisor;
};
/* TODO: Add support for HID mode */ /* TODO: Add support for HID mode */
static const struct dev_entry devs_ch347_spi[] = { static const struct dev_entry devs_ch347_spi[] = {
{0x1A86, 0x55DB, OK, "QinHeng Electronics", "USB To UART+SPI+I2C"}, /* CH347T */ {0x1A86, 0x55DB, OK, "QinHeng Electronics", "USB To UART+SPI+I2C"}, /* CH347T */
@ -63,6 +68,18 @@ static int ch347_interface[] = {
CH347F_IFACE, CH347F_IFACE,
}; };
static const struct device_speeds spispeeds[] = {
{"60M", 0},
{"30M", 1},
{"15M", 2},
{"7.5M", 3},
{"3.75M", 4},
{"1.875M", 5},
{"937.5K", 6},
{"468.75K", 7},
{NULL, 0}
};
static int ch347_spi_shutdown(void *data) static int ch347_spi_shutdown(void *data)
{ {
struct ch347_spi_data *ch347_data = data; struct ch347_spi_data *ch347_data = data;
@ -266,9 +283,11 @@ static const struct spi_master spi_master_ch347_spi = {
/* Largely copied from ch341a_spi.c */ /* Largely copied from ch341a_spi.c */
static int ch347_spi_init(const struct programmer_cfg *cfg) static int ch347_spi_init(const struct programmer_cfg *cfg)
{ {
char *arg;
uint16_t vid = devs_ch347_spi[0].vendor_id; uint16_t vid = devs_ch347_spi[0].vendor_id;
uint16_t pid = 0; uint16_t pid = 0;
int index = 0; int index = 0;
int speed_index = 2;
struct ch347_spi_data *ch347_data = calloc(1, sizeof(*ch347_data)); struct ch347_spi_data *ch347_data = calloc(1, sizeof(*ch347_data));
if (!ch347_data) { if (!ch347_data) {
msg_perr("Could not allocate space for SPI data\n"); msg_perr("Could not allocate space for SPI data\n");
@ -332,9 +351,25 @@ static int ch347_spi_init(const struct programmer_cfg *cfg)
(desc.bcdDevice >> 4) & 0x000F, (desc.bcdDevice >> 4) & 0x000F,
(desc.bcdDevice >> 0) & 0x000F); (desc.bcdDevice >> 0) & 0x000F);
/* TODO: add programmer cfg for things like CS pin and divisor */ /* set CH347 clock division */
if (ch347_spi_config(ch347_data, 2) < 0) arg = extract_programmer_param_str(cfg, "spispeed");
if (arg) {
for (speed_index = 0; spispeeds[speed_index].name; speed_index++) {
if (!strncasecmp(spispeeds[speed_index].name, arg, strlen(spispeeds[speed_index].name))) {
break;
}
}
}
if (!spispeeds[speed_index].name || !arg) {
msg_perr("Unknown value of spispeed parameter, using default 15MHz clock spi.\n");
speed_index = 2;
}
free(arg);
if (ch347_spi_config(ch347_data, spispeeds[speed_index].divisor) < 0) {
goto error_exit; goto error_exit;
} else {
msg_pinfo("CH347 SPI clock set to %sHz.\n", spispeeds[speed_index].name);
}
return register_spi_master(&spi_master_ch347_spi, ch347_data); return register_spi_master(&spi_master_ch347_spi, ch347_data);
@ -348,4 +383,4 @@ const struct programmer_entry programmer_ch347_spi = {
.type = USB, .type = USB,
.devs.dev = devs_ch347_spi, .devs.dev = devs_ch347_spi,
.init = ch347_spi_init, .init = ch347_spi_init,
}; };

10
doc/classic_cli_manpage.rst
View File

@ -1035,8 +1035,14 @@ as per the device.
ch347_spi programmer ch347_spi programmer
^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
The WCH CH347 programmer does not currently support any parameters. SPI frequency is fixed at 2 MHz, and CS0 is used An optional ``spispeed`` parameter could be used to specify the SPI speed. This parameter is available for the CH347T and CH347F device.
as per the device. The default SPI speed is 15MHz if no value is specified.
Syntax is::
flashrom -p ch347_spi:spispeed=value
where ``value`` can be ``60M``, ``30M``, ``15M``, ``7.5M``, ``3.75M``, ``1.875M``, ``937.5K``, ``468.75K``.
ni845x_spi programmer ni845x_spi programmer
^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^