mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-24 15:52:02 +00:00
a57ce78b37
* Bump to 4.18, removing the obvious, fixing build problems, put some on waiting. * Pin 4.18 to DEV, rollback 4.14 to NEXT, adjust configs, remove one deprecated patch from NEXT and add board-h3-address-some-stability-issues.patch * Adjust few boards in development to new reality, removing it from NEXT for now * Adjust few board configs * Board config adjustement * Adjust few boards configs * Port NeoCore2 and Neo21.1 to 4.14.y * Adjust board config * Adjust board config
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
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.
|