diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2017-10-20 06:07:32 -0400 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2017-10-21 15:53:04 -0400 |
commit | be84dfa70dde6bb072c9cc9bba0a741841f0baa2 (patch) | |
tree | db310ba3f6f27dc8fcd68014e5e1c8b265345bd6 | |
parent | 838980dd04e994bf81cf104fa01ae60802146b39 (diff) |
ARM: dts: rockchip: enable the hdmi output on the rk3288-firefly-reload
The vdd10_lcd and vcc18_lcd regulators need to be enabled for HDMI output
to work, so add 'regulator-always-on', just as is done in rk3288-firefly.dtsi.
Also enable i2c5, the hdmi block and configure the correc cec pin.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r-- | arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/rk3288-firefly-reload.dts | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi index 5f05815f47e0..5f1e336dbaac 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | |||
@@ -184,6 +184,7 @@ | |||
184 | regulator-name = "vdd10_lcd"; | 184 | regulator-name = "vdd10_lcd"; |
185 | regulator-min-microvolt = <1000000>; | 185 | regulator-min-microvolt = <1000000>; |
186 | regulator-max-microvolt = <1000000>; | 186 | regulator-max-microvolt = <1000000>; |
187 | regulator-always-on; | ||
187 | }; | 188 | }; |
188 | 189 | ||
189 | vcca_18: REG7 { | 190 | vcca_18: REG7 { |
@@ -223,6 +224,7 @@ | |||
223 | regulator-name = "vcc18_lcd"; | 224 | regulator-name = "vcc18_lcd"; |
224 | regulator-min-microvolt = <1800000>; | 225 | regulator-min-microvolt = <1800000>; |
225 | regulator-max-microvolt = <1800000>; | 226 | regulator-max-microvolt = <1800000>; |
227 | regulator-always-on; | ||
226 | }; | 228 | }; |
227 | }; | 229 | }; |
228 | }; | 230 | }; |
diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 7da0947ababb..eab176e3dfc3 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts | |||
@@ -226,6 +226,13 @@ | |||
226 | }; | 226 | }; |
227 | }; | 227 | }; |
228 | 228 | ||
229 | &hdmi { | ||
230 | ddc-i2c-bus = <&i2c5>; | ||
231 | pinctrl-names = "default"; | ||
232 | pinctrl-0 = <&hdmi_cec_c0>; | ||
233 | status = "okay"; | ||
234 | }; | ||
235 | |||
229 | &i2c0 { | 236 | &i2c0 { |
230 | hym8563: hym8563@51 { | 237 | hym8563: hym8563@51 { |
231 | compatible = "haoyu,hym8563"; | 238 | compatible = "haoyu,hym8563"; |
@@ -255,6 +262,10 @@ | |||
255 | }; | 262 | }; |
256 | }; | 263 | }; |
257 | 264 | ||
265 | &i2c5 { | ||
266 | status = "okay"; | ||
267 | }; | ||
268 | |||
258 | &i2s { | 269 | &i2s { |
259 | status = "okay"; | 270 | status = "okay"; |
260 | }; | 271 | }; |