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

Commit ff3b8609 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt64-5.3' of... 

Merge tag 'samsung-dt64-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM64 changes for v5.3

Add Mali nodes to Exynos5433 and Exynos7.

* tag 'samsung-dt64-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  arm64: dts: exynos: Add GPU/Mali T760 node to Exynos7
  arm64: dts: exynos: Add GPU/Mali T760 node to Exynos5433

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9aa7ae43 4dc2a25d

arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -350,6 +350,11 @@ 
	pinctrl-0 = <&te_irq>;

};



&gpu {

	mali-supply = <&buck6_reg>;

	status = "okay";

};



&hdmi {

	hpd-gpios = <&gpa3 0 GPIO_ACTIVE_HIGH>;

	status = "okay";

arch/arm64/boot/dts/exynos/exynos5433.dtsi

+51 −0
Original line number Diff line number Diff line
@@ -249,6 +249,57 @@ 
		};

	};



	gpu: gpu@14ac0000 {

		compatible = "samsung,exynos5433-mali", "arm,mali-t760";

		reg = <0x14ac0000 0x5000>;

		interrupts = <GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "job", "mmu", "gpu";

		clocks = <&cmu_g3d CLK_ACLK_G3D>;

		clock-names = "core";

		power-domains = <&pd_g3d>;

		operating-points-v2 = <&gpu_opp_table>;

		status = "disabled";



		gpu_opp_table: opp_table {

			compatible = "operating-points-v2";



			opp-160000000 {

				opp-hz = /bits/ 64 <160000000>;

				opp-microvolt = <1000000>;

			};

			opp-267000000 {

				opp-hz = /bits/ 64 <267000000>;

				opp-microvolt = <1000000>;

			};

			opp-350000000 {

				opp-hz = /bits/ 64 <350000000>;

				opp-microvolt = <1025000>;

			};

			opp-420000000 {

				opp-hz = /bits/ 64 <420000000>;

				opp-microvolt = <1025000>;

			};

			opp-500000000 {

				opp-hz = /bits/ 64 <500000000>;

				opp-microvolt = <1075000>;

			};

			opp-550000000 {

				opp-hz = /bits/ 64 <550000000>;

				opp-microvolt = <1125000>;

			};

			opp-600000000 {

				opp-hz = /bits/ 64 <600000000>;

				opp-microvolt = <1150000>;

			};

			opp-700000000 {

				opp-hz = /bits/ 64 <700000000>;

				opp-microvolt = <1150000>;

			};

		};

	};



	psci {

		compatible = "arm,psci";

		method = "smc";

arch/arm64/boot/dts/exynos/exynos7-espresso.dts

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ 
	clock-frequency = <24000000>;

};



&gpu {

	mali-supply = <&buck6_reg>;

	status = "okay";

};



&serial_2 {

	status = "okay";

};

arch/arm64/boot/dts/exynos/exynos7.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -78,6 +78,17 @@ 
		};

	};



	gpu: gpu@14ac0000 {

		compatible = "samsung,exynos5433-mali", "arm,mali-t760";

		reg = <0x14ac0000 0x5000>;

		interrupts = <GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "job", "mmu", "gpu";

		status = "disabled";

		/* TODO: operating points for DVFS, cooling device */

	};



	psci {

		compatible = "arm,psci-0.2";

		method = "smc";