| Message ID | 1441087455-25533-1-git-send-email-ykk@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Dienstag, 1. September 2015, 14:04:15 schrieb Yakir Yang: > This phy driver would control the Rockchip DisplayPort module > phy clock and phy power, it is relate to analogix_dp-rockchip > dp driver. If you want DP works rightly on rockchip platform, > then you should select both of them. > > Signed-off-by: Yakir Yang <ykk@rock-chips.com> > --- > Changes in v4: > - Take Kishon suggest, add commit message, and remove the redundant > rockchip_dp_phy_init() function, move those code to probe() method. > And remove driver .owner number. > > Changes in v3: > - Take Heiko suggest, add rockchip dp phy driver, > collect the phy clocks and power control. > > Changes in v2: None > > .../devicetree/bindings/phy/rockchip-dp-phy.txt | 26 ++++ > drivers/phy/Kconfig | 7 + > drivers/phy/Makefile | 1 + > drivers/phy/phy-rockchip-dp.c | 166 > +++++++++++++++++++++ 4 files changed, 200 insertions(+) > create mode 100644 > Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt create mode > 100644 drivers/phy/phy-rockchip-dp.c > > diff --git a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt > b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt new file mode > 100644 > index 0000000..5de1088 > --- /dev/null > +++ b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt > @@ -0,0 +1,26 @@ > +Rockchip Soc Seroes Display Port PHY > +------------------------------------ > + > +Required properties: > +- compatible : should be one of the following supported values: > + - "rockchip.rk3288-dp-phy" > + > +- reg : a list of registers used by phy driver nodes do not necessarily need to have a regs property. You can do all operations via the grf syscon already. > +- clocks: from common clock binding: handle to dp clock. > + of memory mapped region. > +- clock-names: from common clock binding: > + Required elements: "sclk_dp" "sclk_dp_24m" > + > +- rockchip,grf: this soc should set GRF regs, so need get grf here. > +- #phy-cells : from the generic PHY bindings, must be 0; > + > +Example: > + > +edp_phy: phy@ff770274 { edp_phy: edp-phy { > + compatilble = "rockchip,rk3288-dp-phy"; > + reg = <0xff770274 4>; no regs property > + rockchip,grf = <&grf>; > + clocks = <&cru SCLK_EDP_24M>; > + clock-names = "24m"; > + #phy-cells = <0>; > +} > diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig > index 47da573..8f2bc4f 100644 > --- a/drivers/phy/Kconfig > +++ b/drivers/phy/Kconfig > @@ -310,6 +310,13 @@ config PHY_ROCKCHIP_USB > help > Enable this to support the Rockchip USB 2.0 PHY. > > +config PHY_ROCKCHIP_DP > + tristate "Rockchip Display Port PHY Driver" > + depends on ARCH_ROCKCHIP && OF > + select GENERIC_PHY > + help > + Enable this to support the Rockchip Display Port PHY. > + > config PHY_ST_SPEAR1310_MIPHY > tristate "ST SPEAR1310-MIPHY driver" > select GENERIC_PHY > diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile > index a5b18c1..e281f35 100644 > --- a/drivers/phy/Makefile > +++ b/drivers/phy/Makefile > @@ -34,6 +34,7 @@ phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2) += > phy-s5pv210-usb2.o obj-$(CONFIG_PHY_EXYNOS5_USBDRD) += phy-exynos5-usbdrd.o > obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o > obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o > +obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o > obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o > obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o > obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o > diff --git a/drivers/phy/phy-rockchip-dp.c b/drivers/phy/phy-rockchip-dp.c > new file mode 100644 > index 0000000..e9a726e > --- /dev/null > +++ b/drivers/phy/phy-rockchip-dp.c > @@ -0,0 +1,166 @@ > +/* > + * Rockchip DP PHY driver > + * > + * Copyright (C) 2015 FuZhou Rockchip Co., Ltd. > + * Author: Yakir Yang <ykk@@rock-chips.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License. > + */ > + > +#include <linux/io.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_address.h> > +#include <linux/clk.h> > +#include <linux/phy/phy.h> > +#include <linux/regmap.h> > +#include <linux/mfd/syscon.h> > +#include <linux/platform_device.h> > + > +#define GRF_SOC_CON12 0x0274 > +#define GRF_EDP_REF_CLK_SEL_INTER BIT(4) > + > +#define DP_PHY_SIDDQ_WRITE_EN BIT(21) > +#define DP_PHY_SIDDQ_ON 0 > +#define DP_PHY_SIDDQ_OFF BIT(5) > + > +struct rockchip_dp_phy { > + struct device *dev; > + struct regmap *grf; > + void __iomem *regs; > + struct clk *phy_24m; > +}; > + > +static int rockchip_dp_phy_clk_enable(struct rockchip_dp_phy *dp) > +{ > + int ret = 0; > + > + ret = clk_set_rate(dp->phy_24m, 24000000); > + if (ret < 0) { > + dev_err(dp->dev, "cannot set clock phy_24m %d\n", ret); > + return ret; > + } > + > + ret = clk_prepare_enable(dp->phy_24m); > + if (ret < 0) { > + dev_err(dp->dev, "cannot enable clock phy_24m %d\n", ret); > + return ret; > + } > + > + return 0; > +} > + > +static int rockchip_dp_phy_clk_disable(struct rockchip_dp_phy *dp) > +{ > + clk_disable_unprepare(dp->phy_24m); > + > + return 0; > +} > + > +static int rockchip_set_phy_state(struct phy *phy, bool enable) > +{ > + struct rockchip_dp_phy *dp = phy_get_drvdata(phy); > + > + if (enable) { > + rockchip_dp_phy_clk_enable(dp); > + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_ON, dp->regs); > + } else { > + rockchip_dp_phy_clk_disable(dp); > + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_OFF, dp->regs); > + } > + > + return 0; > +} > + > +static int rockchip_dp_phy_power_on(struct phy *phy) > +{ > + return rockchip_set_phy_state(phy, true); > +} > + > +static int rockchip_dp_phy_power_off(struct phy *phy) > +{ > + return rockchip_set_phy_state(phy, false); > +} > + > +static struct phy_ops rockchip_dp_phy_ops = { static const struct ... see 4a9e5ca1a54a ("phy: Constify struct phy_ops variables") > + .power_on = rockchip_dp_phy_power_on, > + .power_off = rockchip_dp_phy_power_off, > + .owner = THIS_MODULE, > +}; > + > +static int rockchip_dp_phy_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + struct phy_provider *phy_provider; > + struct rockchip_dp_phy *dp; > + struct resource *res; > + struct phy *phy; > + int ret; > + I guess this could profit from a if (!np) return -ENODEV; > + dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); > + if (IS_ERR(dp)) > + return -ENOMEM; > + > + dp->dev = dev; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + dp->regs = devm_ioremap_resource(dev, res); > + if (IS_ERR(dp->regs)) > + return PTR_ERR(dp->regs); > + > + dp->phy_24m = devm_clk_get(dev, "24m"); > + if (IS_ERR(dp->phy_24m)) { > + dev_err(dev, "cannot get clock 24m\n"); > + return PTR_ERR(dp->phy_24m); > + } > + > + dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); > + if (IS_ERR(dp->grf)) { > + dev_err(dev, "rk3288-dp needs rockchip,grf property\n"); > + return PTR_ERR(dp->grf); > + } > + > + ret = regmap_write(dp->grf, GRF_SOC_CON12, > + GRF_EDP_REF_CLK_SEL_INTER | > + (GRF_EDP_REF_CLK_SEL_INTER << 16)); > + if (ret != 0) { > + dev_err(dp->dev, "Could not config GRF edp ref clk: %d\n", ret); > + return ret; > + } > + > + phy = devm_phy_create(dev, NULL, &rockchip_dp_phy_ops, NULL); hmm, where did you find 4 params for devm_phy_create? Shouldn't this be phy = devm_phy_create(dev, np, &rockchip_dp_phy_ops); instead - and also include the phy dt-node as 2nd parameter? Heiko > + if (IS_ERR(phy)) { > + dev_err(dev, "failed to create phy\n"); > + return PTR_ERR(phy); > + } > + phy_set_drvdata(phy, dp); > + > + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); > + > + return PTR_ERR_OR_ZERO(phy_provider); > +} > + > +static const struct of_device_id rockchip_dp_phy_dt_ids[] = { > + { .compatible = "rockchip,rk3288-dp-phy" }, > + {} > +}; > + > +MODULE_DEVICE_TABLE(of, rockchip_dp_phy_dt_ids); > + > +static struct platform_driver rockchip_dp_phy_driver = { > + .probe = rockchip_dp_phy_probe, > + .driver = { > + .name = "rockchip-dp-phy", > + .of_match_table = rockchip_dp_phy_dt_ids, > + }, > +}; > + > +module_platform_driver(rockchip_dp_phy_driver); > + > +MODULE_AUTHOR("Yakir Yang <ykk@rock-chips.com>"); > +MODULE_DESCRIPTION("Rockchip DP PHY driver"); > +MODULE_LICENSE("GPL v2");
Hi Yakir, small nit more below Am Dienstag, 1. September 2015, 18:51:16 schrieb Heiko Stuebner: > Am Dienstag, 1. September 2015, 14:04:15 schrieb Yakir Yang: > > +- clocks: from common clock binding: handle to dp clock. > > + of memory mapped region. > > +- clock-names: from common clock binding: > > + Required elements: "sclk_dp" "sclk_dp_24m" > > + > > +- rockchip,grf: this soc should set GRF regs, so need get grf here. > > +- #phy-cells : from the generic PHY bindings, must be 0; > > + > > +Example: > > + > > +edp_phy: phy@ff770274 { > > edp_phy: edp-phy { > > > + compatilble = "rockchip,rk3288-dp-phy"; typo: compatible
Hi Heiko, ? 09/02/2015 12:51 AM, Heiko Stuebner ??: > Am Dienstag, 1. September 2015, 14:04:15 schrieb Yakir Yang: >> This phy driver would control the Rockchip DisplayPort module >> phy clock and phy power, it is relate to analogix_dp-rockchip >> dp driver. If you want DP works rightly on rockchip platform, >> then you should select both of them. >> >> Signed-off-by: Yakir Yang <ykk@rock-chips.com> >> --- >> Changes in v4: >> - Take Kishon suggest, add commit message, and remove the redundant >> rockchip_dp_phy_init() function, move those code to probe() method. >> And remove driver .owner number. >> >> Changes in v3: >> - Take Heiko suggest, add rockchip dp phy driver, >> collect the phy clocks and power control. >> >> Changes in v2: None >> >> .../devicetree/bindings/phy/rockchip-dp-phy.txt | 26 ++++ >> drivers/phy/Kconfig | 7 + >> drivers/phy/Makefile | 1 + >> drivers/phy/phy-rockchip-dp.c | 166 >> +++++++++++++++++++++ 4 files changed, 200 insertions(+) >> create mode 100644 >> Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt create mode >> 100644 drivers/phy/phy-rockchip-dp.c >> >> diff --git a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt >> b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt new file mode >> 100644 >> index 0000000..5de1088 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt >> @@ -0,0 +1,26 @@ >> +Rockchip Soc Seroes Display Port PHY >> +------------------------------------ >> + >> +Required properties: >> +- compatible : should be one of the following supported values: >> + - "rockchip.rk3288-dp-phy" >> + >> +- reg : a list of registers used by phy driver > nodes do not necessarily need to have a regs property. You can do all > operations via the grf syscon already. Oh, yes, the dp phy power register is belong to GRF filed, thanks. > >> +- clocks: from common clock binding: handle to dp clock. >> + of memory mapped region. >> +- clock-names: from common clock binding: >> + Required elements: "sclk_dp" "sclk_dp_24m" >> + >> +- rockchip,grf: this soc should set GRF regs, so need get grf here. >> +- #phy-cells : from the generic PHY bindings, must be 0; >> + >> +Example: >> + >> +edp_phy: phy@ff770274 { > edp_phy: edp-phy { Done, > > >> + compatilble = "rockchip,rk3288-dp-phy"; >> + reg = <0xff770274 4>; > no regs property Done >> + rockchip,grf = <&grf>; >> + clocks = <&cru SCLK_EDP_24M>; >> + clock-names = "24m"; >> + #phy-cells = <0>; >> +} >> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig >> index 47da573..8f2bc4f 100644 >> --- a/drivers/phy/Kconfig >> +++ b/drivers/phy/Kconfig >> @@ -310,6 +310,13 @@ config PHY_ROCKCHIP_USB >> help >> Enable this to support the Rockchip USB 2.0 PHY. >> >> +config PHY_ROCKCHIP_DP >> + tristate "Rockchip Display Port PHY Driver" >> + depends on ARCH_ROCKCHIP && OF >> + select GENERIC_PHY >> + help >> + Enable this to support the Rockchip Display Port PHY. >> + >> config PHY_ST_SPEAR1310_MIPHY >> tristate "ST SPEAR1310-MIPHY driver" >> select GENERIC_PHY >> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile >> index a5b18c1..e281f35 100644 >> --- a/drivers/phy/Makefile >> +++ b/drivers/phy/Makefile >> @@ -34,6 +34,7 @@ phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2) += >> phy-s5pv210-usb2.o obj-$(CONFIG_PHY_EXYNOS5_USBDRD) += phy-exynos5-usbdrd.o >> obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o >> obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o >> +obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o >> obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o >> obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o >> obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o >> diff --git a/drivers/phy/phy-rockchip-dp.c b/drivers/phy/phy-rockchip-dp.c >> new file mode 100644 >> index 0000000..e9a726e >> --- /dev/null >> +++ b/drivers/phy/phy-rockchip-dp.c >> @@ -0,0 +1,166 @@ >> +/* >> + * Rockchip DP PHY driver >> + * >> + * Copyright (C) 2015 FuZhou Rockchip Co., Ltd. >> + * Author: Yakir Yang <ykk@@rock-chips.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published by >> + * the Free Software Foundation; either version 2 of the License. >> + */ >> + >> +#include <linux/io.h> >> +#include <linux/kernel.h> >> +#include <linux/module.h> >> +#include <linux/of.h> >> +#include <linux/of_address.h> >> +#include <linux/clk.h> >> +#include <linux/phy/phy.h> >> +#include <linux/regmap.h> >> +#include <linux/mfd/syscon.h> >> +#include <linux/platform_device.h> >> + >> +#define GRF_SOC_CON12 0x0274 >> +#define GRF_EDP_REF_CLK_SEL_INTER BIT(4) >> + >> +#define DP_PHY_SIDDQ_WRITE_EN BIT(21) >> +#define DP_PHY_SIDDQ_ON 0 >> +#define DP_PHY_SIDDQ_OFF BIT(5) >> + >> +struct rockchip_dp_phy { >> + struct device *dev; >> + struct regmap *grf; >> + void __iomem *regs; >> + struct clk *phy_24m; >> +}; >> + >> +static int rockchip_dp_phy_clk_enable(struct rockchip_dp_phy *dp) >> +{ >> + int ret = 0; >> + >> + ret = clk_set_rate(dp->phy_24m, 24000000); >> + if (ret < 0) { >> + dev_err(dp->dev, "cannot set clock phy_24m %d\n", ret); >> + return ret; >> + } >> + >> + ret = clk_prepare_enable(dp->phy_24m); >> + if (ret < 0) { >> + dev_err(dp->dev, "cannot enable clock phy_24m %d\n", ret); >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static int rockchip_dp_phy_clk_disable(struct rockchip_dp_phy *dp) >> +{ >> + clk_disable_unprepare(dp->phy_24m); >> + >> + return 0; >> +} >> + >> +static int rockchip_set_phy_state(struct phy *phy, bool enable) >> +{ >> + struct rockchip_dp_phy *dp = phy_get_drvdata(phy); >> + >> + if (enable) { >> + rockchip_dp_phy_clk_enable(dp); >> + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_ON, dp->regs); >> + } else { >> + rockchip_dp_phy_clk_disable(dp); >> + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_OFF, dp->regs); >> + } >> + >> + return 0; >> +} >> + >> +static int rockchip_dp_phy_power_on(struct phy *phy) >> +{ >> + return rockchip_set_phy_state(phy, true); >> +} >> + >> +static int rockchip_dp_phy_power_off(struct phy *phy) >> +{ >> + return rockchip_set_phy_state(phy, false); >> +} >> + >> +static struct phy_ops rockchip_dp_phy_ops = { > static const struct ... > > see 4a9e5ca1a54a ("phy: Constify struct phy_ops variables") Done, thanks > >> + .power_on = rockchip_dp_phy_power_on, >> + .power_off = rockchip_dp_phy_power_off, >> + .owner = THIS_MODULE, >> +}; >> + >> +static int rockchip_dp_phy_probe(struct platform_device *pdev) >> +{ >> + struct device *dev = &pdev->dev; >> + struct device_node *np = dev->of_node; >> + struct phy_provider *phy_provider; >> + struct rockchip_dp_phy *dp; >> + struct resource *res; >> + struct phy *phy; >> + int ret; >> + > I guess this could profit from a > > if (!np) > return -ENODEV; Hmm... so we are avoiding the no of_device case, Done, >> + dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); >> + if (IS_ERR(dp)) >> + return -ENOMEM; >> + >> + dp->dev = dev; >> + >> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> + dp->regs = devm_ioremap_resource(dev, res); >> + if (IS_ERR(dp->regs)) >> + return PTR_ERR(dp->regs); >> + >> + dp->phy_24m = devm_clk_get(dev, "24m"); >> + if (IS_ERR(dp->phy_24m)) { >> + dev_err(dev, "cannot get clock 24m\n"); >> + return PTR_ERR(dp->phy_24m); >> + } >> + >> + dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); >> + if (IS_ERR(dp->grf)) { >> + dev_err(dev, "rk3288-dp needs rockchip,grf property\n"); >> + return PTR_ERR(dp->grf); >> + } >> + >> + ret = regmap_write(dp->grf, GRF_SOC_CON12, >> + GRF_EDP_REF_CLK_SEL_INTER | >> + (GRF_EDP_REF_CLK_SEL_INTER << 16)); >> + if (ret != 0) { >> + dev_err(dp->dev, "Could not config GRF edp ref clk: %d\n", ret); >> + return ret; >> + } >> + >> + phy = devm(dev, NULL, &rockchip_dp_phy_ops, NULL); > hmm, where did you find 4 params for devm_phy_create? Shouldn't this be > > phy = devm_phy_create(dev, np, &rockchip_dp_phy_ops); > > instead - and also include the phy dt-node as 2nd parameter? Oh, :-(= I used to test the driver on chrome-3.14 branch, I always back the drm head file, so there would be no drm conflict. But phy driver is missed, the 4 params is come from kernel-3.14. Thanks for your redmind, - Yakir > > Heiko > >> + if (IS_ERR(phy)) { >> + dev_err(dev, "failed to create phy\n"); >> + return PTR_ERR(phy); >> + } >> + phy_set_drvdata(phy, dp); >> + >> + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); >> + >> + return PTR_ERR_OR_ZERO(phy_provider); >> +} >> + >> +static const struct of_device_id rockchip_dp_phy_dt_ids[] = { >> + { .compatible = "rockchip,rk3288-dp-phy" }, >> + {} >> +}; >> + >> +MODULE_DEVICE_TABLE(of, rockchip_dp_phy_dt_ids); >> + >> +static struct platform_driver rockchip_dp_phy_driver = { >> + .probe = rockchip_dp_phy_probe, >> + .driver = { >> + .name = "rockchip-dp-phy", >> + .of_match_table = rockchip_dp_phy_dt_ids, >> + }, >> +}; >> + >> +module_platform_driver(rockchip_dp_phy_driver); >> + >> +MODULE_AUTHOR("Yakir Yang <ykk@rock-chips.com>"); >> +MODULE_DESCRIPTION("Rockchip DP PHY driver"); >> +MODULE_LICENSE("GPL v2"); > > >
Hi Heiko, ? 09/02/2015 04:58 AM, Heiko Stuebner ??: > Hi Yakir, > > small nit more below > > Am Dienstag, 1. September 2015, 18:51:16 schrieb Heiko Stuebner: >> Am Dienstag, 1. September 2015, 14:04:15 schrieb Yakir Yang: >>> +- clocks: from common clock binding: handle to dp clock. >>> + of memory mapped region. >>> +- clock-names: from common clock binding: >>> + Required elements: "sclk_dp" "sclk_dp_24m" >>> + >>> +- rockchip,grf: this soc should set GRF regs, so need get grf here. >>> +- #phy-cells : from the generic PHY bindings, must be 0; >>> + >>> +Example: >>> + >>> +edp_phy: phy@ff770274 { >> edp_phy: edp-phy { >> >>> + compatilble = "rockchip,rk3288-dp-phy"; > typo: compatible Aha, thanks. - Yakir > > >
On Tue, Sep 1, 2015 at 1:04 AM, Yakir Yang <ykk@rock-chips.com> wrote: > This phy driver would control the Rockchip DisplayPort module > phy clock and phy power, it is relate to analogix_dp-rockchip > dp driver. If you want DP works rightly on rockchip platform, > then you should select both of them. > > Signed-off-by: Yakir Yang <ykk@rock-chips.com> > --- > Changes in v4: > - Take Kishon suggest, add commit message, and remove the redundant > rockchip_dp_phy_init() function, move those code to probe() method. > And remove driver .owner number. > > Changes in v3: > - Take Heiko suggest, add rockchip dp phy driver, > collect the phy clocks and power control. > > Changes in v2: None > > .../devicetree/bindings/phy/rockchip-dp-phy.txt | 26 ++++ It is preferred that you split binding doc's from driver changes. > drivers/phy/Kconfig | 7 + > drivers/phy/Makefile | 1 + > drivers/phy/phy-rockchip-dp.c | 166 +++++++++++++++++++++ > 4 files changed, 200 insertions(+) > create mode 100644 Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt > create mode 100644 drivers/phy/phy-rockchip-dp.c > > diff --git a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt > new file mode 100644 > index 0000000..5de1088 > --- /dev/null > +++ b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt > @@ -0,0 +1,26 @@ > +Rockchip Soc Seroes Display Port PHY > +------------------------------------ > + > +Required properties: > +- compatible : should be one of the following supported values: > + - "rockchip.rk3288-dp-phy" > + > +- reg : a list of registers used by phy driver Please state the size of the list and order of what each entry if more than one. > +- clocks: from common clock binding: handle to dp clock. > + of memory mapped region. > +- clock-names: from common clock binding: > + Required elements: "sclk_dp" "sclk_dp_24m" > + > +- rockchip,grf: this soc should set GRF regs, so need get grf here. I have no idea what GRF means. > +- #phy-cells : from the generic PHY bindings, must be 0; > + > +Example: > + > +edp_phy: phy@ff770274 { > + compatilble = "rockchip,rk3288-dp-phy"; > + reg = <0xff770274 4>; > + rockchip,grf = <&grf>; > + clocks = <&cru SCLK_EDP_24M>; > + clock-names = "24m"; > + #phy-cells = <0>; > +} > diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig > index 47da573..8f2bc4f 100644 > --- a/drivers/phy/Kconfig > +++ b/drivers/phy/Kconfig > @@ -310,6 +310,13 @@ config PHY_ROCKCHIP_USB > help > Enable this to support the Rockchip USB 2.0 PHY. > > +config PHY_ROCKCHIP_DP > + tristate "Rockchip Display Port PHY Driver" > + depends on ARCH_ROCKCHIP && OF > + select GENERIC_PHY > + help > + Enable this to support the Rockchip Display Port PHY. > + > config PHY_ST_SPEAR1310_MIPHY > tristate "ST SPEAR1310-MIPHY driver" > select GENERIC_PHY > diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile > index a5b18c1..e281f35 100644 > --- a/drivers/phy/Makefile > +++ b/drivers/phy/Makefile > @@ -34,6 +34,7 @@ phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2) += phy-s5pv210-usb2.o > obj-$(CONFIG_PHY_EXYNOS5_USBDRD) += phy-exynos5-usbdrd.o > obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o > obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o > +obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o > obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o > obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o > obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o > diff --git a/drivers/phy/phy-rockchip-dp.c b/drivers/phy/phy-rockchip-dp.c > new file mode 100644 > index 0000000..e9a726e > --- /dev/null > +++ b/drivers/phy/phy-rockchip-dp.c > @@ -0,0 +1,166 @@ > +/* > + * Rockchip DP PHY driver > + * > + * Copyright (C) 2015 FuZhou Rockchip Co., Ltd. > + * Author: Yakir Yang <ykk@@rock-chips.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License. > + */ > + > +#include <linux/io.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_address.h> > +#include <linux/clk.h> > +#include <linux/phy/phy.h> > +#include <linux/regmap.h> > +#include <linux/mfd/syscon.h> > +#include <linux/platform_device.h> > + > +#define GRF_SOC_CON12 0x0274 > +#define GRF_EDP_REF_CLK_SEL_INTER BIT(4) > + > +#define DP_PHY_SIDDQ_WRITE_EN BIT(21) > +#define DP_PHY_SIDDQ_ON 0 > +#define DP_PHY_SIDDQ_OFF BIT(5) > + > +struct rockchip_dp_phy { > + struct device *dev; > + struct regmap *grf; > + void __iomem *regs; > + struct clk *phy_24m; > +}; > + > +static int rockchip_dp_phy_clk_enable(struct rockchip_dp_phy *dp) > +{ > + int ret = 0; > + > + ret = clk_set_rate(dp->phy_24m, 24000000); Do you need to do this every time? This can go in probe. > + if (ret < 0) { > + dev_err(dp->dev, "cannot set clock phy_24m %d\n", ret); > + return ret; > + } > + > + ret = clk_prepare_enable(dp->phy_24m); > + if (ret < 0) { > + dev_err(dp->dev, "cannot enable clock phy_24m %d\n", ret); > + return ret; > + } > + > + return 0; > +} > + > +static int rockchip_dp_phy_clk_disable(struct rockchip_dp_phy *dp) > +{ > + clk_disable_unprepare(dp->phy_24m); > + > + return 0; > +} > + > +static int rockchip_set_phy_state(struct phy *phy, bool enable) > +{ > + struct rockchip_dp_phy *dp = phy_get_drvdata(phy); > + > + if (enable) { > + rockchip_dp_phy_clk_enable(dp); > + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_ON, dp->regs); > + } else { > + rockchip_dp_phy_clk_disable(dp); > + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_OFF, dp->regs); > + } > + > + return 0; > +} I would just inline all 3 of these functions. The wrappers don't doesn't do anything, but add 2 levels of function calls. > + > +static int rockchip_dp_phy_power_on(struct phy *phy) > +{ > + return rockchip_set_phy_state(phy, true); > +} > + > +static int rockchip_dp_phy_power_off(struct phy *phy) > +{ > + return rockchip_set_phy_state(phy, false); > +} > + > +static struct phy_ops rockchip_dp_phy_ops = { > + .power_on = rockchip_dp_phy_power_on, > + .power_off = rockchip_dp_phy_power_off, > + .owner = THIS_MODULE, > +}; > + > +static int rockchip_dp_phy_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + struct phy_provider *phy_provider; > + struct rockchip_dp_phy *dp; > + struct resource *res; > + struct phy *phy; > + int ret; > + > + dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); > + if (IS_ERR(dp)) > + return -ENOMEM; > + > + dp->dev = dev; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + dp->regs = devm_ioremap_resource(dev, res); > + if (IS_ERR(dp->regs)) > + return PTR_ERR(dp->regs); > + > + dp->phy_24m = devm_clk_get(dev, "24m"); > + if (IS_ERR(dp->phy_24m)) { > + dev_err(dev, "cannot get clock 24m\n"); > + return PTR_ERR(dp->phy_24m); > + } The binding says there are 2 clocks. > + > + dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); > + if (IS_ERR(dp->grf)) { > + dev_err(dev, "rk3288-dp needs rockchip,grf property\n"); > + return PTR_ERR(dp->grf); > + } > + > + ret = regmap_write(dp->grf, GRF_SOC_CON12, > + GRF_EDP_REF_CLK_SEL_INTER | > + (GRF_EDP_REF_CLK_SEL_INTER << 16)); > + if (ret != 0) { > + dev_err(dp->dev, "Could not config GRF edp ref clk: %d\n", ret); > + return ret; > + } > + > + phy = devm_phy_create(dev, NULL, &rockchip_dp_phy_ops, NULL); > + if (IS_ERR(phy)) { > + dev_err(dev, "failed to create phy\n"); > + return PTR_ERR(phy); > + } > + phy_set_drvdata(phy, dp); > + > + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); > + > + return PTR_ERR_OR_ZERO(phy_provider); > +} > + > +static const struct of_device_id rockchip_dp_phy_dt_ids[] = { > + { .compatible = "rockchip,rk3288-dp-phy" }, > + {} > +}; > + > +MODULE_DEVICE_TABLE(of, rockchip_dp_phy_dt_ids); > + > +static struct platform_driver rockchip_dp_phy_driver = { > + .probe = rockchip_dp_phy_probe, > + .driver = { > + .name = "rockchip-dp-phy", > + .of_match_table = rockchip_dp_phy_dt_ids, > + }, > +}; > + > +module_platform_driver(rockchip_dp_phy_driver); > + > +MODULE_AUTHOR("Yakir Yang <ykk@rock-chips.com>"); > +MODULE_DESCRIPTION("Rockchip DP PHY driver"); > +MODULE_LICENSE("GPL v2"); > -- > 2.1.2 > >
Hi Rob, ? 09/02/2015 09:27 PM, Rob Herring ??: > On Tue, Sep 1, 2015 at 1:04 AM, Yakir Yang <ykk@rock-chips.com> wrote: >> This phy driver would control the Rockchip DisplayPort module >> phy clock and phy power, it is relate to analogix_dp-rockchip >> dp driver. If you want DP works rightly on rockchip platform, >> then you should select both of them. >> >> Signed-off-by: Yakir Yang <ykk@rock-chips.com> >> --- >> Changes in v4: >> - Take Kishon suggest, add commit message, and remove the redundant >> rockchip_dp_phy_init() function, move those code to probe() method. >> And remove driver .owner number. >> >> Changes in v3: >> - Take Heiko suggest, add rockchip dp phy driver, >> collect the phy clocks and power control. >> >> Changes in v2: None >> >> .../devicetree/bindings/phy/rockchip-dp-phy.txt | 26 ++++ > It is preferred that you split binding doc's from driver changes. Okay, done. >> drivers/phy/Kconfig | 7 + >> drivers/phy/Makefile | 1 + >> drivers/phy/phy-rockchip-dp.c | 166 +++++++++++++++++++++ >> 4 files changed, 200 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt >> create mode 100644 drivers/phy/phy-rockchip-dp.c >> >> diff --git a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt >> new file mode 100644 >> index 0000000..5de1088 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt >> @@ -0,0 +1,26 @@ >> +Rockchip Soc Seroes Display Port PHY >> +------------------------------------ >> + >> +Required properties: >> +- compatible : should be one of the following supported values: >> + - "rockchip.rk3288-dp-phy" >> + >> +- reg : a list of registers used by phy driver > Please state the size of the list and order of what each entry if more than one. Just like Heiko remind, I don't need the reg number anymore, "rockchip,grf" is enough for this driver. Anyway thanks :-) >> +- clocks: from common clock binding: handle to dp clock. >> + of memory mapped region. >> +- clock-names: from common clock binding: >> + Required elements: "sclk_dp" "sclk_dp_24m" >> + >> +- rockchip,grf: this soc should set GRF regs, so need get grf here. > I have no idea what GRF means. GRF is an module of our IC chip, the full name is General Register Files. I would rather to pick some words from our TRM. The general register file will be used to do static set by software, which is composed of many registers for system control. > >> +- #phy-cells : from the generic PHY bindings, must be 0; >> + >> +Example: >> + >> +edp_phy: phy@ff770274 { >> + compatilble = "rockchip,rk3288-dp-phy"; >> + reg = <0xff770274 4>; >> + rockchip,grf = <&grf>; >> + clocks = <&cru SCLK_EDP_24M>; >> + clock-names = "24m"; >> + #phy-cells = <0>; >> +} >> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig >> index 47da573..8f2bc4f 100644 >> --- a/drivers/phy/Kconfig >> +++ b/drivers/phy/Kconfig >> @@ -310,6 +310,13 @@ config PHY_ROCKCHIP_USB >> help >> Enable this to support the Rockchip USB 2.0 PHY. >> >> +config PHY_ROCKCHIP_DP >> + tristate "Rockchip Display Port PHY Driver" >> + depends on ARCH_ROCKCHIP && OF >> + select GENERIC_PHY >> + help >> + Enable this to support the Rockchip Display Port PHY. >> + >> config PHY_ST_SPEAR1310_MIPHY >> tristate "ST SPEAR1310-MIPHY driver" >> select GENERIC_PHY >> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile >> index a5b18c1..e281f35 100644 >> --- a/drivers/phy/Makefile >> +++ b/drivers/phy/Makefile >> @@ -34,6 +34,7 @@ phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2) += phy-s5pv210-usb2.o >> obj-$(CONFIG_PHY_EXYNOS5_USBDRD) += phy-exynos5-usbdrd.o >> obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o >> obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o >> +obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o >> obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o >> obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o >> obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o >> diff --git a/drivers/phy/phy-rockchip-dp.c b/drivers/phy/phy-rockchip-dp.c >> new file mode 100644 >> index 0000000..e9a726e >> --- /dev/null >> +++ b/drivers/phy/phy-rockchip-dp.c >> @@ -0,0 +1,166 @@ >> +/* >> + * Rockchip DP PHY driver >> + * >> + * Copyright (C) 2015 FuZhou Rockchip Co., Ltd. >> + * Author: Yakir Yang <ykk@@rock-chips.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published by >> + * the Free Software Foundation; either version 2 of the License. >> + */ >> + >> +#include <linux/io.h> >> +#include <linux/kernel.h> >> +#include <linux/module.h> >> +#include <linux/of.h> >> +#include <linux/of_address.h> >> +#include <linux/clk.h> >> +#include <linux/phy/phy.h> >> +#include <linux/regmap.h> >> +#include <linux/mfd/syscon.h> >> +#include <linux/platform_device.h> >> + >> +#define GRF_SOC_CON12 0x0274 >> +#define GRF_EDP_REF_CLK_SEL_INTER BIT(4) >> + >> +#define DP_PHY_SIDDQ_WRITE_EN BIT(21) >> +#define DP_PHY_SIDDQ_ON 0 >> +#define DP_PHY_SIDDQ_OFF BIT(5) >> + >> +struct rockchip_dp_phy { >> + struct device *dev; >> + struct regmap *grf; >> + void __iomem *regs; >> + struct clk *phy_24m; >> +}; >> + >> +static int rockchip_dp_phy_clk_enable(struct rockchip_dp_phy *dp) >> +{ >> + int ret = 0; >> + >> + ret = clk_set_rate(dp->phy_24m, 24000000); > Do you need to do this every time? This can go in probe. Yeah, it could move to probe, thanks. >> + if (ret < 0) { >> + dev_err(dp->dev, "cannot set clock phy_24m %d\n", ret); >> + return ret; >> + } >> + >> + ret = clk_prepare_enable(dp->phy_24m); >> + if (ret < 0) { >> + dev_err(dp->dev, "cannot enable clock phy_24m %d\n", ret); >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static int rockchip_dp_phy_clk_disable(struct rockchip_dp_phy *dp) >> +{ >> + clk_disable_unprepare(dp->phy_24m); >> + >> + return 0; >> +} >> + >> +static int rockchip_set_phy_state(struct phy *phy, bool enable) >> +{ >> + struct rockchip_dp_phy *dp = phy_get_drvdata(phy); >> + >> + if (enable) { >> + rockchip_dp_phy_clk_enable(dp); >> + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_ON, dp->regs); >> + } else { >> + rockchip_dp_phy_clk_disable(dp); >> + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_OFF, dp->regs); >> + } >> + >> + return 0; >> +} > I would just inline all 3 of these functions. The wrappers don't > doesn't do anything, but add 2 levels of function calls. After move clk_set_rate to probe, I would rather to remove those wrappers just operate in power_on/power_off directly. :) > >> + >> +static int rockchip_dp_phy_power_on(struct phy *phy) >> +{ >> + return rockchip_set_phy_state(phy, true); >> +} >> + >> +static int rockchip_dp_phy_power_off(struct phy *phy) >> +{ >> + return rockchip_set_phy_state(phy, false); >> +} >> + >> +static struct phy_ops rockchip_dp_phy_ops = { >> + .power_on = rockchip_dp_phy_power_on, >> + .power_off = rockchip_dp_phy_power_off, >> + .owner = THIS_MODULE, >> +}; >> + >> +static int rockchip_dp_phy_probe(struct platform_device *pdev) >> +{ >> + struct device *dev = &pdev->dev; >> + struct device_node *np = dev->of_node; >> + struct phy_provider *phy_provider; >> + struct rockchip_dp_phy *dp; >> + struct resource *res; >> + struct phy *phy; >> + int ret; >> + >> + dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); >> + if (IS_ERR(dp)) >> + return -ENOMEM; >> + >> + dp->dev = dev; >> + >> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> + dp->regs = devm_ioremap_resource(dev, res); >> + if (IS_ERR(dp->regs)) >> + return PTR_ERR(dp->regs); >> + >> + dp->phy_24m = devm_clk_get(dev, "24m"); >> + if (IS_ERR(dp->phy_24m)) { >> + dev_err(dev, "cannot get clock 24m\n"); >> + return PTR_ERR(dp->phy_24m); >> + } > The binding says there are 2 clocks. Oh... Document have been little bit old. I used to handle two kinds of clocks in phy driver in v2, and take Thierry and Heiko suggest to reduce to one clock in v3, but forget to improved the Document at the same time. +- clock-names: from common clock binding: + Required elements: "sclk_dp" "sclk_dp_24m" should be +- clock-names: from common clock binding: + Required elements: "24m" Thanks for your point out. >> + >> + dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); >> + if (IS_ERR(dp->grf)) { >> + dev_err(dev, "rk3288-dp needs rockchip,grf property\n"); >> + return PTR_ERR(dp->grf); >> + } >> + >> + ret = regmap_write(dp->grf, GRF_SOC_CON12, >> + GRF_EDP_REF_CLK_SEL_INTER | >> + (GRF_EDP_REF_CLK_SEL_INTER << 16)); >> + if (ret != 0) { >> + dev_err(dp->dev, "Could not config GRF edp ref clk: %d\n", ret); >> + return ret; >> + } >> + >> + phy = devm_phy_create(dev, NULL, &rockchip_dp_phy_ops, NULL); >> + if (IS_ERR(phy)) { >> + dev_err(dev, "failed to create phy\n"); >> + return PTR_ERR(phy); >> + } >> + phy_set_drvdata(phy, dp); >> + >> + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); >> + >> + return PTR_ERR_OR_ZERO(phy_provider); >> +} >> + >> +static const struct of_device_id rockchip_dp_phy_dt_ids[] = { >> + { .compatible = "rockchip,rk3288-dp-phy" }, >> + {} >> +}; >> + >> +MODULE_DEVICE_TABLE(of, rockchip_dp_phy_dt_ids); >> + >> +static struct platform_driver rockchip_dp_phy_driver = { >> + .probe = rockchip_dp_phy_probe, >> + .driver = { >> + .name = "rockchip-dp-phy", >> + .of_match_table = rockchip_dp_phy_dt_ids, >> + }, >> +}; >> + >> +module_platform_driver(rockchip_dp_phy_driver); >> + >> +MODULE_AUTHOR("Yakir Yang <ykk@rock-chips.com>"); >> +MODULE_DESCRIPTION("Rockchip DP PHY driver"); >> +MODULE_LICENSE("GPL v2"); >> -- >> 2.1.2 >> >> > >
Am Donnerstag, 3. September 2015, 11:25:00 schrieb Yakir Yang: > ? 09/02/2015 09:27 PM, Rob Herring ??: > > On Tue, Sep 1, 2015 at 1:04 AM, Yakir Yang <ykk@rock-chips.com> wrote: > >> +- clocks: from common clock binding: handle to dp clock. > >> + of memory mapped region. > >> +- clock-names: from common clock binding: > >> + Required elements: "sclk_dp" "sclk_dp_24m" > >> + > >> +- rockchip,grf: this soc should set GRF regs, so need get grf here. > > > > I have no idea what GRF means. > > GRF is an module of our IC chip, the full name is General Register Files. > I would rather to pick some words from our TRM. > > The general register file will be used to do static set by software, which > is composed of many registers for system control. The general register files are present on all Rockchip SoCs I've seen so far and really are just an aggregation of registers for settings and status indications, ranging from memory stuff, dma-controller settings, usb-phy and settings for a lot of other phys, etc. The most prevalent description in dt-bindings is currently: - rockchip,grf: phandle to the syscon managing the "general register files" Heiko
Hi Heiko, ? 09/03/2015 09:52 PM, Heiko Stuebner ??: > Am Donnerstag, 3. September 2015, 11:25:00 schrieb Yakir Yang: >> ? 09/02/2015 09:27 PM, Rob Herring ??: >>> On Tue, Sep 1, 2015 at 1:04 AM, Yakir Yang <ykk@rock-chips.com> wrote: >>>> +- clocks: from common clock binding: handle to dp clock. >>>> + of memory mapped region. >>>> +- clock-names: from common clock binding: >>>> + Required elements: "sclk_dp" "sclk_dp_24m" >>>> + >>>> +- rockchip,grf: this soc should set GRF regs, so need get grf here. >>> I have no idea what GRF means. >> GRF is an module of our IC chip, the full name is General Register Files. >> I would rather to pick some words from our TRM. >> >> The general register file will be used to do static set by software, which >> is composed of many registers for system control. > The general register files are present on all Rockchip SoCs I've seen so far > and really are just an aggregation of registers for settings and status > indications, ranging from memory stuff, dma-controller settings, usb-phy and > settings for a lot of other phys, etc. > > The most prevalent description in dt-bindings is currently: > > - rockchip,grf: phandle to the syscon managing the "general register files" Wow, thanks for your explain, and your "rockchip,grf" DT property description is better, I would like to copy it :) Thanks, - Yakir > > Heiko > > >
diff --git a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt new file mode 100644 index 0000000..5de1088 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt @@ -0,0 +1,26 @@ +Rockchip Soc Seroes Display Port PHY +------------------------------------ + +Required properties: +- compatible : should be one of the following supported values: + - "rockchip.rk3288-dp-phy" + +- reg : a list of registers used by phy driver +- clocks: from common clock binding: handle to dp clock. + of memory mapped region. +- clock-names: from common clock binding: + Required elements: "sclk_dp" "sclk_dp_24m" + +- rockchip,grf: this soc should set GRF regs, so need get grf here. +- #phy-cells : from the generic PHY bindings, must be 0; + +Example: + +edp_phy: phy@ff770274 { + compatilble = "rockchip,rk3288-dp-phy"; + reg = <0xff770274 4>; + rockchip,grf = <&grf>; + clocks = <&cru SCLK_EDP_24M>; + clock-names = "24m"; + #phy-cells = <0>; +} diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 47da573..8f2bc4f 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -310,6 +310,13 @@ config PHY_ROCKCHIP_USB help Enable this to support the Rockchip USB 2.0 PHY. +config PHY_ROCKCHIP_DP + tristate "Rockchip Display Port PHY Driver" + depends on ARCH_ROCKCHIP && OF + select GENERIC_PHY + help + Enable this to support the Rockchip Display Port PHY. + config PHY_ST_SPEAR1310_MIPHY tristate "ST SPEAR1310-MIPHY driver" select GENERIC_PHY diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index a5b18c1..e281f35 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -34,6 +34,7 @@ phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2) += phy-s5pv210-usb2.o obj-$(CONFIG_PHY_EXYNOS5_USBDRD) += phy-exynos5-usbdrd.o obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o +obj-$(CONFIG_PHY_ROCKCHIP_DP) += phy-rockchip-dp.o obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o diff --git a/drivers/phy/phy-rockchip-dp.c b/drivers/phy/phy-rockchip-dp.c new file mode 100644 index 0000000..e9a726e --- /dev/null +++ b/drivers/phy/phy-rockchip-dp.c @@ -0,0 +1,166 @@ +/* + * Rockchip DP PHY driver + * + * Copyright (C) 2015 FuZhou Rockchip Co., Ltd. + * Author: Yakir Yang <ykk@@rock-chips.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License. + */ + +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/clk.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> +#include <linux/platform_device.h> + +#define GRF_SOC_CON12 0x0274 +#define GRF_EDP_REF_CLK_SEL_INTER BIT(4) + +#define DP_PHY_SIDDQ_WRITE_EN BIT(21) +#define DP_PHY_SIDDQ_ON 0 +#define DP_PHY_SIDDQ_OFF BIT(5) + +struct rockchip_dp_phy { + struct device *dev; + struct regmap *grf; + void __iomem *regs; + struct clk *phy_24m; +}; + +static int rockchip_dp_phy_clk_enable(struct rockchip_dp_phy *dp) +{ + int ret = 0; + + ret = clk_set_rate(dp->phy_24m, 24000000); + if (ret < 0) { + dev_err(dp->dev, "cannot set clock phy_24m %d\n", ret); + return ret; + } + + ret = clk_prepare_enable(dp->phy_24m); + if (ret < 0) { + dev_err(dp->dev, "cannot enable clock phy_24m %d\n", ret); + return ret; + } + + return 0; +} + +static int rockchip_dp_phy_clk_disable(struct rockchip_dp_phy *dp) +{ + clk_disable_unprepare(dp->phy_24m); + + return 0; +} + +static int rockchip_set_phy_state(struct phy *phy, bool enable) +{ + struct rockchip_dp_phy *dp = phy_get_drvdata(phy); + + if (enable) { + rockchip_dp_phy_clk_enable(dp); + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_ON, dp->regs); + } else { + rockchip_dp_phy_clk_disable(dp); + writel(DP_PHY_SIDDQ_WRITE_EN | DP_PHY_SIDDQ_OFF, dp->regs); + } + + return 0; +} + +static int rockchip_dp_phy_power_on(struct phy *phy) +{ + return rockchip_set_phy_state(phy, true); +} + +static int rockchip_dp_phy_power_off(struct phy *phy) +{ + return rockchip_set_phy_state(phy, false); +} + +static struct phy_ops rockchip_dp_phy_ops = { + .power_on = rockchip_dp_phy_power_on, + .power_off = rockchip_dp_phy_power_off, + .owner = THIS_MODULE, +}; + +static int rockchip_dp_phy_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct phy_provider *phy_provider; + struct rockchip_dp_phy *dp; + struct resource *res; + struct phy *phy; + int ret; + + dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); + if (IS_ERR(dp)) + return -ENOMEM; + + dp->dev = dev; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + dp->regs = devm_ioremap_resource(dev, res); + if (IS_ERR(dp->regs)) + return PTR_ERR(dp->regs); + + dp->phy_24m = devm_clk_get(dev, "24m"); + if (IS_ERR(dp->phy_24m)) { + dev_err(dev, "cannot get clock 24m\n"); + return PTR_ERR(dp->phy_24m); + } + + dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); + if (IS_ERR(dp->grf)) { + dev_err(dev, "rk3288-dp needs rockchip,grf property\n"); + return PTR_ERR(dp->grf); + } + + ret = regmap_write(dp->grf, GRF_SOC_CON12, + GRF_EDP_REF_CLK_SEL_INTER | + (GRF_EDP_REF_CLK_SEL_INTER << 16)); + if (ret != 0) { + dev_err(dp->dev, "Could not config GRF edp ref clk: %d\n", ret); + return ret; + } + + phy = devm_phy_create(dev, NULL, &rockchip_dp_phy_ops, NULL); + if (IS_ERR(phy)) { + dev_err(dev, "failed to create phy\n"); + return PTR_ERR(phy); + } + phy_set_drvdata(phy, dp); + + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); + + return PTR_ERR_OR_ZERO(phy_provider); +} + +static const struct of_device_id rockchip_dp_phy_dt_ids[] = { + { .compatible = "rockchip,rk3288-dp-phy" }, + {} +}; + +MODULE_DEVICE_TABLE(of, rockchip_dp_phy_dt_ids); + +static struct platform_driver rockchip_dp_phy_driver = { + .probe = rockchip_dp_phy_probe, + .driver = { + .name = "rockchip-dp-phy", + .of_match_table = rockchip_dp_phy_dt_ids, + }, +}; + +module_platform_driver(rockchip_dp_phy_driver); + +MODULE_AUTHOR("Yakir Yang <ykk@rock-chips.com>"); +MODULE_DESCRIPTION("Rockchip DP PHY driver"); +MODULE_LICENSE("GPL v2");
This phy driver would control the Rockchip DisplayPort module phy clock and phy power, it is relate to analogix_dp-rockchip dp driver. If you want DP works rightly on rockchip platform, then you should select both of them. Signed-off-by: Yakir Yang <ykk@rock-chips.com> --- Changes in v4: - Take Kishon suggest, add commit message, and remove the redundant rockchip_dp_phy_init() function, move those code to probe() method. And remove driver .owner number. Changes in v3: - Take Heiko suggest, add rockchip dp phy driver, collect the phy clocks and power control. Changes in v2: None .../devicetree/bindings/phy/rockchip-dp-phy.txt | 26 ++++ drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 1 + drivers/phy/phy-rockchip-dp.c | 166 +++++++++++++++++++++ 4 files changed, 200 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt create mode 100644 drivers/phy/phy-rockchip-dp.c