7d5f1dbda1
Some patches were part of other linux-mainline kernel versions but are not anymore part of the current 4.19.76. Move 0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch in linux-mainline_4.19.76.bbappend to avoid error patching file arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts Hunk #2 FAILED at 162. 1 out of 2 hunks FAILED -- rejects in file arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts Place all patches from Armbian in a separate directory and do all the Balena specific operations in linux-mainline_%.bbappend only. Changelog-entry: Remove unused patches and cleanup Signed-off-by: Vicentiu Galanopulo <vicentiu@balena.io>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From dd3d2cbe3b5312585fd0c525d0515ef0493192fa Mon Sep 17 00:00:00 2001
|
|
From: Jagan Teki <jagan@amarulasolutions.com>
|
|
Date: Tue, 4 Sep 2018 12:40:47 +0800
|
|
Subject: [PATCH 095/146] drm/sun4i: Add support for A64 display engine
|
|
|
|
Display Engine(DE2) in Allwinner A64 has two mixers and tcons.
|
|
|
|
The routing for mixer0 is through tcon0 and connected to
|
|
LVDS/RGB/MIPI-DSI controller.
|
|
|
|
The routing for mixer1 is through tcon1 and connected to HDMI.
|
|
|
|
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
|
|
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun4i_drv.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
|
|
index 9f5de14fb2fe..486ae8507ae9 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
|
|
@@ -447,6 +447,7 @@ static const struct of_device_id sun4i_drv_of_table[] = {
|
|
{ .compatible = "allwinner,sun8i-h3-display-engine" },
|
|
{ .compatible = "allwinner,sun8i-v3s-display-engine" },
|
|
{ .compatible = "allwinner,sun9i-a80-display-engine" },
|
|
+ { .compatible = "allwinner,sun50i-a64-display-engine" },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, sun4i_drv_of_table);
|
|
--
|
|
2.17.1
|
|
|