tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 831fe284 393ea781

+12 -2
+1
.mailmap
··· 246 246 John Stultz <johnstul@us.ibm.com> 247 247 <jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com> 248 248 <jon.toppins+linux@gmail.com> <jtoppins@redhat.com> 249 + Jonas Gorski <jonas.gorski@gmail.com> <jogo@openwrt.org> 249 250 Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org> 250 251 <josh@joshtriplett.org> <josh@freedesktop.org> 251 252 <josh@joshtriplett.org> <josh@kernel.org>
+8 -1
MAINTAINERS
··· 4121 4121 F: drivers/spi/spi-bcm63xx-hsspi.c 4122 4122 F: drivers/spi/spi-bcmbca-hsspi.c 4123 4123 4124 + BROADCOM BCM6348/BCM6358 SPI controller DRIVER 4125 + M: Jonas Gorski <jonas.gorski@gmail.com> 4126 + L: linux-spi@vger.kernel.org 4127 + S: Odd Fixes 4128 + F: Documentation/devicetree/bindings/spi/spi-bcm63xx.txt 4129 + F: drivers/spi/spi-bcm63xx.c 4130 + 4124 4131 BROADCOM ETHERNET PHY DRIVERS 4125 4132 M: Florian Fainelli <florian.fainelli@broadcom.com> 4126 4133 R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> ··· 13975 13968 F: drivers/soc/microchip/ 13976 13969 13977 13970 MICROCHIP SPI DRIVER 13978 - M: Tudor Ambarus <tudor.ambarus@linaro.org> 13971 + M: Ryan Wanner <ryan.wanner@microchip.com> 13979 13972 S: Supported 13980 13973 F: drivers/spi/spi-atmel.* 13981 13974
+1 -1
drivers/spi/spi-bcm63xx.c
··· 126 126 SPI_MSG_DATA_SIZE, 127 127 }; 128 128 129 - #define BCM63XX_SPI_MAX_PREPEND 15 129 + #define BCM63XX_SPI_MAX_PREPEND 7 130 130 131 131 #define BCM63XX_SPI_MAX_CS 8 132 132 #define BCM63XX_SPI_BUS_NUM 0
+2
drivers/spi/spi-s3c64xx.c
··· 684 684 685 685 if ((sdd->cur_mode & SPI_LOOP) && sdd->port_conf->has_loopback) 686 686 val |= S3C64XX_SPI_MODE_SELF_LOOPBACK; 687 + else 688 + val &= ~S3C64XX_SPI_MODE_SELF_LOOPBACK; 687 689 688 690 writel(val, regs + S3C64XX_SPI_MODE_CFG); 689 691