diff options
| author | Simon Glass | 2016-11-13 14:22:08 -0700 |
|---|---|---|
| committer | Simon Glass | 2016-11-25 17:59:31 -0700 |
| commit | 987a404aa15f915638279a5520328eace8edd72f (patch) | |
| tree | 63b0cb1cbcf0dd2081b1bf399f6ab9f65d93fe89 /arch | |
| parent | 1b68283b64a7a1847410eff20886bd7bbfd8f9a6 (diff) | |
rockchip: video: Check for device in use
Check whether a display device is in use before using it. Add a comment as
to why two displays cannot currently be used at the same time.
This allows us to remove the device-tree change that disables vopb on
jerry.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/rk3288-jerry.dts | 5 | ||||
| -rw-r--r-- | arch/arm/dts/rk3288-veyron-chromebook.dtsi | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/dts/rk3288-jerry.dts b/arch/arm/dts/rk3288-jerry.dts index 2aa3b9f9714..da37ea8e7ad 100644 --- a/arch/arm/dts/rk3288-jerry.dts +++ b/arch/arm/dts/rk3288-jerry.dts @@ -108,11 +108,6 @@ pinctrl-0 = <&vcc50_hdmi_en>; }; -&vopb { - /* Disable this so that we use vopl */ - status = "disabled"; -}; - &edp { pinctrl-names = "default"; pinctrl-0 = <&edp_hpd>; diff --git a/arch/arm/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/dts/rk3288-veyron-chromebook.dtsi index bbbc2f408d6..f88a8680bfa 100644 --- a/arch/arm/dts/rk3288-veyron-chromebook.dtsi +++ b/arch/arm/dts/rk3288-veyron-chromebook.dtsi @@ -13,6 +13,8 @@ / { aliases { i2c20 = &i2c_tunnel; + video0 = &vopl; + video1 = &vopb; }; gpio_keys: gpio-keys { |