forked from hardkernel/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
28 changed files
with
4,106 additions
and
3,258 deletions.
There are no files selected for viewing
52 changes: 52 additions & 0 deletions
52
Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| Analogix Display Port bridge bindings | ||
|
|
||
| Required properties for dp-controller: | ||
| -compatible: | ||
| platform specific such as: | ||
| * "samsung,exynos5-dp" | ||
| * "rockchip,rk3288-dp" | ||
| -reg: | ||
| physical base address of the controller and length | ||
| of memory mapped region. | ||
| -interrupts: | ||
| interrupt combiner values. | ||
| -clocks: | ||
| from common clock binding: handle to dp clock. | ||
| -clock-names: | ||
| from common clock binding: Shall be "dp". | ||
| -interrupt-parent: | ||
| phandle to Interrupt combiner node. | ||
| -phys: | ||
| from general PHY binding: the phandle for the PHY device. | ||
| -phy-names: | ||
| from general PHY binding: Should be "dp". | ||
|
|
||
| Optional properties for dp-controller: | ||
| -force-hpd: | ||
| Indicate driver need force hpd when hpd detect failed, this | ||
| is used for some eDP screen which don't have hpd signal. | ||
| -hpd-gpios: | ||
| Hotplug detect GPIO. | ||
| Indicates which GPIO should be used for hotplug detection | ||
| -port@[X]: SoC specific port nodes with endpoint definitions as defined | ||
| in Documentation/devicetree/bindings/media/video-interfaces.txt, | ||
| please refer to the SoC specific binding document: | ||
| * Documentation/devicetree/bindings/display/exynos/exynos_dp.txt | ||
| * Documentation/devicetree/bindings/video/analogix_dp-rockchip.txt | ||
|
|
||
| [1]: Documentation/devicetree/bindings/media/video-interfaces.txt | ||
| ------------------------------------------------------------------------------- | ||
|
|
||
| Example: | ||
|
|
||
| dp-controller { | ||
| compatible = "samsung,exynos5-dp"; | ||
| reg = <0x145b0000 0x10000>; | ||
| interrupts = <10 3>; | ||
| interrupt-parent = <&combiner>; | ||
| clocks = <&clock 342>; | ||
| clock-names = "dp"; | ||
|
|
||
| phys = <&dp_phy>; | ||
| phy-names = "dp"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| Rockchip RK3288 specific extensions to the Analogix Display Port | ||
| ================================ | ||
|
|
||
| Required properties: | ||
| - compatible: "rockchip,rk3288-edp"; | ||
|
|
||
| - reg: physical base address of the controller and length | ||
|
|
||
| - clocks: from common clock binding: handle to dp clock. | ||
| of memory mapped region. | ||
|
|
||
| - clock-names: from common clock binding: | ||
| Required elements: "dp" "pclk" | ||
|
|
||
| - resets: Must contain an entry for each entry in reset-names. | ||
| See ../reset/reset.txt for details. | ||
|
|
||
| - pinctrl-names: Names corresponding to the chip hotplug pinctrl states. | ||
| - pinctrl-0: pin-control mode. should be <&edp_hpd> | ||
|
|
||
| - reset-names: Must include the name "dp" | ||
|
|
||
| - rockchip,grf: this soc should set GRF regs, so need get grf here. | ||
|
|
||
| - ports: there are 2 port nodes with endpoint definitions as defined in | ||
| Documentation/devicetree/bindings/media/video-interfaces.txt. | ||
| Port 0: contained 2 endpoints, connecting to the output of vop. | ||
| Port 1: contained 1 endpoint, connecting to the input of panel. | ||
|
|
||
| For the below properties, please refer to Analogix DP binding document: | ||
| * Documentation/devicetree/bindings/drm/bridge/analogix_dp.txt | ||
| - phys (required) | ||
| - phy-names (required) | ||
| - hpd-gpios (optional) | ||
| - force-hpd (optional) | ||
| ------------------------------------------------------------------------------- | ||
|
|
||
| Example: | ||
| dp-controller: dp@ff970000 { | ||
| compatible = "rockchip,rk3288-dp"; | ||
| reg = <0xff970000 0x4000>; | ||
| interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>; | ||
| clock-names = "dp", "pclk"; | ||
| phys = <&dp_phy>; | ||
| phy-names = "dp"; | ||
|
|
||
| rockchip,grf = <&grf>; | ||
| resets = <&cru 111>; | ||
| reset-names = "dp"; | ||
|
|
||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&edp_hpd>; | ||
|
|
||
| status = "disabled"; | ||
|
|
||
| ports { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| edp_in: port@0 { | ||
| reg = <0>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| edp_in_vopb: endpoint@0 { | ||
| reg = <0>; | ||
| remote-endpoint = <&vopb_out_edp>; | ||
| }; | ||
| edp_in_vopl: endpoint@1 { | ||
| reg = <1>; | ||
| remote-endpoint = <&vopl_out_edp>; | ||
| }; | ||
| }; | ||
|
|
||
| edp_out: port@1 { | ||
| reg = <1>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| edp_out_panel: endpoint { | ||
| reg = <0>; | ||
| remote-endpoint = <&panel_in_edp> | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| pinctrl { | ||
| edp { | ||
| edp_hpd: edp-hpd { | ||
| rockchip,pins = <7 11 RK_FUNC_2 &pcfg_pull_none>; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| config DRM_ANALOGIX_DP | ||
| tristate | ||
| depends on DRM |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o | ||
| obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o |
Oops, something went wrong.