From cb0a1d2da5347b50f783cd66285ca0faf5bf012f Mon Sep 17 00:00:00 2001 From: Frank Wunderlich Date: Fri, 25 May 2018 16:21:14 +0200 Subject: [PATCH 1/3] Update README.md --- README.md | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index b865d7bea8095..9c66525df5b2c 100644 --- a/README.md +++ b/README.md @@ -16,36 +16,39 @@ sudo apt-get install gcc-arm-linux-gnueabihf libc6-armhf-cross u-boot-tools bc m ## Branch details -Kernel upstream branch are: - * 4.16, 4.14, 4.9 - Kernel upstream + BPI-R2 -* 4.16_main, 4.14_main, 4.9_main +* 4.16-main, 4.14-main, 4.9-main ## Kernel version Kernel breakdown features by version | | 4.4 | 4.9 | 4.14 | 4.16| -|----------| --- | --- | --- | ---| -| PCIe | Y | Y | Y | Y | Y | -| SATA | Y | Y | Y | Y | Y | -| 2 GMAC | Y | Y | N | N | N | -| DSA | N | Y | Y | Y | Y | -| VLAN | | | | | | -| HW NAT | | Y | Y | | | -| HW QOS | | Y | Y | | | -| Crypto | Y | Y | Y | Y | Y | -| WIFI | | | | | | -| BT | | | | | | -| VIDEO | Y | N | N | N | N | -| AUDIO | Y | N | N | N | N | +|----------| --- | --- | --- | --- | +| PCIe | Y | Y | Y | Y | +| SATA | Y | Y | Y | Y | +| 2 GMAC | Y | Y | N | N | +| DSA | N | Y | Y | Y | +| VLAN | | | | | +| HW NAT | | Y | Y | | +| HW QOS | | Y | Y | | +| Crypto | Y | Y | Y | Y? | +| WIFI | Y | ? | Y | (Y) | +| BT | | | | | +| VIDEO | Y | N | N | (Y) | +| AUDIO | Y | N | N | N | + +? = unsure + +() = testing (separate Branch) + ## Links * BPI-R2: http://www.banana-pi.org/r2.html * Kernel: https://www.kernel.org/ -* linux-mediatek: https://patchwork.kernel.org/project/linux-mediatek/list/ +* Stable-RC: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/ +* linux-mediatek: https://patchwork.kernel.org/project/linux-mediatek/list/ Threaded: http://lists.infradead.org/pipermail/linux-mediatek/ * kernelci: https://kernelci.org/boot/mt7623n-bananapi-bpi-r2/ License From f683d7f87b6aaadad9593824b99c32231f05813c Mon Sep 17 00:00:00 2001 From: Frank Wunderlich Date: Sat, 26 May 2018 11:57:55 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 61 ++----------------------------------------------------- 1 file changed, 2 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 9c66525df5b2c..18d7e1c1695cd 100644 --- a/README.md +++ b/README.md @@ -1,59 +1,2 @@ - -Kernel 4.16 with patchwork from mediatek for BPI-R2 - -## Requirements - -Need cross compile tools for the armhf architecture and additional bison and flex-package: -```sh -sudo apt-get install gcc-arm-linux-gnueabihf libc6-armhf-cross u-boot-tools bc make gcc libc6-dev libncurses5-dev libssl-dev bison flex -``` - -## Usage - - ./build.sh importconfig - ./build.sh config - ./build.sh - -## Branch details - -Kernel upstream + BPI-R2 -* 4.16-main, 4.14-main, 4.9-main - -## Kernel version - -Kernel breakdown features by version - -| | 4.4 | 4.9 | 4.14 | 4.16| -|----------| --- | --- | --- | --- | -| PCIe | Y | Y | Y | Y | -| SATA | Y | Y | Y | Y | -| 2 GMAC | Y | Y | N | N | -| DSA | N | Y | Y | Y | -| VLAN | | | | | -| HW NAT | | Y | Y | | -| HW QOS | | Y | Y | | -| Crypto | Y | Y | Y | Y? | -| WIFI | Y | ? | Y | (Y) | -| BT | | | | | -| VIDEO | Y | N | N | (Y) | -| AUDIO | Y | N | N | N | - -? = unsure - -() = testing (separate Branch) - - -## Links - -* BPI-R2: http://www.banana-pi.org/r2.html -* Kernel: https://www.kernel.org/ -* Stable-RC: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/ -* linux-mediatek: https://patchwork.kernel.org/project/linux-mediatek/list/ Threaded: http://lists.infradead.org/pipermail/linux-mediatek/ -* kernelci: https://kernelci.org/boot/mt7623n-bananapi-bpi-r2/ - -License ----- - -GPL-2.0 - -**Free Software, Hell Yeah!** +Kernel 4.16 from mediatek for BPI-R2 +Please refer to [README.md](https://github.com/frank-w/BPI-R2-4.14/blob/4.14-main/README.md) From 10c5bf23f79a7df64f6ca3794b1e708172e58a10 Mon Sep 17 00:00:00 2001 From: Frank Wunderlich Date: Sat, 2 Jun 2018 19:14:24 +0200 Subject: [PATCH 3/3] fixed 2 warnings in hdmi-code --- drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_fbdev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index c58b39f55374b..2e3c98022e231 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -728,7 +728,7 @@ static int mtk_dpi_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct mtk_dpi *dpi; struct resource *mem; - struct device_node *ep, *bridge_node; + struct device_node *ep, *bridge_node = NULL; int comp_id; const struct of_device_id *match; int ret; diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fbdev.c b/drivers/gpu/drm/mediatek/mtk_drm_fbdev.c index 2bff6bc1c7b71..da038fccfb0b9 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_fbdev.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_fbdev.c @@ -78,17 +78,17 @@ static int mtk_fbdev_probe(struct drm_fb_helper *helper, info = drm_fb_helper_alloc_fbi(helper); if (IS_ERR(info)) { + err = PTR_ERR(info); DRM_DEV_ERROR(dev->dev, "failed to allocate framebuffer info, %d\n", err); - err = PTR_ERR(info); goto out; } fb = mtk_drm_framebuffer_create(dev, &mode, private->fbdev_bo); if (IS_ERR(fb)) { + err = PTR_ERR(fb); DRM_DEV_ERROR(dev->dev, "failed to allocate DRM framebuffer, %d\n", err); - err = PTR_ERR(fb); goto out; } helper->fb = fb;