Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

module-broadcom-wl rebuild

Browse Source
This commit is contained in:
idriskalp
2020-04-13 19:38:12 +03:00
parent 2de6d55f12
commit 0cbfd86317
2 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/module-broadcom-wl/files/linux-5.6.patch
+55
View File
@@ -0,0 +1,55 @@
diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
index 6157d18..8237ec7 100644
--- a/src/shared/linux_osl.c
+++ b/src/shared/linux_osl.c
@@ -942,7 +942,7 @@ osl_getcycles(void)
void *
osl_reg_map(uint32 pa, uint size)
{
- return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
+ return (ioremap((unsigned long)pa, (unsigned long)size));
}
void
diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
index 0d05100..2ed1f0d 100644
--- a/src/wl/sys/wl_linux.c
+++ b/src/wl/sys/wl_linux.c
@@ -582,7 +582,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
}
wl->bcm_bustype = bustype;
- if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
+ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
WL_ERROR(("wl%d: ioremap() failed\n", unit));
goto fail;
}
@@ -772,7 +772,7 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if ((val & 0x0000ff00) != 0)
pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
bar1_size = pci_resource_len(pdev, 2);
- bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
+ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
bar1_size);
wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
pdev->irq, bar1_addr, bar1_size);
@@ -3335,12 +3335,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
+static struct proc_ops wl_fops = {
+ .proc_read = wl_proc_read,
+ .proc_write = wl_proc_write,
+};
+#else
static const struct file_operations wl_fops = {
.owner = THIS_MODULE,
.read = wl_proc_read,
.write = wl_proc_write,
};
#endif
+#endif
static int
wl_reg_proc_entry(wl_info_t *wl)
kernel/drivers/module-broadcom-wl/pspec.xml
+10 -2
View File
@@ -15,7 +15,7 @@
<Archive sha1sum="8acbdbb4ab4ab4123d1773b616904798fbef9277" type="targz" target="i686">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
<Archive sha1sum="1f568bb989d175813c5631c6629d9479eae6f3be" type="targz" target="x86_64">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
<BuildDependencies>
<Dependency version="5.5.15">kernel-module-headers</Dependency>
<Dependency version="5.6.4">kernel-module-headers</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">patch/license.patch</Patch>
@@ -26,13 +26,14 @@
<Patch level="1">linux-4.12.patch</Patch>
<Patch level="1">linux-4.15.patch</Patch>
<Patch level="1">linux-5.1.patch</Patch>
<Patch level="1">linux-5.6.patch</Patch>
</Patches>
</Source>
<Package>
<Name>module-broadcom-wl</Name>
<RuntimeDependencies>
<Dependency version="5.5.15">kernel</Dependency>
<Dependency version="5.6.4">kernel</Dependency>
<Dependency release="current">module-broadcom-wl-userspace</Dependency>
</RuntimeDependencies>
<Files>
@@ -61,6 +62,13 @@
</Package>
<History>
<Update release="30">
<Date>2020-04-13</Date>
<Version>6.30.223.271</Version>
<Comment>Rebuild.</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalpp@gmail.com</Email>
</Update>
<Update release="29">
<Date>2020-04-03</Date>
<Version>6.30.223.271</Version>