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>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 671c3bf50ae498dc12aef6c70abe5cfa066b1348 Mon Sep 17 00:00:00 2001
|
|
From: Chuanhong Guo <gch981213@gmail.com>
|
|
Date: Fri, 6 Mar 2020 16:50:49 +0800
|
|
Subject: [PATCH 1/2] spi: make spi-max-frequency optional
|
|
|
|
We only need a spi-max-frequency when we specifically request a
|
|
spi frequency lower than the max speed of spi host.
|
|
This property is already documented as optional property and current
|
|
host drivers are implemented to operate at highest speed possible
|
|
when spi->max_speed_hz is 0.
|
|
This patch makes spi-max-frequency an optional property so that
|
|
we could just omit it to use max controller speed.
|
|
|
|
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
|
Link: https://lore.kernel.org/r/20200306085052.28258-2-gch981213@gmail.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/spi.c | 9 ++-------
|
|
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/spi/spi.c
|
|
+++ b/drivers/spi/spi.c
|
|
@@ -1797,13 +1797,8 @@ static int of_spi_parse_dt(struct spi_co
|
|
spi->mode |= SPI_CS_HIGH;
|
|
|
|
/* Device speed */
|
|
- rc = of_property_read_u32(nc, "spi-max-frequency", &value);
|
|
- if (rc) {
|
|
- dev_err(&ctlr->dev,
|
|
- "%pOF has no valid 'spi-max-frequency' property (%d)\n", nc, rc);
|
|
- return rc;
|
|
- }
|
|
- spi->max_speed_hz = value;
|
|
+ if (!of_property_read_u32(nc, "spi-max-frequency", &value))
|
|
+ spi->max_speed_hz = value;
|
|
|
|
return 0;
|
|
}
|