mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-29 18:21:27 +00:00
f49c6f8e2b
1: update meson 4K support patches: 2, HDMI i2s improvement patches: 3, update vdec patches: 4, update meson audio patches: 5, add meson crypto engine driver 6, remove disabled patches: 7 remove unknown patch or no need 8, remove merged patches: 9, remove unknown patches from khadas should be covered by patches set 2 10, rename patches for better grouping 11, update kernel config accordingly Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
From 37b81834772f9766363761c4f9464d35a830e029 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Jourdan <mjourdan@baylibre.com>
|
|
Date: Wed, 29 Aug 2018 15:24:22 +0200
|
|
Subject: [PATCH 02/14] arm64: dts: meson: add vdec entries
|
|
|
|
This enables the video decoder for gxbb, gxl and gxm chips
|
|
|
|
Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 +++++++++++
|
|
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 11 +++++++++++
|
|
arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 ++++
|
|
3 files changed, 26 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
|
index a60d3652beee..e900a93960fb 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
|
@@ -830,3 +830,14 @@
|
|
compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
|
|
power-domains = <&pwrc_vpu>;
|
|
};
|
|
+
|
|
+&vdec {
|
|
+ compatible = "amlogic,gxbb-vdec";
|
|
+ clocks = <&clkc CLKID_DOS_PARSER>,
|
|
+ <&clkc CLKID_DOS>,
|
|
+ <&clkc CLKID_VDEC_1>,
|
|
+ <&clkc CLKID_VDEC_HEVC>;
|
|
+ clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc";
|
|
+ resets = <&reset RESET_PARSER>;
|
|
+ reset-names = "esparser";
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
index 3093ae421b17..1d105047661e 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
@@ -833,3 +833,14 @@
|
|
compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
|
|
power-domains = <&pwrc_vpu>;
|
|
};
|
|
+
|
|
+&vdec {
|
|
+ compatible = "amlogic,gxl-vdec";
|
|
+ clocks = <&clkc CLKID_DOS_PARSER>,
|
|
+ <&clkc CLKID_DOS>,
|
|
+ <&clkc CLKID_VDEC_1>,
|
|
+ <&clkc CLKID_VDEC_HEVC>;
|
|
+ clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc";
|
|
+ resets = <&reset RESET_PARSER>;
|
|
+ reset-names = "esparser";
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
|
|
index 7a85a82bf65d..13e76d4136c0 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
|
|
@@ -144,3 +144,7 @@
|
|
&dwc3 {
|
|
phys = <&usb3_phy>, <&usb2_phy0>, <&usb2_phy1>, <&usb2_phy2>;
|
|
};
|
|
+
|
|
+&vdec {
|
|
+ compatible = "amlogic,gxm-vdec";
|
|
+};
|
|
--
|
|
2.20.1
|
|
|