diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-04-30 15:17:46 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-04-30 16:00:15 +0100 |
| commit | 9b4041fa2e10f6417f41fdc727752e60df7da3e6 (patch) | |
| tree | b50938e12b796e0a01ce31ae8124b312e6af2190 /target/linux/mediatek/patches-5.15/120-04-v5.18-spi-spi-mem-Introduce-a-capability-structure.patch | |
| parent | 5d135fcf9d46835caea4eb88820ca129dc1bab96 (diff) | |
| download | upstream-9b4041fa2e10f6417f41fdc727752e60df7da3e6.tar.gz upstream-9b4041fa2e10f6417f41fdc727752e60df7da3e6.tar.bz2 upstream-9b4041fa2e10f6417f41fdc727752e60df7da3e6.zip | |
mediatek: refresh patches for Linux 5.15
Run `make target/linux/refresh` to align patches with OpenWrt style.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/mediatek/patches-5.15/120-04-v5.18-spi-spi-mem-Introduce-a-capability-structure.patch')
| -rw-r--r-- | target/linux/mediatek/patches-5.15/120-04-v5.18-spi-spi-mem-Introduce-a-capability-structure.patch | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/target/linux/mediatek/patches-5.15/120-04-v5.18-spi-spi-mem-Introduce-a-capability-structure.patch b/target/linux/mediatek/patches-5.15/120-04-v5.18-spi-spi-mem-Introduce-a-capability-structure.patch index bcd2ee8004..1e7f572dd6 100644 --- a/target/linux/mediatek/patches-5.15/120-04-v5.18-spi-spi-mem-Introduce-a-capability-structure.patch +++ b/target/linux/mediatek/patches-5.15/120-04-v5.18-spi-spi-mem-Introduce-a-capability-structure.patch @@ -23,15 +23,12 @@ Link: https://lore.kernel.org/linux-mtd/20220127091808.1043392-2-miquel.raynal@b include/linux/spi/spi.h | 3 +++ 2 files changed, 14 insertions(+) -diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h -index 85e2ff7b840d..38e5d45c9842 100644 --- a/include/linux/spi/spi-mem.h +++ b/include/linux/spi/spi-mem.h -@@ -285,6 +285,17 @@ struct spi_controller_mem_ops { - unsigned long timeout_ms); +@@ -286,6 +286,17 @@ struct spi_controller_mem_ops { }; -+/** + /** + * struct spi_controller_mem_caps - SPI memory controller capabilities + * @dtr: Supports DTR operations + */ @@ -42,11 +39,10 @@ index 85e2ff7b840d..38e5d45c9842 100644 +#define spi_mem_controller_is_capable(ctlr, cap) \ + ((ctlr)->mem_caps && (ctlr)->mem_caps->cap) + - /** ++/** * struct spi_mem_driver - SPI memory driver * @spidrv: inherit from a SPI driver -diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h -index 6b0b686f6f90..8ac58b1a2a9f 100644 + * @probe: probe a SPI memory. Usually where detection/initialization takes --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -23,6 +23,7 @@ struct software_node; @@ -57,7 +53,7 @@ index 6b0b686f6f90..8ac58b1a2a9f 100644 /* * INTERFACES between SPI master-side drivers and SPI slave protocol handlers, -@@ -419,6 +420,7 @@ extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 ch +@@ -419,6 +420,7 @@ extern struct spi_device *spi_new_ancill * @mem_ops: optimized/dedicated operations for interactions with SPI memory. * This field is optional and should only be implemented if the * controller has native support for memory like operations. @@ -73,6 +69,3 @@ index 6b0b686f6f90..8ac58b1a2a9f 100644 /* gpio chip select */ int *cs_gpios; --- -2.35.1 - |