bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-05 23:05:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge existing fixes from spi/for-6.17 into new branch

Browse Source
This commit is contained in:
Mark Brown
2025-08-10 21:02:46 +01:00
parent 8f5ae30d69 13d0fe84a2
commit 5da3a0b010
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/spi/spi-fsl-lpspi.c
View File

@@ -330,13 +330,11 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)
}
if (config.speed_hz > perclk_rate / 2) {
dev_err(fsl_lpspi->dev,
"per-clk should be at least two times of transfer speed");
return -EINVAL;
div = 2;
} else {
div = DIV_ROUND_UP(perclk_rate, config.speed_hz);
}
div = DIV_ROUND_UP(perclk_rate, config.speed_hz);
for (prescale = 0; prescale <= prescale_max; prescale++) {
scldiv = div / (1 << prescale) - 2;
if (scldiv >= 0 && scldiv < 256) {

4
drivers/spi/spi-mem.c
View File

@@ -265,6 +265,9 @@ static bool spi_mem_internal_supports_op(struct spi_mem *mem,
*/
bool spi_mem_supports_op(struct spi_mem *mem, const struct spi_mem_op *op)
{
/* Make sure the operation frequency is correct before going futher */
spi_mem_adjust_op_freq(mem, (struct spi_mem_op *)op);
if (spi_mem_check_op(op))
return false;
@@ -577,6 +580,7 @@ EXPORT_SYMBOL_GPL(spi_mem_adjust_op_freq);
* spi_mem_calc_op_duration() - Derives the theoretical length (in ns) of an
* operation. This helps finding the best variant
* among a list of possible choices.
* @mem: the SPI memory
* @op: the operation to benchmark
*
* Some chips have per-op frequency limitations, PCBs usually have their own

22
drivers/spi/spi-qpic-snand.c
View File

@@ -210,13 +210,21 @@ static int qcom_spi_ooblayout_ecc(struct mtd_info *mtd, int section,
struct qcom_nand_controller *snandc = nand_to_qcom_snand(nand);
struct qpic_ecc *qecc = snandc->qspi->ecc;
if (section > 1)
return -ERANGE;
switch (section) {
case 0:
oobregion->offset = 0;
oobregion->length = qecc->bytes * (qecc->steps - 1) +
qecc->bbm_size;
return 0;
case 1:
oobregion->offset = qecc->bytes * (qecc->steps - 1) +
qecc->bbm_size +
qecc->steps * 4;
oobregion->length = mtd->oobsize - oobregion->offset;
return 0;
}
oobregion->length = qecc->ecc_bytes_hw + qecc->spare_bytes;
oobregion->offset = mtd->oobsize - oobregion->length;
return 0;
return -ERANGE;
}
static int qcom_spi_ooblayout_free(struct mtd_info *mtd, int section,
@@ -1196,7 +1204,7 @@ static int qcom_spi_program_oob(struct qcom_nand_controller *snandc,
u32 cfg0, cfg1, ecc_bch_cfg, ecc_buf_cfg;
cfg0 = (ecc_cfg->cfg0 & ~CW_PER_PAGE_MASK) |
FIELD_PREP(CW_PER_PAGE_MASK, num_cw - 1);
FIELD_PREP(CW_PER_PAGE_MASK, 0);
cfg1 = ecc_cfg->cfg1;
ecc_bch_cfg = ecc_cfg->ecc_bch_cfg;
ecc_buf_cfg = ecc_cfg->ecc_buf_cfg;