Commit a2718383 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A collection of mostly unremarkable fixes for SPI that have built up
  since the merge window, all driver specific.

  The change to the qup adding support for GPIO chip selects is fixing a
  regression due to the removal of legacy GPIO handling, the driver had
  previously been silently relying on the legacy GPIO support in a
  slightly broken way which worked well enough on some systems. Fixing
  it is simply a case of setting a couple of bits of information in the
  driver description"

* tag 'spi-fix-v6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: aspeed: Fix window offset of CE1
  spi: qup: support using GPIO as chip select line
  spi: intel: Fix the offset to get the 64K erase opcode
  spi: aspeed: Fix typo in mode_bits field for AST2600 platform
  spi: mpc52xx: Replace NO_IRQ by 0
  spi: spi-mem: Fix typo (of -> or)
  spi: spi-gxp: fix typo in SPDX identifier line
  spi: tegra210-quad: Fix combined sequence
parents 98555239 f8aa6c89

drivers/spi/spi-aspeed-smc.c

+3 −3
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static void aspeed_spi_get_windows(struct aspeed_spi *aspi, 
		windows[cs].cs = cs;

		windows[cs].size = data->segment_end(aspi, reg_val) -

			data->segment_start(aspi, reg_val);

		windows[cs].offset = cs ? windows[cs - 1].offset + windows[cs - 1].size : 0;

		windows[cs].offset = data->segment_start(aspi, reg_val) - aspi->ahb_base_phy;

		dev_vdbg(aspi->dev, "CE%d offset=0x%.8x size=0x%x\n", cs,

			 windows[cs].offset, windows[cs].size);

	}
@@ -1163,7 +1163,7 @@ static const struct aspeed_spi_data ast2500_spi_data = { 
static const struct aspeed_spi_data ast2600_fmc_data = {

	.max_cs	       = 3,

	.hastype       = false,

	.mode_bits     = SPI_RX_QUAD | SPI_RX_QUAD,

	.mode_bits     = SPI_RX_QUAD | SPI_TX_QUAD,

	.we0	       = 16,

	.ctl0	       = CE0_CTRL_REG,

	.timing	       = CE0_TIMING_COMPENSATION_REG,
@@ -1178,7 +1178,7 @@ static const struct aspeed_spi_data ast2600_fmc_data = { 
static const struct aspeed_spi_data ast2600_spi_data = {

	.max_cs	       = 2,

	.hastype       = false,

	.mode_bits     = SPI_RX_QUAD | SPI_RX_QUAD,

	.mode_bits     = SPI_RX_QUAD | SPI_TX_QUAD,

	.we0	       = 16,

	.ctl0	       = CE0_CTRL_REG,

	.timing	       = CE0_TIMING_COMPENSATION_REG,

drivers/spi/spi-gxp.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0=or-later

// SPDX-License-Identifier: GPL-2.0-or-later

/* Copyright (C) 2022 Hewlett-Packard Development Company, L.P. */



#include <linux/iopoll.h>

drivers/spi/spi-intel.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ 
#define ERASE_OPCODE_SHIFT		8

#define ERASE_OPCODE_MASK		(0xff << ERASE_OPCODE_SHIFT)

#define ERASE_64K_OPCODE_SHIFT		16

#define ERASE_64K_OPCODE_MASK		(0xff << ERASE_OPCODE_SHIFT)

#define ERASE_64K_OPCODE_MASK		(0xff << ERASE_64K_OPCODE_SHIFT)



/* Flash descriptor fields */

#define FLVALSIG_MAGIC			0x0ff0a55a

drivers/spi/spi-mpc52xx.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ mpc52xx_spi_fsmstate_idle(int irq, struct mpc52xx_spi *ms, u8 status, u8 data) 
	int spr, sppr;

	u8 ctrl1;



	if (status && (irq != NO_IRQ))

	if (status && irq)

		dev_err(&ms->master->dev, "spurious irq, status=0x%.2x\n",

			status);

drivers/spi/spi-qup.c

+2 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,8 @@ static int spi_qup_probe(struct platform_device *pdev) 
	else

		master->num_chipselect = num_cs;



	master->use_gpio_descriptors = true;

	master->max_native_cs = SPI_NUM_CHIPSELECTS;

	master->bus_num = pdev->id;

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;

	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);