Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 841e3ed9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit 59dfafd0

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: default avatarMark 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e16a4884

arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
/memreserve/ 0x05e00000 0x00100000;



#include "hi6220.dtsi"

#include "hi6220-ion.dtsi"



/ {

	model = "HiKey Development Board";

arch/arm64/boot/dts/hisilicon/hi6220-ion.dtsi

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/ {

	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";

		};

	};



};