e44e60b290
Resolved merge conflict in the following patches: layerscape: 701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch ramips: 0013-owrt-hack-fix-mt7688-cache-issue.patch Refreshed patches, removed upstreamed patch: bcm63xx: 020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch Run tested: qemu-x86-64 Build tested: x86/64 Signed-off-by: Petr Štetiar <ynezz@true.cz>
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
|
|
@@ -3046,8 +3046,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;
|
|
}
|
|
|