diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-13 11:28:09 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-15 10:53:16 +0100 |
| commit | 9fb3710a8b9e5a5bc96914d2631f22c90bbbb6dc (patch) | |
| tree | 780551b51f37c3d9839ee851135409a03e6f4b18 /target/linux/brcm2708 | |
| parent | e5ace807593fd26b8bb0df0891cecb9a891ab8d4 (diff) | |
| download | upstream-9fb3710a8b9e5a5bc96914d2631f22c90bbbb6dc.tar.gz upstream-9fb3710a8b9e5a5bc96914d2631f22c90bbbb6dc.tar.bz2 upstream-9fb3710a8b9e5a5bc96914d2631f22c90bbbb6dc.zip | |
kernel: bump 4.9 to 4.9.156
Refreshed all patches.
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708')
3 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch index c402fe283b..d162bfa1b4 100644 --- a/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch +++ b/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch @@ -46,7 +46,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> struct bcm2835_dmadev { struct dma_device ddev; -@@ -925,6 +927,9 @@ static int bcm2835_dma_probe(struct plat +@@ -905,6 +907,9 @@ static int bcm2835_dma_probe(struct plat base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(base)) return PTR_ERR(base); @@ -56,7 +56,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> od->base = base; -@@ -962,6 +967,9 @@ static int bcm2835_dma_probe(struct plat +@@ -942,6 +947,9 @@ static int bcm2835_dma_probe(struct plat goto err_no_dma; } @@ -66,7 +66,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> /* get irqs for each channel that we support */ for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) { /* skip masked out channels */ -@@ -1036,6 +1044,7 @@ static int bcm2835_dma_remove(struct pla +@@ -1016,6 +1024,7 @@ static int bcm2835_dma_remove(struct pla { struct bcm2835_dmadev *od = platform_get_drvdata(pdev); @@ -74,7 +74,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> dma_async_device_unregister(&od->ddev); bcm2835_dma_free(od); -@@ -1051,7 +1060,22 @@ static struct platform_driver bcm2835_dm +@@ -1031,7 +1040,22 @@ static struct platform_driver bcm2835_dm }, }; diff --git a/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch index 707e1a34a1..6e6a9c34ec 100644 --- a/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch @@ -696,7 +696,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5074,7 +5074,7 @@ static void port_event(struct usb_hub *h +@@ -5084,7 +5084,7 @@ static void port_event(struct usb_hub *h if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; diff --git a/target/linux/brcm2708/patches-4.9/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/brcm2708/patches-4.9/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch index 34346903da..c7160c7b2e 100644 --- a/target/linux/brcm2708/patches-4.9/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch +++ b/target/linux/brcm2708/patches-4.9/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch @@ -154,7 +154,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma return -ENOTTY; --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c -@@ -1084,6 +1084,31 @@ fb_blank(struct fb_info *info, int blank +@@ -1088,6 +1088,31 @@ fb_blank(struct fb_info *info, int blank } EXPORT_SYMBOL(fb_blank); @@ -186,7 +186,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { -@@ -1094,6 +1119,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1098,6 +1123,7 @@ static long do_fb_ioctl(struct fb_info * struct fb_cmap cmap_from; struct fb_cmap_user cmap; struct fb_event event; @@ -194,7 +194,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma void __user *argp = (void __user *)arg; long ret = 0; -@@ -1211,6 +1237,15 @@ static long do_fb_ioctl(struct fb_info * +@@ -1215,6 +1241,15 @@ static long do_fb_ioctl(struct fb_info * unlock_fb_info(info); console_unlock(); break; @@ -210,7 +210,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma default: if (!lock_fb_info(info)) return -ENODEV; -@@ -1365,6 +1400,7 @@ static long fb_compat_ioctl(struct file +@@ -1369,6 +1404,7 @@ static long fb_compat_ioctl(struct file case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: |