mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From 6156ba379ce50e8a969e4e87c9e1eddb117a9e4c Mon Sep 17 00:00:00 2001
|
|
From: Andrei Gherzan <andrei@gherzan.com>
|
|
Date: Mon, 5 Jun 2017 16:40:38 +0100
|
|
Subject: [PATCH 119/454] dma-bcm2708: Fix module compilation of
|
|
CONFIG_DMA_BCM2708
|
|
|
|
bcm2708-dmaengine.c defines functions like bcm_dma_start which are
|
|
defined as well in dma-bcm2708.h as inline versions when
|
|
CONFIG_DMA_BCM2708 is not defined. This works fine when
|
|
CONFIG_DMA_BCM2708 is built in, but when it is selected as module build
|
|
fails with redefinition errors because in the build system when
|
|
CONFIG_DMA_BCM2708 is selected as module, the macro becomes
|
|
CONFIG_DMA_BCM2708_MODULE.
|
|
|
|
This patch makes the header use CONFIG_DMA_BCM2708_MODULE too when
|
|
available.
|
|
|
|
Fixes https://github.com/raspberrypi/linux/issues/2056
|
|
|
|
Signed-off-by: Andrei Gherzan <andrei@gherzan.com>
|
|
---
|
|
include/linux/platform_data/dma-bcm2708.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/include/linux/platform_data/dma-bcm2708.h
|
|
+++ b/include/linux/platform_data/dma-bcm2708.h
|
|
@@ -75,7 +75,7 @@ struct bcm2708_dma_cb {
|
|
struct scatterlist;
|
|
struct platform_device;
|
|
|
|
-#ifdef CONFIG_DMA_BCM2708
|
|
+#if defined(CONFIG_DMA_BCM2708) || defined(CONFIG_DMA_BCM2708_MODULE)
|
|
|
|
int bcm_sg_suitable_for_dma(struct scatterlist *sg_ptr, int sg_len);
|
|
void bcm_dma_start(void __iomem *dma_chan_base, dma_addr_t control_block);
|
|
@@ -138,6 +138,6 @@ static inline int bcm_dmaman_remove(stru
|
|
return 0;
|
|
}
|
|
|
|
-#endif /* CONFIG_DMA_BCM2708 */
|
|
+#endif /* CONFIG_DMA_BCM2708 || CONFIG_DMA_BCM2708_MODULE */
|
|
|
|
#endif /* _PLAT_BCM2708_DMA_H */
|