Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 5 Apr 2016 23:57:33 +0000 (09:57 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 5 Apr 2016 23:57:33 +0000 (09:57 +1000)
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

1  2 
arch/arm/boot/dts/exynos5250-arndale.dts
arch/arm/boot/dts/exynos5250-snow-common.dtsi
arch/arm/boot/dts/exynos5250-spring.dts
arch/arm/boot/dts/exynos5420-peach-pit.dts
arch/arm/boot/dts/exynos5420-smdk5420.dts
arch/arm/boot/dts/exynos5800-peach-pi.dts

                        label = "SW-TACT2";
                        gpios = <&gpx1 4 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_MENU>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                home {
                        label = "SW-TACT3";
                        gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_HOME>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                up {
                        label = "SW-TACT4";
                        gpios = <&gpx1 6 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_UP>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                down {
                        label = "SW-TACT5";
                        gpios = <&gpx1 7 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_DOWN>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                back {
                        label = "SW-TACT6";
                        gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_BACK>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                wakeup {
                        label = "SW-TACT7";
                        gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WAKEUP>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
        };
  
  &dp {
        status = "okay";
        samsung,color-space = <0>;
-       samsung,dynamic-range = <0>;
-       samsung,ycbcr-coeff = <0>;
        samsung,color-depth = <1>;
        samsung,link-rate = <0x0a>;
        samsung,lane-count = <4>;
@@@ -37,7 -37,7 +37,7 @@@
                        label = "Power";
                        gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                lid-switch {
@@@ -46,7 -46,7 +46,7 @@@
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <0>; /* SW_LID */
                        debounce-interval = <1>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
        };
  
        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 {
@@@ -37,7 -37,7 +37,7 @@@
                        label = "Power";
                        gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                lid-switch {
@@@ -46,7 -46,7 +46,7 @@@
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <0>; /* SW_LID */
                        debounce-interval = <1>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
        };
  
        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 = <0x0a>;
        samsung,lane-count = <1>;
-       samsung,hpd-gpio = <&gpc3 0 GPIO_ACTIVE_HIGH>;
+       hpd-gpios = <&gpc3 0 GPIO_ACTIVE_HIGH>;
  };
  
  &ehci {
@@@ -15,7 -15,6 +15,7 @@@
  #include <dt-bindings/clock/maxim,max77802.h>
  #include <dt-bindings/regulator/maxim,max77802.h>
  #include "exynos5420.dtsi"
 +#include "exynos5420-cpus.dtsi"
  
  / {
        model = "Google Peach Pit Rev 6+";
@@@ -65,7 -64,7 +65,7 @@@
                        label = "Power";
                        gpios = <&gpx1 2 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                lid-switch {
@@@ -74,7 -73,7 +74,7 @@@
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <0>; /* SW_LID */
                        debounce-interval = <1>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
        };
  
        vdd-supply = <&ldo9_reg>;
  };
  
 +&cpu0 {
 +      cpu-supply = <&buck2_reg>;
 +};
 +
 +&cpu4 {
 +      cpu-supply = <&buck6_reg>;
 +};
 +
  &dp {
        status = "okay";
        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 {
@@@ -11,7 -11,6 +11,7 @@@
  
  /dts-v1/;
  #include "exynos5420.dtsi"
 +#include "exynos5420-cpus.dtsi"
  #include <dt-bindings/gpio/gpio.h>
  
  / {
  
  };
  
 +&cpu0 {
 +      cpu-supply = <&buck2_reg>;
 +};
 +
 +&cpu4 {
 +      cpu-supply = <&buck6_reg>;
 +};
 +
  &dp {
        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 = <4>;
@@@ -15,7 -15,6 +15,7 @@@
  #include <dt-bindings/clock/maxim,max77802.h>
  #include <dt-bindings/regulator/maxim,max77802.h>
  #include "exynos5800.dtsi"
 +#include "exynos5420-cpus.dtsi"
  
  / {
        model = "Google Peach Pi Rev 10+";
@@@ -64,7 -63,7 +64,7 @@@
                        label = "Power";
                        gpios = <&gpx1 2 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
                lid-switch {
@@@ -73,7 -72,7 +73,7 @@@
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <0>; /* SW_LID */
                        debounce-interval = <1>;
 -                      gpio-key,wakeup;
 +                      wakeup-source;
                };
  
        };
        vdd-supply = <&ldo9_reg>;
  };
  
 +&cpu0 {
 +      cpu-supply = <&buck2_reg>;
 +};
 +
 +&cpu4 {
 +      cpu-supply = <&buck6_reg>;
 +};
 +
  &dp {
        status = "okay";
        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 = <0x0a>;
        samsung,lane-count = <2>;