浏览代码

Revert "arm64: dts: Add dts files to enable ION on Hi6220 SoC."

This reverts commit 59dfafd03fc67d38307d2ba30bbfdd1224b8a75d

Mark Brown reports that the dts file should not be accepted at this time
as it is not following the convention that has been agreed on for the
ion drivers.

Reported-by: Mark Brown <broonie@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Chen Feng <puck.chen@hisilicon.com>
Cc: Yu Dongbin <yudongbin@hisilicon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman 9 年之前
父节点
当前提交
841e3ed977
共有 2 个文件被更改,包括 0 次插入21 次删除
  1. 0 1
      arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
  2. 0 20
      arch/arm64/boot/dts/hisilicon/hi6220-ion.dtsi

+ 0 - 1
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

@@ -11,7 +11,6 @@
 /memreserve/ 0x05e00000 0x00100000;
 
 #include "hi6220.dtsi"
-#include "hi6220-ion.dtsi"
 
 / {
 	model = "HiKey Development Board";

+ 0 - 20
arch/arm64/boot/dts/hisilicon/hi6220-ion.dtsi

@@ -1,20 +0,0 @@
-/ {
-	hi6220-ion {
-		compatible = "hisilicon,hi6220-ion";
-		heap_sys_user@0 {
-			heap-name = "sys_user";
-			heap-id   = <0x0>;
-			heap-base = <0x0>;
-			heap-size = <0x0>;
-			heap-type = "ion_system";
-		};
-		heap_sys_contig@0 {
-			heap-name = "sys_contig";
-			heap-id   = <0x1>;
-			heap-base = <0x0>;
-			heap-size = <0x0>;
-			heap-type = "ion_system_contig";
-		};
-	};
-
-};