summaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
diff options
context:
space:
mode:
authorThomas Gleixner2019-07-28 22:22:40 +0200
committerThomas Gleixner2019-07-28 22:22:40 +0200
commit7a30bdd99f37352b188575b27924c407c6ddff9e (patch)
tree10ea40ab1b5211e75c33eaddb3a6b393ad6ee7ad /arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
parentx86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS (diff)
parentLinux 5.3-rc2 (diff)
downloadkernel-qcow2-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.gz
kernel-qcow2-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.xz
kernel-qcow2-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.zip
Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Pick up the spectre documentation so the Grand Schemozzle can be added.
Diffstat (limited to 'arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi')
-rw-r--r--arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index d2de16645e10..6f90b0e62cba 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -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";