mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
85cef1cf22
Manually rebased
bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
Replaced with patch from Raspberry Pi kernel 5.10 patches
mvebu/patches-5.4/002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch
Applied upstream
All others updated automatically.
Compile-tested on: ath79/generic, lantiq/xrx200, brcm27xx
Runtime-tested on: ath79/generic, lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
24 lines
764 B
Diff
24 lines
764 B
Diff
From 34072d0778e21edf69455d900b8a16be6b9ac95c Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Tue, 16 Jun 2020 10:23:03 +0100
|
|
Subject: [PATCH] Revert "SQUASH: Fix spi driver compiler warnings"
|
|
|
|
This reverts commit fe3f696b7e5229678ae45d1293e97b5ecc00c245.
|
|
|
|
See: https://github.com/raspberrypi/linux/pull/3687
|
|
---
|
|
drivers/spi/spi-bcm2835.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/drivers/spi/spi-bcm2835.c
|
|
+++ b/drivers/spi/spi-bcm2835.c
|
|
@@ -1182,6 +1182,8 @@ static int bcm2835_spi_setup(struct spi_
|
|
{
|
|
struct spi_controller *ctlr = spi->controller;
|
|
struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);
|
|
+ struct gpio_chip *chip;
|
|
+ enum gpio_lookup_flags lflags;
|
|
u32 cs;
|
|
|
|
if (spi->chip_select >= BCM2835_SPI_NUM_CS) {
|