From 24005c9e12dbcba53363bf9481ce123a4f7d4090 Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Fri, 29 Jan 2016 03:20:50 +0000 Subject: [PATCH] linux: cmem: Update reserved CMEM regions * dra7xx: - Increase DDR region required to pass OpenCL conformance - Add OCMC region * k2e-evm, k2l-evm: - Add reserved regions for these machines Signed-off-by: Jacob Stiffler Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/files/dra7xx/cmem.dtsi | 20 ++++++++-- recipes-kernel/linux/files/k2e-evm/cmem.dtsi | 42 ++++++++++++++++++++ recipes-kernel/linux/files/k2l-evm/cmem.dtsi | 42 ++++++++++++++++++++ 3 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 recipes-kernel/linux/files/k2e-evm/cmem.dtsi create mode 100644 recipes-kernel/linux/files/k2l-evm/cmem.dtsi diff --git a/recipes-kernel/linux/files/dra7xx/cmem.dtsi b/recipes-kernel/linux/files/dra7xx/cmem.dtsi index d91faf9c..c7781c48 100644 --- a/recipes-kernel/linux/files/dra7xx/cmem.dtsi +++ b/recipes-kernel/linux/files/dra7xx/cmem.dtsi @@ -1,10 +1,20 @@ / { reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0a000000>; + reg = <0x0 0xa0000000 0x0 0x0c000000>; no-map; status = "okay"; }; + + cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { + reg = <0x0 0x40500000 0x0 0x100000>; + no-map; + status = "okay"; + }; }; cmem { @@ -19,8 +29,12 @@ cmem_block_0: cmem_block@0 { reg = <0>; memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0a000000>; + cmem-buf-pools = <1 0x0 0x0c000000>; }; - }; + cmem_block_1: cmem_block@1 { + reg = <1>; + memory-region = <&cmem_block_mem_1_ocmc3>; + }; + }; }; diff --git a/recipes-kernel/linux/files/k2e-evm/cmem.dtsi b/recipes-kernel/linux/files/k2e-evm/cmem.dtsi new file mode 100644 index 00000000..236b0ba8 --- /dev/null +++ b/recipes-kernel/linux/files/k2e-evm/cmem.dtsi @@ -0,0 +1,42 @@ +/ { + reserved-memory { + mpm_block_mem_0: mpm_block_mem@820000000 { + reg = <0x00000008 0x20000000 0x00000000 0x02000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_0: cmem_block_mem@829000000 { + reg = <0x00000008 0x22000000 0x00000000 0x1E000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_1: cmem_block_mem@00c100000 { + reg = <0x00000000 0x0c000000 0x00000000 0x00180000>; + no-map; + status = "okay"; + }; + }; + + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; + + #pool-size-cells = <2>; + + status = "okay"; + + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x00000000 0x1E000000>; + }; + + cmem_block_1: cmem_block@1 { + reg = <1>; + memory-region = <&cmem_block_mem_1>; + }; + }; +}; diff --git a/recipes-kernel/linux/files/k2l-evm/cmem.dtsi b/recipes-kernel/linux/files/k2l-evm/cmem.dtsi new file mode 100644 index 00000000..236b0ba8 --- /dev/null +++ b/recipes-kernel/linux/files/k2l-evm/cmem.dtsi @@ -0,0 +1,42 @@ +/ { + reserved-memory { + mpm_block_mem_0: mpm_block_mem@820000000 { + reg = <0x00000008 0x20000000 0x00000000 0x02000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_0: cmem_block_mem@829000000 { + reg = <0x00000008 0x22000000 0x00000000 0x1E000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_1: cmem_block_mem@00c100000 { + reg = <0x00000000 0x0c000000 0x00000000 0x00180000>; + no-map; + status = "okay"; + }; + }; + + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; + + #pool-size-cells = <2>; + + status = "okay"; + + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x00000000 0x1E000000>; + }; + + cmem_block_1: cmem_block@1 { + reg = <1>; + memory-region = <&cmem_block_mem_1>; + }; + }; +};