diff options
author | Heiko Stuebner <heiko@sntech.de> | 2015-01-28 11:23:10 -0500 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2015-01-29 18:10:59 -0500 |
commit | c25d8cbcd840b2c9774a285ea728e72dd56aea2e (patch) | |
tree | 9118a7d93a7d87a6016b83ba9311982346dc3656 | |
parent | 863b76b2b5da45cdf8819c4db468adfd2f0292f0 (diff) |
ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards
Currently the hdmi driver is using one of the soc i2c busses for ddc probing
and while documentation always specifies i2c5 as hdmi-i2c it could very well
be any other bus as well.
Therefore this is a property of the board and should be specified there.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r-- | arch/arm/boot/dts/rk3288-evb.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/rk3288-firefly.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/rk3288.dtsi | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index 6857730ca0c1..86ede5893ab6 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi | |||
@@ -105,6 +105,7 @@ | |||
105 | }; | 105 | }; |
106 | 106 | ||
107 | &hdmi { | 107 | &hdmi { |
108 | ddc-i2c-bus = <&i2c5>; | ||
108 | status = "okay"; | 109 | status = "okay"; |
109 | }; | 110 | }; |
110 | 111 | ||
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi index 6dcc5e9d9480..e6f873abbe0d 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi | |||
@@ -180,6 +180,7 @@ | |||
180 | }; | 180 | }; |
181 | 181 | ||
182 | &hdmi { | 182 | &hdmi { |
183 | ddc-i2c-bus = <&i2c5>; | ||
183 | status = "okay"; | 184 | status = "okay"; |
184 | }; | 185 | }; |
185 | 186 | ||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 1e75a0f556d4..1141850d0acb 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi | |||
@@ -646,7 +646,6 @@ | |||
646 | compatible = "rockchip,rk3288-dw-hdmi"; | 646 | compatible = "rockchip,rk3288-dw-hdmi"; |
647 | reg = <0xff980000 0x20000>; | 647 | reg = <0xff980000 0x20000>; |
648 | reg-io-width = <4>; | 648 | reg-io-width = <4>; |
649 | ddc-i2c-bus = <&i2c5>; | ||
650 | rockchip,grf = <&grf>; | 649 | rockchip,grf = <&grf>; |
651 | interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; | 650 | interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; |
652 | clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>; | 651 | clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>; |