diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts index 50f9fff64..b17bc7c7c 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts @@ -111,7 +111,7 @@ * 10x4736064=45.2M(0x2e) support 12bit * 10x4074560=40M(0x28) support 10bit */ - size = <0x0 0x02800000>; + //size = <0x0 0x02800000>; alignment = <0x0 0x400000>; }; /* POST PROCESS MANAGER */ @@ -286,16 +286,40 @@ compatible = "amlogic, deinterlace"; status = "disable"; /* 0:use reserved; 1:use cma; 2:use cma as reserved */ - flag_cma = <1>; + flag_cma = <4>; //<1>; //memory-region = <&di_reserved>; memory-region = <&di_cma_reserved>; interrupts = <0 46 1 0 40 1>; interrupt-names = "pre_irq", "post_irq"; - //clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>, - // <&clkc CLKID_VPU_CLKB_COMP>; - //clock-names = "vpu_clkb_tmp_composite", - // "vpu_clkb_composite"; + clocks = <&clkc CLKID_VPU_CLKB_TMP>, + <&clkc CLKID_VPU_CLKB>; + clock-names = "vpu_clkb", + "vpu_mux"; + clock-range = <334 667>; + /* buffer-size = <3621952>;(yuv422 8bit) */ + buffer-size = <4074560>;/*yuv422 fullpack*/ + /* reserve-iomap = "true"; */ + /* if enable nr10bit, set nr10bit-support to 1 */ + post-wr-support = <1>; + nr10bit-support = <1>; + nrds-enable = <1>; + pps-enable = <1>; + }; + multi-di { + compatible = "amlogic, amlogic, dim-g12b"; + status = "okay"; + /* 0:use reserved; 1:use cma; 2:use cma as reserved */ + flag_cma = <4>; //<1>; + //memory-region = <&di_reserved>; + memory-region = <&di_cma_reserved>; + interrupts = <0 46 1 + 0 40 1>; + interrupt-names = "pre_irq", "aisr_irq"; + clocks = <&clkc CLKID_VPU_CLKB_TMP>, + <&clkc CLKID_VPU_CLKB>; + clock-names = "vpu_clkb", + "vpu_mux"; clock-range = <334 667>; /* buffer-size = <3621952>;(yuv422 8bit) */ buffer-size = <4074560>;/*yuv422 fullpack*/ @@ -306,7 +330,6 @@ nrds-enable = <1>; pps-enable = <1>; }; - ionvideo { compatible = "amlogic, ionvideo"; dev_name = "ionvideo"; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts index 11e135e10..ecc74dd01 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -123,7 +123,7 @@ * 10x4736064=45.2M(0x2e) support 12bit * 10x4074560=40M(0x28) support 10bit */ - size = <0x0 0x02800000>; + //size = <0x0 0x02800000>; alignment = <0x0 0x400000>; }; /* POST PROCESS MANAGER */ @@ -295,16 +295,40 @@ compatible = "amlogic, deinterlace"; status = "disable"; /* 0:use reserved; 1:use cma; 2:use cma as reserved */ - flag_cma = <1>; + flag_cma = <4>; //<1>; //memory-region = <&di_reserved>; memory-region = <&di_cma_reserved>; interrupts = <0 46 1 0 40 1>; interrupt-names = "pre_irq", "post_irq"; - //clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>, - // <&clkc CLKID_VPU_CLKB_COMP>; - //clock-names = "vpu_clkb_tmp_composite", - // "vpu_clkb_composite"; + //clocks = <&clkc CLKID_VPU_CLKB_TMP>, + // <&clkc CLKID_VPU_CLKB>; + //clock-names = "vpu_clkb", + // "vpu_mux"; + clock-range = <334 667>; + /* buffer-size = <3621952>;(yuv422 8bit) */ + buffer-size = <4074560>;/*yuv422 fullpack*/ + /* reserve-iomap = "true"; */ + /* if enable nr10bit, set nr10bit-support to 1 */ + post-wr-support = <1>; + nr10bit-support = <1>; + nrds-enable = <1>; + pps-enable = <1>; + }; + multi-di { + compatible = "amlogic, amlogic, dim-sm1"; + status = "okay"; + /* 0:use reserved; 1:use cma; 2:use cma as reserved */ + flag_cma = <4>; //<1>; + //memory-region = <&di_reserved>; + memory-region = <&di_cma_reserved>; + interrupts = <0 46 1 + 0 40 1>; + interrupt-names = "pre_irq", "aisr_irq"; + clocks = <&clkc CLKID_VPU_CLKB_TMP>, + <&clkc CLKID_VPU_CLKB>; + clock-names = "vpu_clkb", + "vpu_mux"; clock-range = <334 667>; /* buffer-size = <3621952>;(yuv422 8bit) */ buffer-size = <4074560>;/*yuv422 fullpack*/