diff options
author | Dave Airlie <airlied@redhat.com> | 2016-04-06 01:57:33 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-04-06 01:57:33 +0200 |
commit | d00b39c17573ece6f5fb1385314877d29f540db8 (patch) | |
tree | 859eda0522e4a5bbfd727c07ec210686cb799b08 /arch/arm/boot/dts/exynos5250-snow-common.dtsi | |
parent | Merge tag 'drm-intel-next-2016-03-30' of git://anongit.freedesktop.org/drm-in... (diff) | |
parent | drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable time (diff) | |
download | linux-d00b39c17573ece6f5fb1385314877d29f540db8.tar.xz linux-d00b39c17573ece6f5fb1385314877d29f540db8.zip |
Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next
This pull request want to land the analogix_dp driver into drm/bridge directory,
which reused the Exynos DP code, and add Rockchip DP support. And those
patches have been:
* 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux:
drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable time
drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time
drm: bridge: analogix/dp: add edid modes parse in get_modes method
drm: bridge: analogix/dp: move hpd detect to connector detect function
drm: bridge: analogix/dp: try force hpd after plug in lookup failed
drm: bridge: analogix/dp: add max link rate and lane count limit for RK3288
drm: bridge: analogix/dp: add some rk3288 special registers setting
dt-bindings: add document for rockchip variant of analogix_dp
drm: rockchip: dp: add rockchip platform dp driver
ARM: dts: exynos/dp: remove some properties that deprecated by analogix_dp driver
dt-bindings: add document for analogix display port driver
drm: bridge: analogix/dp: dynamic parse sync_pol & interlace & dynamic_range
drm: bridge: analogix/dp: remove duplicate configuration of link rate and link count
drm: bridge: analogix/dp: fix some obvious code style
drm: bridge: analogix/dp: rename register constants
drm/exynos: dp: rename implementation specific driver part
drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Diffstat (limited to 'arch/arm/boot/dts/exynos5250-snow-common.dtsi')
-rw-r--r-- | arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi index 95210ef6a6b5..746808f401e5 100644 --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi @@ -236,12 +236,10 @@ pinctrl-names = "default"; pinctrl-0 = <&dp_hpd>; samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; samsung,color-depth = <1>; samsung,link-rate = <0x0a>; samsung,lane-count = <2>; - samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>; + hpd-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>; ports { port@0 { |