Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8114fabc authored by Jingoo Han's avatar Jingoo Han Committed by Greg Kroah-Hartman
Browse files

video: exynos_dp: Use the generic PHY driver 



Use the generic PHY API to control the DP PHY.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9b1e013

Documentation/devicetree/bindings/video/exynos_dp.txt

+9 −8
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ We use two nodes: 
	-dptx-phy node(defined inside dp-controller node)



For the DP-PHY initialization, we use the dptx-phy node.

Required properties for dptx-phy:

	-reg:

Required properties for dptx-phy: deprecated, use phys and phy-names

	-reg: deprecated

		Base address of DP PHY register.

	-samsung,enable-mask:

	-samsung,enable-mask: deprecated

		The bit-mask used to enable/disable DP PHY.



For the Panel initialization, we read data from dp-controller node.
@@ -27,6 +27,10 @@ Required properties for dp-controller: 
		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".

	-samsung,color-space:

		input video data format.

			COLOR_RGB = 0, COLOR_YCBCR422 = 1, COLOR_YCBCR444 = 2
@@ -68,11 +72,8 @@ SOC specific portion: 
		clocks = <&clock 342>;

		clock-names = "dp";



		dptx-phy {

			reg = <0x10040720>;

			samsung,enable-mask = <1>;

		};



		phys = <&dp_phy>;

		phy-names = "dp";

	};



Board Specific portion:

drivers/video/exynos/exynos_dp_core.c

+12 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/of.h>

#include <linux/phy/phy.h>



#include "exynos_dp_core.h"
@@ -960,8 +961,11 @@ static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp) 


	dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy");

	if (!dp_phy_node) {

		dev_err(dp->dev, "could not find dptx-phy node\n");

		return -ENODEV;

		dp->phy = devm_phy_get(dp->dev, "dp");

		if (IS_ERR(dp->phy))

			return PTR_ERR(dp->phy);

		else

			return 0;

	}



	if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) {
@@ -992,7 +996,9 @@ err: 


static void exynos_dp_phy_init(struct exynos_dp_device *dp)

{

	if (dp->phy_addr) {

	if (dp->phy) {

		phy_power_on(dp->phy);

	} else if (dp->phy_addr) {

		u32 reg;



		reg = __raw_readl(dp->phy_addr);
@@ -1003,7 +1009,9 @@ static void exynos_dp_phy_init(struct exynos_dp_device *dp) 


static void exynos_dp_phy_exit(struct exynos_dp_device *dp)

{

	if (dp->phy_addr) {

	if (dp->phy) {

		phy_power_off(dp->phy);

	} else if (dp->phy_addr) {

		u32 reg;



		reg = __raw_readl(dp->phy_addr);

drivers/video/exynos/exynos_dp_core.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ struct exynos_dp_device { 
	struct video_info	*video_info;

	struct link_train	link_train;

	struct work_struct	hotplug_work;

	struct phy		*phy;

};



/* exynos_dp_reg.c */