diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-04-06 09:57:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-04-06 09:57:33 +1000 |
| commit | d00b39c17573ece6f5fb1385314877d29f540db8 (patch) | |
| tree | 859eda0522e4a5bbfd727c07ec210686cb799b08 /arch/arm/boot/dts/exynos5420-peach-pit.dts | |
| parent | 85bd5ac371c844f66918dda8c83145a26a55f9f2 (diff) | |
| parent | 7b4b7a8db439dca4342a0424b3d99d878a4e5a12 (diff) | |
| download | blackbird-obmc-linux-d00b39c17573ece6f5fb1385314877d29f540db8.tar.gz blackbird-obmc-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/exynos5420-peach-pit.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 3981ddb25036..7ddb6a066b28 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -157,12 +157,10 @@ pinctrl-names = "default"; pinctrl-0 = <&dp_hpd_gpio>; samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; samsung,color-depth = <1>; samsung,link-rate = <0x06>; samsung,lane-count = <2>; - samsung,hpd-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>; + hpd-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>; ports { port@0 { |
