* Attach Meson64 to mainline with a bunch of patches. Tested, but need further work. * Enable DVFS on N2 which sometimes works, sometime doesn't, cleanup * Enable beta targets for Meson64 kernel family * Bump with version
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
|
|
Add the video decoder node for the Amlogic G12A and compatible SoC.
|
|
|
|
Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
|
|
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
|
---
|
|
.../boot/dts/amlogic/meson-g12-common.dtsi | 23 +++++++++++++++++++
|
|
1 file changed, 23 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
|
index 3f39e020f74e..6fe7dead5a92 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
|
@@ -2152,6 +2152,29 @@
|
|
};
|
|
};
|
|
|
|
+ vdec: video-decoder@ff620000 {
|
|
+ compatible = "amlogic,g12a-vdec";
|
|
+ reg = <0x0 0xff620000 0x0 0x10000>,
|
|
+ <0x0 0xffd0e180 0x0 0xe4>;
|
|
+ reg-names = "dos", "esparser";
|
|
+ interrupts = <GIC_SPI 44 IRQ_TYPE_EDGE_RISING>,
|
|
+ <GIC_SPI 32 IRQ_TYPE_EDGE_RISING>;
|
|
+ interrupt-names = "vdec", "esparser";
|
|
+
|
|
+ amlogic,ao-sysctrl = <&rti>;
|
|
+ amlogic,canvas = <&canvas>;
|
|
+
|
|
+ clocks = <&clkc CLKID_PARSER>,
|
|
+ <&clkc CLKID_DOS>,
|
|
+ <&clkc CLKID_VDEC_1>,
|
|
+ <&clkc CLKID_VDEC_HEVC>,
|
|
+ <&clkc CLKID_VDEC_HEVCF>;
|
|
+ clock-names = "dos_parser", "dos", "vdec_1",
|
|
+ "vdec_hevc", "vdec_hevcf";
|
|
+ resets = <&reset RESET_PARSER>;
|
|
+ reset-names = "esparser";
|
|
+ };
|
|
+
|
|
vpu: vpu@ff900000 {
|
|
compatible = "amlogic,meson-g12a-vpu";
|
|
reg = <0x0 0xff900000 0x0 0x100000>,
|