From 0b238cb74a108aad7c87892b91f8f96c8efad673 Mon Sep 17 00:00:00 2001 From: Jason Liu Date: Mon, 14 Mar 2016 16:40:12 +0800 Subject: [PATCH] MLK-12556 dts: i.mx6ul: configure the CMA region by default CMA region is a must to avoid the multile memory mapping for the DMAed memory and also benifit the large continious phisical memory allocation. The default value is depend on the target system design and user cases definition. This is not suitable to put this into the soc.dtsi, thus we put it into the board DTS. customer can override the value by changing cma size in DTS file. Again, customer need set the CMA size correctly according to the target system. The incorrectly CMA size can cause Linux kernel fail to boot up.CMA disabled or CMA size set to zero is also not allowed. Signed-off-by: Jason Liu --- arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts | 13 +++++++++++++ arch/arm/boot/dts/imx6ul-14x14-evk.dts | 13 +++++++++++++ arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts | 13 +++++++++++++ arch/arm/boot/dts/imx6ul-9x9-evk.dts | 13 +++++++++++++ 4 files changed, 52 insertions(+) diff --git a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts index 1257352aca61..a19fd06a5677 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts @@ -23,6 +23,19 @@ reg = <0x80000000 0x40000000>; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x14000000>; + linux,cma-default; + }; + }; + pxp_v4l2 { compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2"; status = "okay"; diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts index d835a1b0ed31..f98574d2d006 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts @@ -22,6 +22,19 @@ reg = <0x80000000 0x20000000>; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x14000000>; + linux,cma-default; + }; + }; + backlight { compatible = "pwm-backlight"; pwms = <&pwm1 0 5000000>; diff --git a/arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts b/arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts index 81e8cd8bff86..b3d5d4e6970b 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-lpddr2-arm2.dts @@ -23,6 +23,19 @@ reg = <0x80000000 0x20000000>; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x14000000>; + linux,cma-default; + }; + }; + pxp_v4l2 { compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2"; status = "okay"; diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk.dts b/arch/arm/boot/dts/imx6ul-9x9-evk.dts index 2d28de2d70ae..ccb52ebd538f 100644 --- a/arch/arm/boot/dts/imx6ul-9x9-evk.dts +++ b/arch/arm/boot/dts/imx6ul-9x9-evk.dts @@ -31,6 +31,19 @@ reg = <0x80000000 0x10000000>; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x6000000>; + linux,cma-default; + }; + }; + pxp_v4l2 { compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2"; status = "okay"; -- 2.17.1