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>
52 lines
2.2 KiB
Diff
52 lines
2.2 KiB
Diff
From 3c133c6aa20eacb1b7f77e6b3136d483fdd80582 Mon Sep 17 00:00:00 2001
|
|
From: Jagan Teki <jagan@amarulasolutions.com>
|
|
Date: Tue, 4 Sep 2018 12:40:45 +0800
|
|
Subject: [PATCH 093/146] dt-bindings: display: Add compatible for A64 DE2
|
|
display pipeline
|
|
|
|
Allwinner A64 has a DE2 display pipeline. The TCONs are similar to the
|
|
ones in A83T, but the mixers are new (similar to the later R40 SoC).
|
|
|
|
This patch adds dt-binding documentation for A64 DE2 display pipeline.
|
|
|
|
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
|
|
Reviewed-by: Rob Herring <robh@kernel.org>
|
|
[Icenowy: Refactor and also cover TCON1]
|
|
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
|
|
---
|
|
.../devicetree/bindings/display/sunxi/sun4i-drm.txt | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
|
|
index f8773ecb7525..7b79c5e3dffc 100644
|
|
--- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
|
|
+++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
|
|
@@ -151,6 +151,8 @@ Required properties:
|
|
* allwinner,sun8i-v3s-tcon
|
|
* allwinner,sun9i-a80-tcon-lcd
|
|
* allwinner,sun9i-a80-tcon-tv
|
|
+ * "allwinner,sun50i-a64-tcon-lcd", "allwinner,sun8i-a83t-tcon-lcd"
|
|
+ * "allwinner,sun50i-a64-tcon-tv", "allwinner,sun8i-a83t-tcon-tv"
|
|
- reg: base address and size of memory-mapped region
|
|
- interrupts: interrupt associated to this IP
|
|
- clocks: phandles to the clocks feeding the TCON.
|
|
@@ -370,6 +372,8 @@ Required properties:
|
|
* allwinner,sun8i-a83t-de2-mixer-1
|
|
* allwinner,sun8i-h3-de2-mixer-0
|
|
* allwinner,sun8i-v3s-de2-mixer
|
|
+ * allwinner,sun50i-a64-de2-mixer-0
|
|
+ * allwinner,sun50i-a64-de2-mixer-1
|
|
- reg: base address and size of the memory-mapped region.
|
|
- clocks: phandles to the clocks feeding the mixer
|
|
* bus: the mixer interface clock
|
|
@@ -403,6 +407,7 @@ Required properties:
|
|
* allwinner,sun8i-r40-display-engine
|
|
* allwinner,sun8i-v3s-display-engine
|
|
* allwinner,sun9i-a80-display-engine
|
|
+ * allwinner,sun50i-a64-display-engine
|
|
|
|
- allwinner,pipelines: list of phandle to the display engine
|
|
frontends (DE 1.0) or mixers (DE 2.0) available.
|
|
--
|
|
2.17.1
|
|
|