PHY: for 3.16
Subsystems (5)
Hi Greg,
Here's the pull request for 3.16. It contains mostly bug fixes and cleanup apart from one new driver for exynos5 usb3 PHY. Please consider merging them to your usb tree.
Let me know if I have to change anything.
Cheers
Kishon
The following changes since commit 38583f095c5a8138ae2a1c9173d0fd8a9f10e8aa:
Merge branch 'akpm' (incoming from Andrew) (2014-05-06 13:07:41 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/for-3.16
for you to fetch changes up to eadd43123933e8c0a55245c51de68668e620e27f:
phy: usb: sunxi: Introduce Allwinner A31 USB PHY support (2014-05-14 19:41:13 +0530)
----------------------------------------------------------------
for 3.16 merge window
Bunch of fixes and a new driver for Exynos5 USB 3.0 PHY.
----------------------------------------------------------------
Antoine Ténart (1):
phy: exynos-mipi-video: fix check on array index
Arnd Bergmann (2):
PHY: Exynos: fix SATA phy license typo
phy: kona2: use 'select GENERIC_PHY' in Kconfig
Maxime Ripard (3):
phy: sunxi: Rework phy initialization
Documentation: dt: Add new compatible for the A31 USB Phy
phy: usb: sunxi: Introduce Allwinner A31 USB PHY support
Roger Quadros (2):
phy: omap-usb2: Use generic clock names "wkupclk" and "refclk"
phy: omap-usb2: Add clock names to Documentation binding
Vivek Gautam (3):
Documentation: Document Exynos5 USB 3.0 DRD PHY
phy: Add new Exynos5 USB 3.0 PHY driver
phy: exynos5-usbdrd: Add facility for VBUS supply
.../devicetree/bindings/phy/samsung-phy.txt | 47 ++ .../devicetree/bindings/phy/sun4i-usb-phy.txt | 23 +- Documentation/devicetree/bindings/phy/ti-phy.txt | 7 + drivers/phy/Kconfig | 13 +- drivers/phy/Makefile | 1 + drivers/phy/phy-exynos-mipi-video.c | 2 +- drivers/phy/phy-exynos5-usbdrd.c | 676 ++++++++++++++++++++ drivers/phy/phy-exynos5250-sata.c | 2 +- drivers/phy/phy-omap-usb2.c | 30 +- drivers/phy/phy-sun4i-usb.c | 75 ++- include/linux/mfd/syscon/exynos5-pmu.h | 44 ++ 11 files changed, 869 insertions(+), 51 deletions(-) create mode 100644 drivers/phy/phy-exynos5-usbdrd.c create mode 100644 include/linux/mfd/syscon/exynos5-pmu.h
Signature · 1 line
1.7.9.5
PATCH 1/11 phy: omap-usb2: Use generic clock names "wkupclk" and "refclk"
From: Roger Quadros <[email protected]>
As clocks might be named differently on multiple platforms, use a generic name in the driver and allow device tree node to specify the platform specific clock name.
--- drivers/phy/phy-omap-usb2.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/phy/phy-omap-usb2.c +23 -7
@@ -275,18 +275,34 @@ static int omap_usb2_probe(struct platform_device *pdev)if (IS_ERR (phy_provider))return PTR_ERR (phy_provider); - phy->wkupclk =devm_clk_get (phy->dev,"usb_phy_cm_clk32k" ); + phy->wkupclk =devm_clk_get (phy->dev,"wkupclk" );if (IS_ERR (phy->wkupclk)) { -dev_err (&pdev->dev,"unable to get usb_phy_cm_clk32k\n" ); -return PTR_ERR (phy->wkupclk); +dev_warn (&pdev->dev,"unable to get wkupclk, trying old name\n" ); + phy->wkupclk =devm_clk_get (phy->dev,"usb_phy_cm_clk32k" ); +if (IS_ERR (phy->wkupclk)) { +dev_err (&pdev->dev,"unable to get usb_phy_cm_clk32k\n" ); +return PTR_ERR (phy->wkupclk); + }else { +dev_warn (&pdev->dev, +"found usb_phy_cm_clk32k, please fix DTS\n" ); + } }clk_prepare (phy->wkupclk); - phy->optclk =devm_clk_get (phy->dev,"usb_otg_ss_refclk960m" ); -if (IS_ERR (phy->optclk)) -dev_vdbg (&pdev->dev,"unable to get refclk960m\n" ); -else + phy->optclk =devm_clk_get (phy->dev,"refclk" ); +if (IS_ERR (phy->optclk)) { +dev_dbg (&pdev->dev,"unable to get refclk, trying old name\n" ); + phy->optclk =devm_clk_get (phy->dev,"usb_otg_ss_refclk960m" ); +if (IS_ERR (phy->optclk)) { +dev_dbg (&pdev->dev, +"unable to get usb_otg_ss_refclk960m\n" ); + }else { +dev_warn (&pdev->dev, +"found usb_otg_ss_refclk960m, please fix DTS\n" ); + } + }else {clk_prepare (phy->optclk); + }usb_add_phy_dev (&phy->phy);
Signature · 1 line
1.7.9.5
PATCH 2/11 phy: omap-usb2: Add clock names to Documentation binding
In reply to Kishon Vijay Abraham IFrom: Roger Quadros <[email protected]>
Add "wkupclk" and "refclk" information to DT binding information.
--- Documentation/devicetree/bindings/phy/ti-phy.txt | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/phy/ti-phy.txt +7 -0
@@ -32,6 +32,11 @@ Required properties: - reg : Address and length of the register set for the device. - #phy-cells: determine the number of cells that should be given in the phandle while referencing this phy. + - clocks: a list of phandles and clock-specifier pairs, one for each entry in + clock-names. + - clock-names: should include: + * "wkupclk" - wakeup clock. + * "refclk" - reference clock (optional). Optional properties: - ctrl-module : phandle of the control module used by PHY driver to power on
@@ -44,6 +49,8 @@ usb2phy@4a0ad080 { reg = <0x4a0ad080 0x58>; ctrl-module = <&omap_control_usb>; #phy-cells = <0>; + clocks = <&usb_phy_cm_clk32k>, <&usb_otg_ss_refclk960m>; + clock-names = "wkupclk", "refclk"; }; TI PIPE3 PHY
Signature · 1 line
1.7.9.5
PATCH 3/11 PHY: Exynos: fix SATA phy license typo
In reply to Kishon Vijay Abraham IFrom: Arnd Bergmann <[email protected]>
If the license string doesn't match exactly, the module refuses to load.
--- drivers/phy/phy-exynos5250-sata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/phy-exynos5250-sata.c +1 -1
@@ -246,6 +246,6 @@ static struct platform_driver exynos_sata_phy_driver = {module_platform_driver (exynos_sata_phy_driver);MODULE_DESCRIPTION ("Samsung SerDes PHY driver" ); -MODULE_LICENSE ("GPL V2" ); +MODULE_LICENSE ("GPL v2" );MODULE_AUTHOR ("Girish K S <[email protected]>" );MODULE_AUTHOR ("Yuvaraj C D <[email protected]>" );
Signature · 1 line
1.7.9.5
PATCH 4/11 phy: exynos-mipi-video: fix check on array index
In reply to Kishon Vijay Abraham IFrom: Antoine Ténart <[email protected]>
The phys array is of size EXYNOS_MIPI_PHYS_NUM. Trying to access the index EXYNOS_MIPI_PHYS_NUM should return an error.
--- drivers/phy/phy-exynos-mipi-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/phy-exynos-mipi-video.c +1 -1
@@ -101,7 +101,7 @@ static struct phy *exynos_mipi_video_phy_xlate(struct device *dev, {struct exynos_mipi_video_phy *state =dev_get_drvdata (dev); -if (WARN_ON (args->args[0 ] >EXYNOS_MIPI_PHYS_NUM )) +if (WARN_ON (args->args[0 ] >=EXYNOS_MIPI_PHYS_NUM ))return ERR_PTR (-ENODEV );return state->phys[args->args[0 ]].phy;
Signature · 1 line
1.7.9.5
PATCH 5/11 phy: kona2: use 'select GENERIC_PHY' in Kconfig
In reply to Kishon Vijay Abraham IFrom: Arnd Bergmann <[email protected]>
All other phy drivers use 'select', while this one is the only one to use 'depends on'. This is not a bug, just slightly inconsistent, so let's change it to do things the same way as everyone else.
We may also want to turn GENERIC_PHY into a silent option that only ever gets turned on if another driver needs it.
--- drivers/phy/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/Kconfig +1 -1
@@ -89,8 +89,8 @@ config PHY_EXYNOS_DP_VIDEO config BCM_KONA_USB2_PHY tristate "Broadcom Kona USB2 PHY Driver" - depends on GENERIC_PHY depends on HAS_IOMEM + select GENERIC_PHY help Enable this to support the Broadcom Kona USB 2.0 PHY.
Signature · 1 line
1.7.9.5
PATCH 6/11 Documentation: Document Exynos5 USB 3.0 DRD PHY
In reply to Kishon Vijay Abraham IFrom: Vivek Gautam <[email protected]>
Add necessary binding documentation for USB 3.0 DRD PHY present on Exynos5 SoC series.
--- .../devicetree/bindings/phy/samsung-phy.txt | 47 ++++++++++++++++++++ 1 file changed, 47 insertions(+)
Documentation/devicetree/bindings/phy/samsung-phy.txt +47 -0
@@ -114,3 +114,50 @@ Example: compatible = "samsung,exynos-sataphy-i2c"; reg = <0x38>; }; + +Samsung Exynos5 SoC series USB DRD PHY controller +-------------------------------------------------- + +Required properties: +- compatible : Should be set to one of the following supported values: + - "samsung,exynos5250-usbdrd-phy" - for exynos5250 SoC, + - "samsung,exynos5420-usbdrd-phy" - for exynos5420 SoC. +- reg : Register offset and length of USB DRD PHY register set; +- clocks: Clock IDs array as required by the controller +- clock-names: names of clocks correseponding to IDs in the clock property; + Required clocks: + - phy: main PHY clock (same as USB DRD controller i.e. DWC3 IP clock), + used for register access. + - ref: PHY's reference clock (usually crystal clock), used for + PHY operations, associated by phy name. It is used to + determine bit values for clock settings register. + For Exynos5420 this is given as 'sclk_usbphy30' in CMU. +- samsung,pmu-syscon: phandle for PMU system controller interface, used to + control pmu registers for power isolation. +- #phy-cells : from the generic PHY bindings, must be 1; + +For "samsung,exynos5250-usbdrd-phy" and "samsung,exynos5420-usbdrd-phy" +compatible PHYs, the second cell in the PHY specifier identifies the +PHY id, which is interpreted as follows: + 0 - UTMI+ type phy, + 1 - PIPE3 type phy, + +Example: + usbdrd_phy: usbphy@12100000 { + compatible = "samsung,exynos5250-usbdrd-phy"; + reg = <0x12100000 0x100>; + clocks = <&clock 286>, <&clock 1>; + clock-names = "phy", "ref"; + samsung,pmu-syscon = <&pmu_system_controller>; + #phy-cells = <1>; + }; + +- aliases: For SoCs like Exynos5420 having multiple USB 3.0 DRD PHY controllers, + 'usbdrd_phy' nodes should have numbered alias in the aliases node, + in the form of usbdrdphyN, N = 0, 1... (depending on number of + controllers). +Example: + aliases { + usbdrdphy0 = &usb3_phy0; + usbdrdphy1 = &usb3_phy1; + };
Signature · 1 line
1.7.9.5
PATCH 7/11 phy: Add new Exynos5 USB 3.0 PHY driver
In reply to Kishon Vijay Abraham IFrom: Vivek Gautam <[email protected]>
Add a new driver for the USB 3.0 PHY on Exynos5 series of SoCs. The new driver uses the generic PHY framework and will interact with DWC3 controller present on Exynos5 series of SoCs.
Also, created a new header file in linux/mfd/syscon/ for Exynos5 SoCs and put the required PMU offset definitions for the basic available PHYs.
--- drivers/phy/Kconfig | 11 + drivers/phy/Makefile | 1 + drivers/phy/phy-exynos5-usbdrd.c | 644 ++++++++++++++++++++++++++++++++ include/linux/mfd/syscon/exynos5-pmu.h | 44 +++ 4 files changed, 700 insertions(+) create mode 100644 drivers/phy/phy-exynos5-usbdrd.c create mode 100644 include/linux/mfd/syscon/exynos5-pmu.h
drivers/phy/Kconfig +11 -0
@@ -160,6 +160,17 @@ config PHY_EXYNOS5250_USB2 particular SoC is compiled in the driver. In case of Exynos 5250 four phys are available - device, host, HSIC0 and HSIC. +config PHY_EXYNOS5_USBDRD + tristate "Exynos5 SoC series USB DRD PHY driver" + depends on ARCH_EXYNOS5 && OF + depends on HAS_IOMEM + select GENERIC_PHY + select MFD_SYSCON + help + Enable USB DRD PHY support for Exynos 5 SoC series. + This driver provides PHY interface for USB 3.0 DRD controller + present on Exynos5 SoC series. + config PHY_XGENE tristate "APM X-Gene 15Gbps PHY support" depends on HAS_IOMEM && OF && (ARM64 || COMPILE_TEST)
drivers/phy/Makefile +1 -0
@@ -18,4 +18,5 @@ phy-exynos-usb2-y += phy-samsung-usb2.o phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o phy-exynos-usb2-$(CONFIG_PHY_EXYNOS5250_USB2) += phy-exynos5250-usb2.o +obj-$(CONFIG_PHY_EXYNOS5_USBDRD) += phy-exynos5-usbdrd.o obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
drivers/phy/phy-exynos5-usbdrd.c new file +644 -0
644 lines not on this page · raw message
include/linux/mfd/syscon/exynos5-pmu.h new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 8/11 phy: exynos5-usbdrd: Add facility for VBUS supply
In reply to Kishon Vijay Abraham IFrom: Vivek Gautam <[email protected]>
Adding support to enable/disable VBUS controlled by a regulator, to enable vbus supply on the port.
--- drivers/phy/phy-exynos5-usbdrd.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/phy/phy-exynos5-usbdrd.c +32 -0
@@ -24,6 +24,7 @@#include <linux/mfd/syscon.h> #include <linux/mfd/syscon/exynos5-pmu.h> #include <linux/regmap.h> +#include <linux/regulator/consumer.h> /* Exynos USB PHY registers */ #define EXYNOS5_FSEL_9MHZ6 0x0
@@ -170,6 +171,7 @@ struct exynos5_usbdrd_phy { } phys[EXYNOS5_DRDPHYS_NUM ];u32 extrefclk;struct clk *ref_clk; +struct regulator *vbus; }; static inline
@@ -438,6 +440,7 @@ static int exynos5_usbdrd_phy_exit(struct phy *phy)static int exynos5_usbdrd_phy_power_on (struct phy *phy) { +int ret;struct phy_usb_instance *inst =phy_get_drvdata (phy);struct exynos5_usbdrd_phy *phy_drd =to_usbdrd_phy (inst);
@@ -445,10 +448,24 @@ static int exynos5_usbdrd_phy_power_on(struct phy *phy)clk_prepare_enable (phy_drd->ref_clk); +/* Enable VBUS supply */ +if (phy_drd->vbus) { + ret =regulator_enable (phy_drd->vbus); +if (ret) { +dev_err (phy_drd->dev,"Failed to enable VBUS supply\n" ); + goto fail_vbus; + } + } +/* Power-on PHY*/ inst->phy_cfg->phy_isol (inst,0 );return 0 ; + +fail_vbus: +clk_disable_unprepare (phy_drd->ref_clk); + +return ret; }static int exynos5_usbdrd_phy_power_off (struct phy *phy)
@@ -461,6 +478,10 @@ static int exynos5_usbdrd_phy_power_off(struct phy *phy)/* Power-off the PHY */ inst->phy_cfg->phy_isol (inst,1 ); +/* Disable VBUS supply */ +if (phy_drd->vbus) +regulator_disable (phy_drd->vbus); +clk_disable_unprepare (phy_drd->ref_clk);return 0 ;
@@ -600,6 +621,17 @@ static int exynos5_usbdrd_phy_probe(struct platform_device *pdev)break ; } +/* Get Vbus regulator */ + phy_drd->vbus =devm_regulator_get (dev,"vbus" ); +if (IS_ERR (phy_drd->vbus)) { + ret =PTR_ERR (phy_drd->vbus); +if (ret == -EPROBE_DEFER ) +return ret; + +dev_warn (dev,"Failed to get VBUS supply regulator\n" ); + phy_drd->vbus =NULL ; + } +dev_vdbg (dev,"Creating usbdrd_phy phy\n" );for (i =0 ; i <EXYNOS5_DRDPHYS_NUM ; i++) {
Signature · 1 line
1.7.9.5
PATCH 9/11 phy: sunxi: Rework phy initialization
In reply to Kishon Vijay Abraham IFrom: Maxime Ripard <[email protected]>
Move the phy initialization and variables declaration to the loop itself, since it is where it really belongs. Also remove all the temporary variables, we can use the structure members directly.
--- drivers/phy/phy-sun4i-usb.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-)
drivers/phy/phy-sun4i-usb.c +18 -24
@@ -224,13 +224,8 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)struct sun4i_usb_phy_data *data;struct device *dev = &pdev->dev;struct device_node *np = dev->of_node; -void __iomem *pmu =NULL ;struct phy_provider *phy_provider; -struct reset_control *reset; -struct regulator *vbus;struct resource *res; -struct phy *phy; -char name[16 ];int i; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );
@@ -262,42 +257,41 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)/* Skip 0, 0 is the phy for otg which is not yet supported. */ for (i =1 ; i < data->num_phys; i++) { +struct sun4i_usb_phy *phy = data->phys + i; +char name[16 ]; +snprintf (name,sizeof (name),"usb%d_vbus" , i); - vbus =devm_regulator_get_optional (dev, name); -if (IS_ERR (vbus)) { -if (PTR_ERR (vbus) == -EPROBE_DEFER ) + phy->vbus =devm_regulator_get_optional (dev, name); +if (IS_ERR (phy->vbus)) { +if (PTR_ERR (phy->vbus) == -EPROBE_DEFER )return -EPROBE_DEFER ; - vbus =NULL ; + phy->vbus =NULL ; }snprintf (name,sizeof (name),"usb%d_reset" , i); - reset =devm_reset_control_get (dev, name); -if (IS_ERR (reset)) { + phy->reset =devm_reset_control_get (dev, name); +if (IS_ERR (phy->reset)) {dev_err (dev,"failed to get reset %s\n" , name); -return PTR_ERR (reset); +return PTR_ERR (phy->reset); }if (i) {/* No pmu for usbc0 */ snprintf (name,sizeof (name),"pmu%d" , i); res =platform_get_resource_byname (pdev,IORESOURCE_MEM , name); - pmu =devm_ioremap_resource (dev, res); -if (IS_ERR (pmu)) -return PTR_ERR (pmu); + phy->pmu =devm_ioremap_resource (dev, res); +if (IS_ERR (phy->pmu)) +return PTR_ERR (phy->pmu); } - phy =devm_phy_create (dev, &sun4i_usb_phy_ops,NULL ); -if (IS_ERR (phy)) { + phy->phy =devm_phy_create (dev, &sun4i_usb_phy_ops,NULL ); +if (IS_ERR (phy->phy)) {dev_err (dev,"failed to create PHY %d\n" , i); -return PTR_ERR (phy); +return PTR_ERR (phy->phy); } - data->phys[i].phy = phy; - data->phys[i].pmu = pmu; - data->phys[i].vbus = vbus; - data->phys[i].reset = reset; - data->phys[i].index = i; -phy_set_drvdata (phy, &data->phys[i]); + phy->index = i; +phy_set_drvdata (phy->phy, &data->phys[i]); }dev_set_drvdata (dev, data);
Signature · 1 line
1.7.9.5
PATCH 10/11 Documentation: dt: Add new compatible for the A31 USB Phy
In reply to Kishon Vijay Abraham IFrom: Maxime Ripard <[email protected]>
Document the freshly introduced compatible for the USB phy in use in the Allwinner A31 SoC.
--- .../devicetree/bindings/phy/sun4i-usb-phy.txt | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt +17 -6
@@ -2,15 +2,26 @@ Allwinner sun4i USB PHY ----------------------- Required properties: -- compatible : should be one of "allwinner,sun4i-a10-usb-phy", - "allwinner,sun5i-a13-usb-phy" or "allwinner,sun7i-a20-usb-phy" +- compatible : should be one of + * allwinner,sun4i-a10-usb-phy + * allwinner,sun5i-a13-usb-phy + * allwinner,sun6i-a31-usb-phy + * allwinner,sun7i-a20-usb-phy - reg : a list of offset + length pairs -- reg-names : "phy_ctrl", "pmu1" and for sun4i or sun7i "pmu2" +- reg-names : + * "phy_ctrl" + * "pmu1" + * "pmu2" for sun4i, sun6i or sun7i - #phy-cells : from the generic phy bindings, must be 1 -- clocks : phandle + clock specifier for the phy clock -- clock-names : "usb_phy" +- clocks : phandle + clock specifier for the phy clocks +- clock-names : + * "usb_phy" for sun4i, sun5i or sun7i + * "usb0_phy", "usb1_phy" and "usb2_phy" for sun6i - resets : a list of phandle + reset specifier pairs -- reset-names : "usb0_reset", "usb1_reset" and for sun4i or sun7i "usb2_reset" +- reset-names : + * "usb0_reset" + * "usb1_reset" + * "usb2_reset" for sun4i, sun6i or sun7i Example: usbphy: phy@0x01c13400 {
Signature · 1 line
1.7.9.5
PATCH 11/11 phy: usb: sunxi: Introduce Allwinner A31 USB PHY support
In reply to Kishon Vijay Abraham IFrom: Maxime Ripard <[email protected]>
The USB phy controller in the A31 differs mostly from the older controllers because it has a clock dedicated for each phy, while the older ones were having a single clock for all the phys.
--- drivers/phy/phy-sun4i-usb.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)
drivers/phy/phy-sun4i-usb.c +22 -11
@@ -61,7 +61,6 @@#define MAX_PHYS 3struct sun4i_usb_phy_data { -struct clk *clk;void __iomem *base;struct mutex mutex;int num_phys;
@@ -71,6 +70,7 @@ struct sun4i_usb_phy_data {void __iomem *pmu;struct regulator *vbus;struct reset_control *reset; +struct clk *clk;int index; } phys[MAX_PHYS ]; };
@@ -146,13 +146,13 @@ static int sun4i_usb_phy_init(struct phy *_phy)struct sun4i_usb_phy_data *data =to_sun4i_usb_phy_data (phy);int ret; - ret =clk_prepare_enable (data->clk); + ret =clk_prepare_enable (phy->clk);if (ret)return ret; ret =reset_control_deassert (phy->reset);if (ret) { -clk_disable_unprepare (data->clk); +clk_disable_unprepare (phy->clk);return ret; }
@@ -170,11 +170,10 @@ static int sun4i_usb_phy_init(struct phy *_phy)static int sun4i_usb_phy_exit (struct phy *_phy) {struct sun4i_usb_phy *phy =phy_get_drvdata (_phy); -struct sun4i_usb_phy_data *data =to_sun4i_usb_phy_data (phy);sun4i_usb_phy_passby (phy,0 );reset_control_assert (phy->reset); -clk_disable_unprepare (data->clk); +clk_disable_unprepare (phy->clk);return 0 ; }
@@ -225,6 +224,7 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct device_node *np = dev->of_node;struct phy_provider *phy_provider; +bool dedicated_clocks;struct resource *res;int i;
@@ -244,17 +244,16 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)else data->disc_thresh =2 ; +if (of_device_is_compatible (np,"allwinner,sun6i-a31-usb-phy" )) + dedicated_clocks = true; +else + dedicated_clocks = false; + res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"phy_ctrl" ); data->base =devm_ioremap_resource (dev, res);if (IS_ERR (data->base))return PTR_ERR (data->base); - data->clk =devm_clk_get (dev,"usb_phy" ); -if (IS_ERR (data->clk)) { -dev_err (dev,"could not get usb_phy clock\n" ); -return PTR_ERR (data->clk); - } -/* Skip 0, 0 is the phy for otg which is not yet supported. */ for (i =1 ; i < data->num_phys; i++) {struct sun4i_usb_phy *phy = data->phys + i;
@@ -268,6 +267,17 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev) phy->vbus =NULL ; } +if (dedicated_clocks) +snprintf (name,sizeof (name),"usb%d_phy" , i); +else +strlcpy (name,"usb_phy" ,sizeof (name)); + + phy->clk =devm_clk_get (dev, name); +if (IS_ERR (phy->clk)) { +dev_err (dev,"failed to get clock %s\n" , name); +return PTR_ERR (phy->clk); + } +snprintf (name,sizeof (name),"usb%d_reset" , i); phy->reset =devm_reset_control_get (dev, name);if (IS_ERR (phy->reset)) {
@@ -305,6 +315,7 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)static const struct of_device_id sun4i_usb_phy_of_match[] = { { .compatible ="allwinner,sun4i-a10-usb-phy" }, { .compatible ="allwinner,sun5i-a13-usb-phy" }, + { .compatible ="allwinner,sun6i-a31-usb-phy" }, { .compatible ="allwinner,sun7i-a20-usb-phy" }, { }, };
Signature · 1 line
1.7.9.5
Quoted 11 lines · Kishon Vijay Abraham I
Hi Greg,
Here's the pull request for 3.16. It contains mostly bug fixes and cleanup apart from one new driver for exynos5 usb3 PHY. Please consider merging them to your usb tree.
Let me know if I have to change anything.
Cheers
Kishon
Quoted 8 lines
The following changes since commit
38583f095c5a8138ae2a1c9173d0fd8a9f10e8aa:Merge branch 'akpm' (incoming from Andrew) (2014-05-06 13:07:41 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.gittags/for-3.16
Pulled and pushed out,thanks.
greg k-h