Generic PHY Framework
Subsystems (9)
v8 cover Generic PHY Framework
Added a generic PHY framework that provides a set of APIs for the PHY drivers to create/destroy a PHY and APIs for the PHY users to obtain a reference to the PHY with or without using phandle.
This framework will be of use only to devices that uses external PHY (PHY functionality is not embedded within the controller).
The intention of creating this framework is to bring the phy drivers spread all over the Linux kernel to drivers/phy to increase code re-use and to increase code maintainability.
Comments to make PHY as bus wasn't done because PHY devices can be part of other bus and making a same device attached to multiple bus leads to bad design.
If the PHY driver has to send notification on connect/disconnect, the PHY driver should make use of the extcon framework. Using this susbsystem to use extcon framwork will have to be analysed.
Making omap-usb2 and twl4030 to use this framework is provided as a sample.
This patch series is developed on linux mainline tree.
This framework is already being used by display PHYs
http://www.spinics.net/lists/arm-kernel/msg251666.html
These patches are hosted in git://gitorious.org/linuxphy/linuxphy.git testing
Changes from v7:
* Fixed Documentation
* Added to_phy, of_phy_provider_register and devm_of_phy_provider_register
* modified runtime_pm usage in phy_init, phy_exit, phy_power_on and phy_power_off. Now phy_power_on will enable the clocks and phy_power_off will disable the clocks.
* pm_runtime_no_callbacks() is added so that pm_runtime_get_sync doesn't fail
* modified other patches to adhere to the changes in the PHY framework
* removed usb: phy: twl4030: twl4030 shouldn't be subsys_initcall as it will be merged separately.
* reference counting has been added to protect phy ops when the PHY is shared by multiple consumers.
Changes from v6
* corrected few typos in Documentation
* Changed PHY Subsystem to *bool* in Kconfig (to avoid compilation errors when PHY Subsystem is kept as module and the dependent modules are built-in)
* Added if pm_runtime_enabled check before runtime pm calls.
Changes from v5:
* removed the new sysfs entries as it dint have any new information other than what is already there in /sys/devices/...
* removed a bunch of APIs added to get the PHY and now only phy_get and devm_phy_get are used.
* Added new APIs to register/unregister the PHY provider. This is needed for dt boot case.
* Enabled pm runtime and incorporated the comments given by Alan Stern in a different patch series by Gautam.
* Removed the *phy_bind* API. Now the phy binding information should be passed using the platform data to the controller devices.
* Fixed a few typos.
Changes from v4:
* removed of_phy_get_with_args/devm_of_phy_get_with_args. Now the *phy providers* should use their custom implementation of of_xlate or use of_phy_xlate to get *phy instance* from *phy providers*.
* Added of_phy_xlate to be used by *phy providers* if it provides only one PHY.
* changed phy_core from having subsys_initcall to module_init.
* other minor fixes.
Changes from v3:
* Changed the return value of PHY APIs to ENOSYS
* Added APIs of_phy_get_with_args/devm_of_phy_get_with_args to support getting PHYs if the same IP implements multiple PHYs.
* modified phy_bind API so that the binding information can now be _updated_. In effect of this removed the binding information added in board files and added only in usb-musb.c. If a particular board uses a different phy binding, it can update it in board file after usb_musb_init().
* Added Documentation/devicetree/bindings/phy/phy-bindings.txt for dt binding information.
Changes from v2:
* removed phy_descriptor structure completely so changed the APIs which were taking phy_descriptor as parameters
* Added 2 more APIs *of_phy_get_byname* and *devm_of_phy_get_byname* to be used by PHY user drivers which has *phy* and *phy-names* binding in the dt data
* Fixed a few typos
* Removed phy_list and we now use class_dev_iter_init, class_dev_iter_next and class_dev_iter_exit for traversing through the phy list. (Note we still need phy_bind list and phy_bind_mutex).
* Changed the sysfs entry name from *bind* to *phy_bind*.
Changes from v1:
* Added Documentation for the PHY framework
* Added few more APIs mostly w.r.t devres
* Modified omap-usb2 and twl4030 to make use of the new framework
Did USB enumeration testing in panda and beagle.
Kishon Vijay Abraham I (8):
drivers: phy: add generic PHY framework
usb: phy: omap-usb2: use the new generic PHY framework
usb: phy: twl4030: use the new generic PHY framework
ARM: OMAP: USB: Add phy binding information
ARM: dts: omap: update usb_otg_hs data
usb: musb: omap2430: use the new generic PHY framework
usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
usb: phy: twl4030-usb: remove *set_suspend* and *phy_init* ops
.../devicetree/bindings/phy/phy-bindings.txt | 66 +++ Documentation/devicetree/bindings/usb/omap-usb.txt | 5 + Documentation/devicetree/bindings/usb/usb-phy.txt | 6 + Documentation/phy.txt | 125 +++++ MAINTAINERS | 7 + arch/arm/boot/dts/omap3-beagle-xm.dts | 2 + arch/arm/boot/dts/omap3-evm.dts | 2 + arch/arm/boot/dts/omap3-overo.dtsi | 2 + arch/arm/boot/dts/omap4.dtsi | 3 + arch/arm/boot/dts/twl4030.dtsi | 1 + arch/arm/mach-omap2/usb-musb.c | 6 +- drivers/Kconfig | 2 + drivers/Makefile | 2 + drivers/phy/Kconfig | 13 + drivers/phy/Makefile | 5 + drivers/phy/phy-core.c | 548 ++++++++++++++++++++ drivers/usb/musb/Kconfig | 1 + drivers/usb/musb/musb_core.c | 1 + drivers/usb/musb/musb_core.h | 3 + drivers/usb/musb/omap2430.c | 26 +- drivers/usb/phy/Kconfig | 1 + drivers/usb/phy/phy-omap-usb2.c | 58 ++- drivers/usb/phy/phy-twl4030-usb.c | 61 ++- include/linux/phy/phy.h | 334 ++++++++++++ include/linux/usb/musb.h | 3 + 25 files changed, 1229 insertions(+), 54 deletions(-) create mode 100644 Documentation/devicetree/bindings/phy/phy-bindings.txt create mode 100644 Documentation/phy.txt create mode 100644 drivers/phy/Kconfig create mode 100644 drivers/phy/Makefile create mode 100644 drivers/phy/phy-core.c create mode 100644 include/linux/phy/phy.h
Signature · 1 line
1.7.10.4
PATCH v8 1/8 drivers: phy: add generic PHY framework
The PHY framework provides a set of APIs for the PHY drivers to create/destroy a PHY and APIs for the PHY users to obtain a reference to the PHY with or without using phandle. For dt-boot, the PHY drivers should also register *PHY provider* with the framework.
PHY drivers should create the PHY by passing id and ops like init, exit, power_on and power_off. This framework is also pm runtime enabled.
The documentation for the generic PHY framework is added in Documentation/phy.txt and the documentation for dt binding can be found at Documentation/devicetree/bindings/phy/phy-bindings.txt
--- .../devicetree/bindings/phy/phy-bindings.txt | 66 +++ Documentation/phy.txt | 125 +++++ MAINTAINERS | 7 + drivers/Kconfig | 2 + drivers/Makefile | 2 + drivers/phy/Kconfig | 13 + drivers/phy/Makefile | 5 + drivers/phy/phy-core.c | 548 ++++++++++++++++++++ include/linux/phy/phy.h | 334 ++++++++++++ 9 files changed, 1102 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/phy-bindings.txt create mode 100644 Documentation/phy.txt create mode 100644 drivers/phy/Kconfig create mode 100644 drivers/phy/Makefile create mode 100644 drivers/phy/phy-core.c create mode 100644 include/linux/phy/phy.h
Documentation/devicetree/bindings/phy/phy-bindings.txt new file +66 -0
@@ -0,0 +1,66 @@ +This document explains only the device tree data binding. For general +information about PHY subsystem refer to Documentation/phy.txt + +PHY device node +=============== + +Required Properties: +#phy-cells: Number of cells in a PHY specifier; The meaning of all those + cells is defined by the binding for the phy node. The PHY + provider can use the values in cells to find the appropriate + PHY. + +For example: + +phys: phy { + compatible = "xxx"; + reg = <...>; + . + . + #phy-cells = <1>; + . + . +}; + +That node describes an IP block (PHY provider) that implements 2 different PHYs. +In order to differentiate between these 2 PHYs, an additonal specifier should be +given while trying to get a reference to it. + +PHY user node +============= + +Required Properties: +phys : the phandle for the PHY device (used by the PHY subsystem) +phy-names : the names of the PHY corresponding to the PHYs present in the + *phys* phandle + +Example 1: +usb1: usb_otg_ss at xxx { + compatible = "xxx"; + reg = <xxx>; + . + . + phys = <&usb2_phy>, <&usb3_phy>; + phy-names = "usb2phy", "usb3phy"; + . + . +}; + +This node represents a controller that uses two PHYs, one for usb2 and one for +usb3. + +Example 2: +usb2: usb_otg_ss at xxx { + compatible = "xxx"; + reg = <xxx>; + . + . + phys = <&phys 1>; + phy-names = "usbphy"; + . + . +}; + +This node represents a controller that uses one of the PHYs of the PHY provider +device defined previously. Note that the phy handle has an additional specifier +"1" to differentiate between the two PHYs.
Documentation/phy.txt new file +125 -0
125 lines not on this page · raw message
MAINTAINERS +7 -0
@@ -3536,6 +3536,13 @@ S: Maintained F: include/asm-generic F: include/uapi/asm-generic +GENERIC PHY FRAMEWORK +M: Kishon Vijay Abraham I <[email protected]> +L: linux-kernel at vger.kernel.org +S: Supported +F: drivers/phy/ +F: include/linux/phy/ + GENERIC UIO DRIVER FOR PCI DEVICES M: "Michael S. Tsirkin" <[email protected]> L: kvm at vger.kernel.org
drivers/Kconfig +2 -0
@@ -166,4 +166,6 @@ source "drivers/ipack/Kconfig" source "drivers/reset/Kconfig" +source "drivers/phy/Kconfig" + endmenu
drivers/Makefile +2 -0
@@ -8,6 +8,8 @@ obj-y += irqchip/ obj-y += bus/ +obj-$(CONFIG_GENERIC_PHY) += phy/ + # GPIO must come after pinctrl as gpios may need to mux pins etc obj-y += pinctrl/ obj-y += gpio/
drivers/phy/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ +# +# PHY +# + +menuconfig GENERIC_PHY + tristate "PHY Subsystem" + help + Generic PHY support. + + This framework is designed to provide a generic interface for PHY + devices present in the kernel. This layer will have the generic + API by which phy drivers can create PHY using the phy framework and + phy users can obtain reference to the PHY.
drivers/phy/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# +# Makefile for the phy drivers. +# + +obj-$(CONFIG_GENERIC_PHY) += phy-core.o
drivers/phy/phy-core.c new file +548 -0
548 lines not on this page · raw message
include/linux/phy/phy.h new file +334 -0
334 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Re: [PATCH v8 1/8] drivers: phy: add generic PHY framework
Hi,
include/linux/phy/phy.h
Quoted 5 lines · Kishon Vijay Abraham I
include/linux/phy/phy.h new file +0
-0
on this header, how about adding phy_set_drvdata() and phy_get_drvdata() helpers ?
cheers
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/be6c70be/attachment.sig>
PATCH v8 2/8 usb: phy: omap-usb2: use the new generic PHY framework
In reply to Kishon Vijay Abraham IUsed the generic PHY framework API to create the PHY. Now the power off and power on are done in omap_usb_power_off and omap_usb_power_on respectively.
However using the old USB PHY library cannot be completely removed because OTG is intertwined with PHY and moving to the new framework will break OTG. Once we have a separate OTG state machine, we can get rid of the USB PHY library.
--- drivers/usb/phy/Kconfig | 1 + drivers/usb/phy/phy-omap-usb2.c | 43 +++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-)
drivers/usb/phy/Kconfig +1 -0
@@ -69,6 +69,7 @@ config OMAP_CONTROL_USB config OMAP_USB2 tristate "OMAP USB2 PHY Driver" depends on ARCH_OMAP2PLUS + depends on GENERIC_PHY select OMAP_CONTROL_USB help Enable this to support the transceiver that is part of SOC. This
drivers/usb/phy/phy-omap-usb2.c +39 -4
77 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Re: [PATCH v8 2/8] usb: phy: omap-usb2: use the new generic PHY framework
Quoted 10 lines · Kishon Vijay Abraham I
Used the generic PHY framework API to create the PHY. Now the power off and power on are done in
omap_usb_power_offandomap_usb_power_onrespectively.However using the old USB PHY library cannot be completely removed because OTG is intertwined with PHY and moving to the new framework will break OTG. Once we have a separate OTG state machine, we can get rid of the USB PHY library.
Signed-off-by Kishon Vijay Abraham I <[email protected]>Reviewed-by Sylwester Nawrocki <[email protected]>
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/b91d82b3/attachment.sig>
PATCH v8 3/8 usb: phy: twl4030: use the new generic PHY framework
In reply to Kishon Vijay Abraham IUsed the generic PHY framework API to create the PHY. For powering on and powering off the PHY, power_on and power_off ops are used. Once the MUSB OMAP glue is adapted to the new framework, the suspend and resume ops of usb phy library will be removed.
However using the old usb phy library cannot be completely removed because otg is intertwined with phy and moving to the new framework completely will break otg. Once we have a separate otg state machine, we can get rid of the usb phy library.
--- drivers/usb/phy/phy-twl4030-usb.c | 48 ++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)
drivers/usb/phy/phy-twl4030-usb.c +47 -1
@@ -33,6 +33,7 @@#include <linux/io.h> #include <linux/delay.h> #include <linux/usb/otg.h> +#include <linux/phy/phy.h> #include <linux/usb/musb-omap.h> #include <linux/usb/ulpi.h> #include <linux/i2c/twl.h>
@@ -431,6 +432,14 @@ static void twl4030_phy_suspend(struct twl4030_usb *twl, int controller_off)dev_dbg (twl->dev,"%s\n" , __func__); } +static int twl4030_phy_power_off (struct phy *phy) +{ +struct twl4030_usb *twl =dev_get_drvdata (&phy->dev); + +twl4030_phy_suspend (twl,0 ); +return 0 ; +} +static void __twl4030_phy_resume (struct twl4030_usb *twl) {twl4030_phy_power (twl,1 );
@@ -459,6 +468,14 @@ static void twl4030_phy_resume(struct twl4030_usb *twl) } } +static int twl4030_phy_power_on (struct phy *phy) +{ +struct twl4030_usb *twl =dev_get_drvdata (&phy->dev); + +twl4030_phy_resume (twl); +return 0 ; +} +static int twl4030_usb_ldo_init (struct twl4030_usb *twl) {/* Enable writing to power configuration registers */
@@ -602,13 +619,22 @@ static int twl4030_usb_phy_init(struct usb_phy *phy) status =twl4030_usb_linkstat (twl); twl->linkstat = status; -if (status ==OMAP_MUSB_ID_GROUND || status ==OMAP_MUSB_VBUS_VALID ) +if (status ==OMAP_MUSB_ID_GROUND || status ==OMAP_MUSB_VBUS_VALID ) {omap_musb_mailbox (twl->linkstat); +twl4030_phy_resume (twl); + }sysfs_notify (&twl->dev->kobj,NULL ,"vbus" );return 0 ; } +static int twl4030_phy_init (struct phy *phy) +{ +struct twl4030_usb *twl =dev_get_drvdata (&phy->dev); + +return twl4030_usb_phy_init (&twl->phy); +} +static int twl4030_set_suspend (struct usb_phy *x,int suspend) {struct twl4030_usb *twl =phy_to_twl (x);
@@ -646,13 +672,22 @@ static int twl4030_set_host(struct usb_otg *otg, struct usb_bus *host)return 0 ; } +static const struct phy_ops ops = { + .init = twl4030_phy_init, + .power_on = twl4030_phy_power_on, + .power_off = twl4030_phy_power_off, + .owner =THIS_MODULE , +}; +static int twl4030_usb_probe (struct platform_device *pdev) {struct twl4030_usb_data *pdata = pdev->dev.platform_data;struct twl4030_usb *twl; +struct phy *phy;int status, err;struct usb_otg *otg;struct device_node *np = pdev->dev.of_node; +struct phy_provider *phy_provider; twl =devm_kzalloc (&pdev->dev,sizeof *twl,GFP_KERNEL );if (!twl)
@@ -689,6 +724,17 @@ static int twl4030_usb_probe(struct platform_device *pdev) otg->set_host = twl4030_set_host; otg->set_peripheral = twl4030_set_peripheral; + phy_provider =devm_of_phy_provider_register (twl->dev, + of_phy_simple_xlate); +if (IS_ERR (phy_provider)) +return PTR_ERR (phy_provider); + + phy =devm_phy_create (twl->dev,0 , &ops,"twl4030" , twl); +if (IS_ERR (phy)) { +dev_dbg (&pdev->dev,"Failed to create PHY\n" ); +return PTR_ERR (phy); + } +/* init spinlock for workqueue */ spin_lock_init (&twl->lock);
Signature · 1 line
1.7.10.4
Re: [PATCH v8 3/8] usb: phy: twl4030: use the new generic PHY framework
Quoted 5 lines · Kishon Vijay Abraham I
Used the generic PHY framework API to create the PHY. For powering on and powering off the PHY,
power_onandpower_offops are used. Once the MUSB OMAP glue is adapted to the new framework, the suspend and resume ops of usb phy library will be removed.
Quoted 7 lines
However using the old usb phy library cannot be completely removed because otg is intertwined with phy and moving to the new framework completely will break otg. Once we have a separate otg state machine, we can get rid of the usb phy library.
Signed-off-by Kishon Vijay Abraham I <[email protected]>Reviewed-by Felipe Balbi <[email protected]>
I'll add an Acked-by here:
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/8c97bdcf/attachment.sig>
PATCH v8 4/8 ARM: OMAP: USB: Add phy binding information
In reply to Kishon Vijay Abraham IIn order for controllers to get PHY in case of non dt boot, the phy binding information (phy device name) should be added in the platform data of the controller.
--- arch/arm/mach-omap2/usb-musb.c | 6 +++++- include/linux/usb/musb.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/usb-musb.c +5 -1
@@ -85,8 +85,12 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) musb_plat.mode = board_data->mode; musb_plat.extvbus = board_data->extvbus; -if (cpu_is_omap44xx ()) +if (cpu_is_omap44xx ()) { musb_plat.has_mailbox = true; + musb_plat.phy_label ="omap-usb2" ; + }else if (cpu_is_omap34xx ()) { + musb_plat.phy_label ="twl4030" ; + }if (soc_is_am35xx ()) { oh_name ="am35x_otg_hs" ;
include/linux/usb/musb.h +3 -0
@@ -104,6 +104,9 @@ struct musb_hdrc_platform_data {/* for clk_get() */ const char *clock; +/* phy label */ +const char *phy_label; +/* (HOST or OTG) switch VBUS on/off */ int (*set_vbus)(struct device *dev,int is_on);
Signature · 1 line
1.7.10.4
Re: [PATCH v8 4/8] ARM: OMAP: USB: Add phy binding information
Quoted 6 lines · Kishon Vijay Abraham I
In order for controllers to get PHY in case of non dt boot, the phy binding information (phy device name) should be added in the platform data of the controller.
Signed-off-by Kishon Vijay Abraham I <[email protected]>Reviewed-by Sylwester Nawrocki <[email protected]>
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/12e3a0e3/attachment.sig>
PATCH v8 5/8 ARM: dts: omap: update usb_otg_hs data
In reply to Kishon Vijay Abraham IUpdated the usb_otg_hs dt data to include the *phy* and *phy-names* binding in order for the driver to use the new generic PHY framework. Also updated the Documentation to include the binding information. The PHY binding information can be found at Documentation/devicetree/bindings/phy/phy-bindings.txt
--- Documentation/devicetree/bindings/usb/omap-usb.txt | 5 +++++ Documentation/devicetree/bindings/usb/usb-phy.txt | 6 ++++++ arch/arm/boot/dts/omap3-beagle-xm.dts | 2 ++ arch/arm/boot/dts/omap3-evm.dts | 2 ++ arch/arm/boot/dts/omap3-overo.dtsi | 2 ++ arch/arm/boot/dts/omap4.dtsi | 3 +++ arch/arm/boot/dts/twl4030.dtsi | 1 + 7 files changed, 21 insertions(+)
Documentation/devicetree/bindings/usb/omap-usb.txt +5 -0
@@ -19,6 +19,9 @@ OMAP MUSB GLUE - power : Should be "50". This signifies the controller can supply upto 100mA when operating in host mode. - usb-phy : the phandle for the PHY device + - phys : the phandle for the PHY device (used by generic PHY framework) + - phy-names : the names of the PHY corresponding to the PHYs present in the + *phy* phandle. Optional properties: - ctrl-module : phandle of the control module this glue uses to write to
@@ -33,6 +36,8 @@ usb_otg_hs: usb_otg_hs at 4a0ab000 { num-eps = <16>; ram-bits = <12>; ctrl-module = <&omap_control_usb>; + phys = <&usb2_phy>; + phy-names = "usb2-phy"; }; Board specific device node entry
Documentation/devicetree/bindings/usb/usb-phy.txt +6 -0
@@ -5,6 +5,8 @@ OMAP USB2 PHY Required properties: - compatible: Should be "ti,omap-usb2" - 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. Optional properties: - ctrl-module : phandle of the control module used by PHY driver to power on
@@ -16,6 +18,7 @@ usb2phy at 4a0ad080 { compatible = "ti,omap-usb2"; reg = <0x4a0ad080 0x58>; ctrl-module = <&omap_control_usb>; + #phy-cells = <0>; }; OMAP USB3 PHY
@@ -25,6 +28,8 @@ Required properties: - reg : Address and length of the register set for the device. - reg-names: The names of the register addresses corresponding to the registers filled in "reg". + - #phy-cells: determine the number of cells that should be given in the + phandle while referencing this phy. Optional properties: - ctrl-module : phandle of the control module used by PHY driver to power on
@@ -39,4 +44,5 @@ usb3phy at 4a084400 { <0x4a084c00 0x40>; reg-names = "phy_rx", "phy_tx", "pll_ctrl"; ctrl-module = <&omap_control_usb>; + #phy-cells = <0>; };
arch/arm/boot/dts/omap3-beagle-xm.dts +2 -0
@@ -123,6 +123,8 @@ &usb_otg_hs { interface-type = <0>; usb-phy = <&usb2_phy>; + phys = <&usb2_phy>; + phy-names = "usb2-phy"; mode = <3>; power = <50>; };
arch/arm/boot/dts/omap3-evm.dts +2 -0
@@ -69,6 +69,8 @@ &usb_otg_hs { interface-type = <0>; usb-phy = <&usb2_phy>; + phys = <&usb2_phy>; + phy-names = "usb2-phy"; mode = <3>; power = <50>; };
arch/arm/boot/dts/omap3-overo.dtsi +2 -0
@@ -74,6 +74,8 @@ &usb_otg_hs { interface-type = <0>; usb-phy = <&usb2_phy>; + phys = <&usb2_phy>; + phy-names = "usb2-phy"; mode = <3>; power = <50>; };
arch/arm/boot/dts/omap4.dtsi +3 -0
@@ -517,6 +517,7 @@ compatible = "ti,omap-usb2"; reg = <0x4a0ad080 0x58>; ctrl-module = <&omap_control_usb>; + #phy-cells = <0>; }; };
@@ -655,6 +656,8 @@ interrupt-names = "mc", "dma"; ti,hwmods = "usb_otg_hs"; usb-phy = <&usb2_phy>; + phys = <&usb2_phy>; + phy-names = "usb2-phy"; multipoint = <1>; num-eps = <16>; ram-bits = <12>;
arch/arm/boot/dts/twl4030.dtsi +1 -0
@@ -80,6 +80,7 @@ usb1v8-supply = <&vusb1v8>; usb3v1-supply = <&vusb3v1>; usb_mode = <1>; + #phy-cells = <0>; }; twl_pwm: pwm {
Signature · 1 line
1.7.10.4
Re: [PATCH v8 5/8] ARM: dts: omap: update usb_otg_hs data
Quoted 8 lines · Kishon Vijay Abraham I
Updated the
usb_otg_hsdt data to include the *phy* and *phy-names* binding in order for the driver to use the new generic PHY framework. Also updated the Documentation to include the binding information. The PHY binding information can be found atDocumentation/devicetree/bindings/phy/phy-bindings.txtSigned-off-by Kishon Vijay Abraham I <[email protected]>Reviewed-by Felipe Balbi <[email protected]>
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/dc4c5fb3/attachment-0001.sig>
PATCH v8 6/8 usb: musb: omap2430: use the new generic PHY framework
In reply to Kishon Vijay Abraham IUse the generic PHY framework API to get the PHY. The usb_phy_set_resume and usb_phy_set_suspend is replaced with power_on and power_off to align with the new PHY framework.
musb->xceiv can't be removed as of now because musb core uses xceiv.state and xceiv.otg. Once there is a separate state machine to handle otg, these can be moved out of xceiv and then we can start using the generic PHY framework.
--- drivers/usb/musb/Kconfig | 1 + drivers/usb/musb/musb_core.c | 1 + drivers/usb/musb/musb_core.h | 3 +++ drivers/usb/musb/omap2430.c | 26 ++++++++++++++++++++------ 4 files changed, 25 insertions(+), 6 deletions(-)
drivers/usb/musb/Kconfig +1 -0
@@ -47,6 +47,7 @@ config USB_MUSB_TUSB6010 config USB_MUSB_OMAP2PLUS tristate "OMAP2430 and onwards" depends on ARCH_OMAP2PLUS + depends on GENERIC_PHY config USB_MUSB_AM35X tristate "AM35x"
drivers/usb/musb/musb_core.c +1 -0
@@ -1864,6 +1864,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) musb->board_set_power = plat->set_power; musb->min_power = plat->min_power; musb->ops = plat->platform_ops; + musb->phy_label = plat->phy_label;/* The musb_platform_init() call: * - adjusts musb->mregs
drivers/usb/musb/musb_core.h +3 -0
@@ -46,6 +46,7 @@#include <linux/usb.h> #include <linux/usb/otg.h> #include <linux/usb/musb.h> +#include <linux/phy/phy.h> struct musb ;struct musb_hw_ep ;
@@ -357,6 +358,7 @@ struct musb {u16 int_tx;struct usb_phy *xceiv; +struct phy *phy;int nIrq; unsigned irq_wake:1;
@@ -434,6 +436,7 @@ struct musb { unsigned double_buffer_not_ok:1;struct musb_hdrc_config *config; +const char *phy_label;#ifdef MUSB_CONFIG_PROC_FS struct proc_dir_entry *proc_entry;
drivers/usb/musb/omap2430.c +20 -6
@@ -348,11 +348,21 @@ static int omap2430_musb_init(struct musb *musb)* up through ULPI. TWL4030-family PMICs include one, * which needs a driver, drivers aren't always needed. */ -if (dev->parent->of_node) +if (dev->parent->of_node) { + musb->phy =devm_phy_get (dev->parent,"usb2-phy" ); + +/* We can't totally remove musb->xceiv as of now because +* musb core uses xceiv.state and xceiv.otg. Once we have +* a separate state machine to handle otg, these can be moved +* out of xceiv and then we can start using the generic PHY +* framework +*/ musb->xceiv =devm_usb_get_phy_by_phandle (dev->parent,"usb-phy" ,0 ); -else + }else { musb->xceiv =devm_usb_get_phy_dev (dev,0 ); + musb->phy =devm_phy_get (dev, musb->phy_label); + }if (IS_ERR (musb->xceiv)) { status =PTR_ERR (musb->xceiv);
@@ -364,6 +374,10 @@ static int omap2430_musb_init(struct musb *musb)return -EPROBE_DEFER ; } +if (IS_ERR (musb->phy)) { +pr_err ("HS USB OTG: no PHY configured\n" ); +return PTR_ERR (musb->phy); + } musb->isr = omap2430_musb_interrupt; status =pm_runtime_get_sync (dev);
@@ -397,7 +411,7 @@ static int omap2430_musb_init(struct musb *musb)if (glue->status !=OMAP_MUSB_UNKNOWN )omap_musb_set_mailbox (glue); -usb_phy_init (musb->xceiv); +phy_init (musb->phy);pm_runtime_put_noidle (musb->controller);return 0 ;
@@ -460,6 +474,7 @@ static int omap2430_musb_exit(struct musb *musb)del_timer_sync (&musb_idle_timer);omap2430_low_level_exit (musb); +phy_exit (musb->phy);return 0 ; }
@@ -619,7 +634,7 @@ static int omap2430_runtime_suspend(struct device *dev) OTG_INTERFSEL);omap2430_low_level_exit (musb); -usb_phy_set_suspend (musb->xceiv,1 ); +phy_power_off (musb->phy); }return 0 ;
@@ -634,8 +649,7 @@ static int omap2430_runtime_resume(struct device *dev)omap2430_low_level_init (musb);musb_writel (musb->mregs,OTG_INTERFSEL , musb->context.otg_interfsel); - -usb_phy_set_suspend (musb->xceiv,0 ); +phy_power_on (musb->phy); }return 0 ;
Signature · 1 line
1.7.10.4
Re: [PATCH v8 6/8] usb: musb: omap2430: use the new generic PHY framework
Quoted 10 lines · Kishon Vijay Abraham I
Use the generic PHY framework API to get the PHY. The
usb_phy_set_resumeandusb_phy_set_suspendis replaced withpower_onandpower_offto align with the new PHY framework.
musb->xceivcan't be removed as of now because musb core uses xceiv.state and xceiv.otg. Once there is a separate state machine to handle otg, these can be moved out of xceiv and then we can start using the generic PHY framework.Signed-off-by Kishon Vijay Abraham I <[email protected]>Reviewed-by Sylwester Nawrocki <[email protected]>
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/4193429f/attachment.sig>
PATCH v8 7/8 usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
In reply to Kishon Vijay Abraham INow that omap-usb2 is adapted to the new generic PHY framework, *set_suspend* ops can be removed from omap-usb2 driver.
--- drivers/usb/phy/phy-omap-usb2.c | 25 ------------------------- 1 file changed, 25 deletions(-)
drivers/usb/phy/phy-omap-usb2.c +0 -25
@@ -97,29 +97,6 @@ static int omap_usb_set_peripheral(struct usb_otg *otg,return 0 ; } -static int omap_usb2_suspend (struct usb_phy *x,int suspend) -{ -u32 ret; -struct omap_usb *phy =phy_to_omapusb (x); - -if (suspend && !phy->is_suspended) { -omap_control_usb_phy_power (phy->control_dev,0 ); -pm_runtime_put_sync (phy->dev); - phy->is_suspended =1 ; - }else if (!suspend && phy->is_suspended) { - ret =pm_runtime_get_sync (phy->dev); -if (ret <0 ) { -dev_err (phy->dev,"get_sync failed with err %d\n" , - ret); -return ret; - } -omap_control_usb_phy_power (phy->control_dev,1 ); - phy->is_suspended =0 ; - } - -return 0 ; -} -static int omap_usb_power_off (struct phy *x) {struct omap_usb *phy =dev_get_drvdata (&x->dev);
@@ -167,7 +144,6 @@ static int omap_usb2_probe(struct platform_device *pdev) phy->phy.dev = phy->dev; phy->phy.label ="omap-usb2" ; - phy->phy.set_suspend = omap_usb2_suspend; phy->phy.otg = otg; phy->phy.type =USB_PHY_TYPE_USB2 ;
@@ -182,7 +158,6 @@ static int omap_usb2_probe(struct platform_device *pdev)return -ENODEV ; } - phy->is_suspended =1 ;omap_control_usb_phy_power (phy->control_dev,0 ); otg->set_host = omap_usb_set_host;
Signature · 1 line
1.7.10.4
Re: [PATCH v8 7/8] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
Quoted 5 lines · Kishon Vijay Abraham I
Now that omap-usb2 is adapted to the new generic PHY framework, *set_suspend* ops can be removed from omap-usb2 driver.
Signed-off-by Kishon Vijay Abraham I <[email protected]>Reviewed-by Felipe Balbi <[email protected]>
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/e6036b5f/attachment.sig>
PATCH v8 8/8 usb: phy: twl4030-usb: remove *set_suspend* and *phy_init* ops
In reply to Kishon Vijay Abraham INow that twl4030-usb is adapted to the new generic PHY framework, *set_suspend* and *phy_init* ops can be removed from twl4030-usb driver.
--- drivers/usb/phy/phy-twl4030-usb.c | 57 +++++++++---------------------------- 1 file changed, 13 insertions(+), 44 deletions(-)
drivers/usb/phy/phy-twl4030-usb.c +13 -44
@@ -422,25 +422,20 @@ static void twl4030_phy_power(struct twl4030_usb *twl, int on) } } -static void twl4030_phy_suspend (struct twl4030_usb *twl,int controller_off) +static int twl4030_phy_power_off (struct phy *phy) { +struct twl4030_usb *twl =dev_get_drvdata (&phy->dev); +if (twl->asleep) -return ; +return 0 ;twl4030_phy_power (twl,0 ); twl->asleep =1 ;dev_dbg (twl->dev,"%s\n" , __func__); -} - -static int twl4030_phy_power_off (struct phy *phy) -{ -struct twl4030_usb *twl =dev_get_drvdata (&phy->dev); - -twl4030_phy_suspend (twl,0 );return 0 ; } -static void __twl4030_phy_resume (struct twl4030_usb *twl) +static void __twl4030_phy_power_on (struct twl4030_usb *twl) {twl4030_phy_power (twl,1 );twl4030_i2c_access (twl,1 );
@@ -449,11 +444,13 @@ static void __twl4030_phy_resume(struct twl4030_usb *twl)twl4030_i2c_access (twl,0 ); } -static void twl4030_phy_resume (struct twl4030_usb *twl) +static int twl4030_phy_power_on (struct phy *phy) { +struct twl4030_usb *twl =dev_get_drvdata (&phy->dev); +if (!twl->asleep) -return ; -__twl4030_phy_resume (twl); +return 0 ; +__twl4030_phy_power_on (twl); twl->asleep =0 ;dev_dbg (twl->dev,"%s\n" , __func__);
@@ -466,13 +463,6 @@ static void twl4030_phy_resume(struct twl4030_usb *twl)cancel_delayed_work (&twl->id_workaround_work);schedule_delayed_work (&twl->id_workaround_work,HZ ); } -} - -static int twl4030_phy_power_on (struct phy *phy) -{ -struct twl4030_usb *twl =dev_get_drvdata (&phy->dev); - -twl4030_phy_resume (twl);return 0 ; }
@@ -604,9 +594,9 @@ static void twl4030_id_workaround_work(struct work_struct *work) } } -static int twl4030_usb_phy_init (struct usb_phy *phy) +static int twl4030_phy_init (struct phy *phy) { -struct twl4030_usb *twl =phy_to_twl (phy); +struct twl4030_usb *twl =dev_get_drvdata (&phy->dev);enum omap_musb_vbus_id_status status;/*
@@ -621,32 +611,13 @@ static int twl4030_usb_phy_init(struct usb_phy *phy)if (status ==OMAP_MUSB_ID_GROUND || status ==OMAP_MUSB_VBUS_VALID ) {omap_musb_mailbox (twl->linkstat); -twl4030_phy_resume (twl); +twl4030_phy_power_on (phy); }sysfs_notify (&twl->dev->kobj,NULL ,"vbus" );return 0 ; } -static int twl4030_phy_init (struct phy *phy) -{ -struct twl4030_usb *twl =dev_get_drvdata (&phy->dev); - -return twl4030_usb_phy_init (&twl->phy); -} - -static int twl4030_set_suspend (struct usb_phy *x,int suspend) -{ -struct twl4030_usb *twl =phy_to_twl (x); - -if (suspend) -twl4030_phy_suspend (twl,1 ); -else -twl4030_phy_resume (twl); - -return 0 ; -} -static int twl4030_set_peripheral (struct usb_otg *otg,struct usb_gadget *gadget) {
@@ -717,8 +688,6 @@ static int twl4030_usb_probe(struct platform_device *pdev) twl->phy.label ="twl4030" ; twl->phy.otg = otg; twl->phy.type =USB_PHY_TYPE_USB2 ; - twl->phy.set_suspend = twl4030_set_suspend; - twl->phy.init = twl4030_usb_phy_init; otg->phy = &twl->phy; otg->set_host = twl4030_set_host;
Signature · 1 line
1.7.10.4
Re: [PATCH v8 8/8] usb: phy: twl4030-usb: remove *set_suspend* and *phy_init* ops
Quoted 5 lines · Kishon Vijay Abraham I
Now that twl4030-usb is adapted to the new generic PHY framework, *set_suspend* and *phy_init* ops can be removed from twl4030-usb driver.
Signed-off-by Kishon Vijay Abraham I <[email protected]>Reviewed-by Felipe Balbi <[email protected]>
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/61f539ef/attachment.sig>