Commit 831fe284 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull spi fixes from Mark Brown:
 "A couple of fairly minor driver specific fixes here, plus a bunch of
  maintainership and admin updates. Nothing too remarkable"

* tag 'spi-fix-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  mailmap: add entry for Jonas Gorski
  MAINTAINERS: add myself for spi-bcm63xx
  spi: s3c64xx: clear loopback bit after loopback test
  spi: bcm63xx: fix max prepend length
  MAINTAINERS: Add myself as a maintainer for Microchip SPI
parents 393ea781 54ccc875

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> 
John Stultz <johnstul@us.ibm.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>

<jon.toppins+linux@gmail.com> <jtoppins@redhat.com>

Jonas Gorski <jonas.gorski@gmail.com> <jogo@openwrt.org>

Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -4121,6 +4121,13 @@ F: Documentation/devicetree/bindings/spi/brcm,bcm63xx-hsspi.yaml 
F:	drivers/spi/spi-bcm63xx-hsspi.c

F:	drivers/spi/spi-bcmbca-hsspi.c









BROADCOM BCM6348/BCM6358 SPI controller DRIVER









M:	Jonas Gorski <jonas.gorski@gmail.com>









L:	linux-spi@vger.kernel.org









S:	Odd Fixes









F:	Documentation/devicetree/bindings/spi/spi-bcm63xx.txt









F:	drivers/spi/spi-bcm63xx.c

















BROADCOM ETHERNET PHY DRIVERS









M:	Florian Fainelli <florian.fainelli@broadcom.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>








@@ -13968,7 +13975,7 @@ T:	git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/







F:	drivers/soc/microchip/

















MICROCHIP SPI DRIVER









M:	Tudor Ambarus <tudor.ambarus@linaro.org>









M:	Ryan Wanner <ryan.wanner@microchip.com>









S:	Supported









F:	drivers/spi/spi-atmel.*








































drivers/spi/spi-bcm63xx.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -126,7 +126,7 @@ enum bcm63xx_regs_spi {







	SPI_MSG_DATA_SIZE,









};



















#define BCM63XX_SPI_MAX_PREPEND		15









#define BCM63XX_SPI_MAX_PREPEND		7



















#define BCM63XX_SPI_MAX_CS		8









#define BCM63XX_SPI_BUS_NUM		0
































drivers/spi/spi-s3c64xx.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -684,6 +684,8 @@ static int s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)

















	if ((sdd->cur_mode & SPI_LOOP) && sdd->port_conf->has_loopback)









		val |= S3C64XX_SPI_MODE_SELF_LOOPBACK;









	else









		val &= ~S3C64XX_SPI_MODE_SELF_LOOPBACK;



















	writel(val, regs + S3C64XX_SPI_MODE_CFG);