mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
05b8e84362
Manually merged:
backport-5.4
011-kbuild-export-SUBARCH.patch
layerscape
701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch
All other modifications made by update_kernel.sh
Build-tested: x86/64, lantiq/xrx200, ramips/mt7621
Run-tested: ipq806x (R7800), lantiq/xrx200, x86/64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[minor commit message adjustments]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
29 lines
961 B
Diff
29 lines
961 B
Diff
From 4172a6bd7e4afada99911947a335d47e94802be5 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Fri, 1 May 2020 14:58:23 +0100
|
|
Subject: [PATCH] SQUASH: spi: Demote SPI_CS_HIGH warning to KERN_DEBUG
|
|
|
|
This warning is unavoidable from a client's perspective and
|
|
doesn't indicate anything wrong (just surprising).
|
|
|
|
SQUASH with "spi: use_gpio_descriptor fixup moved to spi_setup"
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/spi/spi.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/spi/spi.c
|
|
+++ b/drivers/spi/spi.c
|
|
@@ -3065,8 +3065,8 @@ int spi_setup(struct spi_device *spi)
|
|
|
|
if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
|
|
ctlr->cs_gpiods[spi->chip_select] && !(spi->mode & SPI_CS_HIGH)) {
|
|
- dev_warn(&spi->dev,
|
|
- "setup: forcing CS_HIGH (use_gpio_descriptors)\n");
|
|
+ dev_dbg(&spi->dev,
|
|
+ "setup: forcing CS_HIGH (use_gpio_descriptors)\n");
|
|
spi->mode |= SPI_CS_HIGH;
|
|
}
|
|
|