summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-09-24 16:51:43 -0700
committerOlof Johansson <olof@lixom.net>2015-09-24 16:51:43 -0700
commitfe5b2756c1acbfc2d9df380523ef6320e69bb166 (patch)
tree17d2a1ca862df16917f27f0393bc12ffc87f78a5 /arch
parent79a313f5a587eae14a0f96df5d819c2fe266e3e9 (diff)
parenta797451b3a595759b4df48150e611237d4bd204a (diff)
downloadlinux-fe5b2756c1acbfc2d9df380523ef6320e69bb166.tar.bz2
Merge tag 'v4.3-rockchip32-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
Add the ddc-i2c-bus reference to the veyron hdmi nodes, so that they can read the edid of connected displays. * tag 'v4.3-rockchip32-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: Add ddc i2c reference to veyron Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/rk3288-veyron.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 2fa7a0dc83f7..275c78ccc0f3 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -158,6 +158,7 @@
};
&hdmi {
+ ddc-i2c-bus = <&i2c5>;
status = "okay";
};