diff options
| author | xinliang.liu <xinliang.liu@linaro.org> | 2015-06-08 10:55:23 +0800 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@linaro.org> | 2015-07-06 17:29:42 +0800 |
| commit | 8c2766dba23e1eb84ad145afa93d43b184291b9e (patch) | |
| tree | 986134664b8514720e2441b86b37661b22554d24 /arch | |
| parent | 5c27e19846e2b1347d00bf6df180043e78ec02c9 (diff) | |
dts: hikey: Mv ion node to board dts file
Signed-off-by: xinliang.liu <xinliang.liu@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/hi6220-hikey.dts | 16 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/hi6220.dtsi | 48 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
3 files changed, 16 insertions, 49 deletions
diff --git a/arch/arm64/boot/dts/hi6220-hikey.dts b/arch/arm64/boot/dts/hi6220-hikey.dts index 2e5db3ee4de6..3a8d0d8e681b 100644 --- a/arch/arm64/boot/dts/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hi6220-hikey.dts @@ -194,4 +194,20 @@ startup-delay-us = <70000>; enable-active-high; }; + + hisi-ion@0 { + compatible = "hisilicon,ion"; + + heap_sys_user@0 { + heap-name = "sys_user"; + heap-range = <0x0 0x0>; + heap-type = "ion_system"; + }; + + heap_sys_contig@0 { + heap-name = "sys_contig"; + heap-range = <0x0 0x0>; + heap-type = "ion_system_contig"; + }; + }; }; diff --git a/arch/arm64/boot/dts/hi6220.dtsi b/arch/arm64/boot/dts/hi6220.dtsi index d6ad83606b48..d3428f4db9d8 100644 --- a/arch/arm64/boot/dts/hi6220.dtsi +++ b/arch/arm64/boot/dts/hi6220.dtsi @@ -956,54 +956,6 @@ }; }; - hisi-ion@0 { - compatible = "hisilicon,ion"; - memreserve_base = <0x1ff00000>; - memreserve_size = <0x18d00000>; - - heap_fb@0 { - heap-name = "fb"; - heap-range = <0x37300000 0x01900000>; - heap-type = "ion_carveout"; - }; - - heap_vpu@0 { - heap-name = "vpu"; - heap-range = <0x34200000 0x03100000>; - heap-type = "ion_carveout"; - }; - - heap_jpu@0 { - heap-name = "jpu"; - heap-range = <0x33100000 0x01100000>; - heap-type = "ion_carveout"; - }; - - heap_gralloc@0 { - heap-name = "gralloc-carveout"; - heap-range = <0x27b00000 0x0b600000>; - heap-type = "ion_carveout"; - }; - - heap_overlay@0 { - heap-name = "overlay"; - heap-range = <0x1ff00000 0x07c00000>; - heap-type = "ion_carveout"; - }; - - heap_sys_user@0 { - heap-name = "sys_user"; - heap-range = <0x0 0x0>; - heap-type = "ion_system"; - }; - - heap_sys_contig@0 { - heap-name = "sys_contig"; - heap-range = <0x0 0x0>; - heap-type = "ion_system_contig"; - }; - }; - mali:mali@f4080000 { compatible = "arm,mali-450", "arm,mali-utgard"; reg = <0x0 0x3f100000 0x0 0x00708000>; diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 2f0475f73e4f..299aeb9d258d 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -278,7 +278,6 @@ CONFIG_MALI_PLAT_SPECIFIC_DT=y CONFIG_DRM=y CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_HISI=y -CONFIG_ION=y CONFIG_ION_HISI=y CONFIG_FB_ARMCLCD=y CONFIG_FRAMEBUFFER_CONSOLE=y |