encoder: add encoder for G12A

PD#156734: add encoder for G12A

Change-Id: Ib12f6af79f4264b9de5960cc65b7a3fd13e252f0
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts
index 6ca4bc7..0d6216c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts
@@ -360,6 +360,29 @@
                reg = <0x0 0xff940000 0x0 0x10000>;
        };
 
+       amvenc_avc{
+               compatible = "amlogic, amvenc_avc";
+               dev_name = "amvenc_avc";
+               status = "okay";
+               interrupts = <0 45 1>;
+               interrupt-names = "mailbox_2";
+       };
+
+       hevc_enc{
+               compatible = "cnm, HevcEnc";
+               //memory-region = <&hevc_enc_reserved>;
+               dev_name = "HevcEnc";
+               status = "okay";
+               interrupts = <0 187 1>;
+               interrupt-names = "wave420l_irq";
+               #address-cells=<2>;
+               #size-cells=<2>;
+               ranges;
+               io_reg_base{
+                       reg = <0x0 0xff610000 0x0 0x4000>;
+               };
+       };
+
        deinterlace {
                compatible = "amlogic, deinterlace";
                status = "okay";

diff --git a/arch/arm64/boot/dts/amlogic/g12a_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_skt.dts
index cb202a2..319b329 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_skt.dts
@@ -681,6 +681,28 @@
                dev_name = "ppmgr";
                status = "okay";
        };
+       amvenc_avc{
+               compatible = "amlogic, amvenc_avc";
+               dev_name = "amvenc_avc";
+               status = "okay";
+               interrupts = <0 45 1>;
+               interrupt-names = "mailbox_2";
+       };
+
+       hevc_enc{
+               compatible = "cnm, HevcEnc";
+               //memory-region = <&hevc_enc_reserved>;
+               dev_name = "HevcEnc";
+               status = "okay";
+               interrupts = <0 187 1>;
+               interrupt-names = "wave420l_irq";
+               #address-cells=<2>;
+               #size-cells=<2>;
+               ranges;
+               io_reg_base{
+                       reg = <0x0 0xff610000 0x0 0x4000>;
+               };
+       };
 
        deinterlace {
                compatible = "amlogic, deinterlace";

diff --git a/arch/arm64/boot/dts/amlogic/g12a_skt_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_skt_buildroot.dts
index 083fd23..66ac978 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_skt_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_skt_buildroot.dts
@@ -789,6 +789,29 @@
                status = "okay";
        };
 
+       amvenc_avc{
+               compatible = "amlogic, amvenc_avc";
+               dev_name = "amvenc_avc";
+               status = "okay";
+               interrupts = <0 45 1>;
+               interrupt-names = "mailbox_2";
+       };
+
+       hevc_enc{
+               compatible = "cnm, HevcEnc";
+               //memory-region = <&hevc_enc_reserved>;
+               dev_name = "HevcEnc";
+               status = "okay";
+               interrupts = <0 187 1>;
+               interrupt-names = "wave420l_irq";
+               #address-cells=<2>;
+               #size-cells=<2>;
+               ranges;
+               io_reg_base{
+                       reg = <0x0 0xff610000 0x0 0x4000>;
+               };
+       };
+
        deinterlace {
                compatible = "amlogic, deinterlace";
                status = "okay";

diff --git a/include/linux/amlogic/media/registers/regs/hhi_regs.h b/include/linux/amlogic/media/registers/regs/hhi_regs.h
index b3bec9f..2cac455 100644 (file)
--- a/include/linux/amlogic/media/registers/regs/hhi_regs.h
+++ b/include/linux/amlogic/media/registers/regs/hhi_regs.h
@@ -55,5 +55,8 @@
 /* add from GXM */
 #define HHI_WAVE420L_CLK_CNTL 0x109a
 
+/* add from g12a */
+#define HHI_WAVE420L_CLK_CNTL2 0x109b
+
 #endif