usb: ulpi bus
Subsystems (6)
Heikki Krogerus
maintainerv2 cover usb: ulpi bus
Major changes since v1:
- calling dwc3_phy_setup earlier and registering the ULPI interface there.
- new property to dwc3 for selecting the interface in case of UTMI+ and ULPI as suggested by Felipe
- dwc3 soft reset before registration of the ULPI interface to sync the clocks as suggested by David
- Including support for the BYT boards that have the GPIOs controlling the reset and cs signals.
Heikki Krogerus (12):
usb: add bus type for USB ULPI
usb: dwc3: USB2 PHY register access bits
usb: dwc3: ULPI or UTMI+ select
usb: dwc3: store driver data earlier
usb: dwc3: cache hwparams earlier
usb: dwc3: soft reset to it's own function
usb: dwc3: setup phys earlier
usb: dwc3: add hsphy_interface property
usb: dwc3: pci: add quirk for Baytrails
usb: dwc3: add ULPI interface support
phy: helpers for USB ULPI PHY registering
phy: add driver for TI TUSB1210 ULPI PHY
Documentation/devicetree/bindings/usb/dwc3.txt | 2 + MAINTAINERS | 7 + drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 1 + drivers/phy/phy-tusb1210.c | 153 +++++++++++++++ drivers/phy/ulpi_phy.h | 31 +++ drivers/usb/common/Makefile | 1 + drivers/usb/common/ulpi.c | 256 +++++++++++++++++++++++++ drivers/usb/core/Kconfig | 8 + drivers/usb/dwc3/Kconfig | 7 + drivers/usb/dwc3/Makefile | 4 + drivers/usb/dwc3/core.c | 99 +++++++--- drivers/usb/dwc3/core.h | 26 +++ drivers/usb/dwc3/dwc3-pci.c | 36 ++++ drivers/usb/dwc3/platform_data.h | 2 + drivers/usb/dwc3/ulpi.c | 91 +++++++++ include/linux/mod_devicetable.h | 6 + include/linux/ulpi/driver.h | 62 ++++++ include/linux/ulpi/interface.h | 23 +++ include/linux/ulpi/regs.h | 130 +++++++++++++ include/linux/usb/ulpi.h | 134 +------------ scripts/mod/devicetable-offsets.c | 4 + scripts/mod/file2alias.c | 13 ++ 23 files changed, 946 insertions(+), 157 deletions(-) create mode 100644 drivers/phy/phy-tusb1210.c create mode 100644 drivers/phy/ulpi_phy.h create mode 100644 drivers/usb/common/ulpi.c create mode 100644 drivers/usb/dwc3/ulpi.c create mode 100644 include/linux/ulpi/driver.h create mode 100644 include/linux/ulpi/interface.h create mode 100644 include/linux/ulpi/regs.h
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 1/12 usb: add bus type for USB ULPI
UTMI+ Low Pin Interface (ULPI) is a commonly used PHY interface for USB 2.0. The ULPI specification describes a standard set of registers which the vendors can extend for their specific needs. ULPI PHYs provide often functions such as charger detection and ADP sensing and probing.
There are two major issues that the bus type is meant to tackle:
Firstly, ULPI registers are accessed from the controller. The bus provides convenient method for the controller drivers to share that access with the actual PHY drivers.
Secondly, there are already platforms that assume ULPI PHYs are runtime detected, such as many Intel Baytrail based platforms. They do not provide any kind of hardware description for the ULPI PHYs like separate ACPI device object that could be used to enumerate a device from.
--- MAINTAINERS | 7 ++ drivers/usb/common/Makefile | 1 + drivers/usb/common/ulpi.c | 256 ++++++++++++++++++++++++++++++++++++++ drivers/usb/core/Kconfig | 8 ++ include/linux/mod_devicetable.h | 6 + include/linux/ulpi/driver.h | 62 +++++++++ include/linux/ulpi/interface.h | 23 ++++ include/linux/ulpi/regs.h | 130 +++++++++++++++++++ include/linux/usb/ulpi.h | 134 +------------------- scripts/mod/devicetable-offsets.c | 4 + scripts/mod/file2alias.c | 13 ++ 11 files changed, 512 insertions(+), 132 deletions(-) create mode 100644 drivers/usb/common/ulpi.c create mode 100644 include/linux/ulpi/driver.h create mode 100644 include/linux/ulpi/interface.h create mode 100644 include/linux/ulpi/regs.h
MAINTAINERS +7 -0
@@ -10413,6 +10413,13 @@ S: Maintained F: Documentation/video4linux/zr364xx.txt F: drivers/media/usb/zr364xx/ +ULPI BUS +M: Heikki Krogerus <[email protected]> +L: [email protected] +S: Maintained +F: drivers/usb/common/ulpi.c +F: include/linux/ulpi/ + USER-MODE LINUX (UML) M: Jeff Dike <[email protected]> M: Richard Weinberger <[email protected]>
drivers/usb/common/Makefile +1 -0
@@ -7,3 +7,4 @@ usb-common-y += common.o usb-common-$(CONFIG_USB_LED_TRIG) += led.o obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o +obj-$(CONFIG_USB_ULPI_BUS) += ulpi.o
drivers/usb/common/ulpi.c new file +256 -0
256 lines not on this page · raw message
drivers/usb/core/Kconfig +8 -0
@@ -84,3 +84,11 @@ config USB_OTG_FSM Implements OTG Finite State Machine as specified in On-The-Go and Embedded Host Supplement to the USB Revision 2.0 Specification. +config USB_ULPI_BUS + bool "USB ULPI PHY interface support" + depends on USB || USB_GADGET + help + Say yes if you have ULPI PHY attached to your USB controller. + + If unsure, say N. +
include/linux/mod_devicetable.h +6 -0
@@ -621,4 +621,10 @@ struct mcb_device_id { kernel_ulong_t driver_data; }; +struct ulpi_device_id { +__u16 vendor; +__u16 product; +kernel_ulong_t driver_data; +}; +#endif /* LINUX_MOD_DEVICETABLE_H */
include/linux/ulpi/driver.h new file +62 -0
62 lines not on this page · raw message
include/linux/ulpi/interface.h new file +23 -0
@@ -0,0 +1,23 @@ +#ifndef __LINUX_ULPI_INTERFACE_H +#define __LINUX_ULPI_INTERFACE_H + +#include <linux/types.h> + +struct ulpi ; + +/** +* struct ulpi_ops - ULPI register access +* @dev: the interface provider +* @read: read opearation for ULPI register access +* @write: write opearation for ULPI register access +*/ +struct ulpi_ops { +struct device *dev; +int (*read)(struct ulpi_ops *ops,u8 addr); +int (*write)(struct ulpi_ops *ops,u8 addr,u8 val); +}; + +struct ulpi *ulpi_register_interface (struct device *,struct ulpi_ops *); +void ulpi_unregister_interface (struct ulpi *); + +#endif /* __LINUX_ULPI_INTERFACE_H */
include/linux/ulpi/regs.h new file +130 -0
130 lines not on this page · raw message
include/linux/usb/ulpi.h +2 -132
146 lines not on this page · raw message
scripts/mod/devicetable-offsets.c +4 -0
@@ -186,5 +186,9 @@ int main(void)DEVID_FIELD (rio_device_id, asm_did);DEVID_FIELD (rio_device_id, asm_vid); +DEVID (ulpi_device_id); +DEVID_FIELD (ulpi_device_id, vendor); +DEVID_FIELD (ulpi_device_id, product); +return 0 ; }
scripts/mod/file2alias.c +13 -0
@@ -1176,6 +1176,19 @@ static int do_rio_entry(const char *filename, }ADD_TO_DEVTABLE ("rapidio" , rio_device_id, do_rio_entry); +/* Looks like: ulpi:vNpN */ +static int do_ulpi_entry (const char *filename,void *symval, +char *alias) +{ +DEF_FIELD (symval, ulpi_device_id, vendor); +DEF_FIELD (symval, ulpi_device_id, product); + +sprintf (alias,"ulpi:v%04xp%04x" , vendor, product); + +return 1 ; +} +ADD_TO_DEVTABLE ("ulpi" , ulpi_device_id, do_ulpi_entry); +/* Does namelen bytes of name exactly match the symbol? */ static bool sym_is (const char *name,unsigned namelen,const char *symbol) {
Signature · 1 line
2.1.4
Re: [PATCHv2 01/12] usb: add bus type for USB ULPI
drivers/usb/common/Makefile usb-common-y += common.o · line 10
Quoted 7 lines · Heikki Krogerus
drivers/usb/common/Makefile +1
-0@@ -7,3 +7,4 @@ usb-common-y += common.o usb-common-$(CONFIG_USB_LED_TRIG) += led.o obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o +obj-$(CONFIG_USB_ULPI_BUS) += ulpi.o
USB_ULPI_BUS is added as a bool symbol (see below). So ulpi.o will never be part of a module.
drivers/usb/common/ulpi.c
Quoted 4 lines
drivers/usb/common/ulpi.c new file +1
-0+#include <linux/module.h>
So is this include needed?
drivers/usb/common/ulpi.c line 246
Quoted 5 lines
drivers/usb/common/ulpi.c new file +5
-0+static int __init ulpi_init (void ) +{ +return bus_register (&ulpi_bus); +} +module_init (ulpi_init);
This will be equivalent to
__initcall(ulpi_init)
according to include/linux/init.h.
drivers/usb/common/ulpi.c line 252
Quoted 5 lines
drivers/usb/common/ulpi.c new file +5
-0+static void __exit ulpi_exit(void) +{ +bus_unregister (&ulpi_bus); +} +module_exit (ulpi_exit);
This will never be called.
drivers/usb/common/ulpi.c line 256
Quoted 3 lines
drivers/usb/common/ulpi.c new file +3
-0+MODULE_AUTHOR ("Intel Corporation" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("USB ULPI PHY bus" );
And these three macros will be, effectively, preprocessed away.
drivers/usb/core/Kconfig config USB_OTG_FSM · line 94
Quoted 11 lines
drivers/usb/core/Kconfig +8
-0+config USB_ULPI_BUS + bool "USB ULPI PHY interface support" + depends on USB || USB_GADGET + help + Say yes if you have ULPI PHY attached to your USB controller. + + If unsure, say N. +
Paul Bolle
Heikki Krogerus
maintainerRe: [PATCHv2 01/12] usb: add bus type for USB ULPI
Quoted 3 lines
Quoted 1 line
+#include <
linux/module.h>So is this include needed?
I can change it to linux/kmod.h. We'll still do the request_module call even after these changes.
Quoted 10 lines
drivers/usb/common/ulpi.c line 246
Quoted 5 lines
drivers/usb/common/ulpi.c new file +5
-0+static int __init ulpi_init (void ) +{ +return bus_register (&ulpi_bus); +} +module_init (ulpi_init);This will be equivalent to
__initcall(ulpi_init)according to
include/linux/init.h.
I'll change it to subsys_initcall(ulpi_init).
Quoted 8 lines
drivers/usb/common/ulpi.c line 252
Quoted 5 lines
drivers/usb/common/ulpi.c new file +5
-0+static void __exit ulpi_exit(void) +{ +bus_unregister (&ulpi_bus); +} +module_exit (ulpi_exit);This will never be called.
Quoted 5 lines
drivers/usb/common/ulpi.c line 256
Quoted 3 lines
drivers/usb/common/ulpi.c new file +3
-0+MODULE_AUTHOR ("Intel Corporation" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("USB ULPI PHY bus" );And these three macros will be, effectively, preprocessed away.
True. I'll drop them.
Thanks,
Signature · 1 line
heikki
Heikki Krogerus
maintainerPATCH v3 1/12 usb: add bus type for USB ULPI
UTMI+ Low Pin Interface (ULPI) is a commonly used PHY interface for USB 2.0. The ULPI specification describes a standard set of registers which the vendors can extend for their specific needs. ULPI PHYs provide often functions such as charger detection and ADP sensing and probing.
There are two major issues that the bus type is meant to tackle:
Firstly, ULPI registers are accessed from the controller. The bus provides convenient method for the controller drivers to share that access with the actual PHY drivers.
Secondly, there are already platforms that assume ULPI PHYs are runtime detected, such as many Intel Baytrail based platforms. They do not provide any kind of hardware description for the ULPI PHYs like separate ACPI device object that could be used to enumerate a device from.
--- MAINTAINERS | 7 ++ drivers/usb/common/Makefile | 1 + drivers/usb/common/ulpi.c | 246 ++++++++++++++++++++++++++++++++++++++ drivers/usb/core/Kconfig | 8 ++ include/linux/mod_devicetable.h | 6 + include/linux/ulpi/driver.h | 62 ++++++++++ include/linux/ulpi/interface.h | 23 ++++ include/linux/ulpi/regs.h | 130 ++++++++++++++++++++ include/linux/usb/ulpi.h | 134 +-------------------- scripts/mod/devicetable-offsets.c | 4 + scripts/mod/file2alias.c | 13 ++ 11 files changed, 502 insertions(+), 132 deletions(-) create mode 100644 drivers/usb/common/ulpi.c create mode 100644 include/linux/ulpi/driver.h create mode 100644 include/linux/ulpi/interface.h create mode 100644 include/linux/ulpi/regs.h
MAINTAINERS +7 -0
@@ -10427,6 +10427,13 @@ S: Maintained F: Documentation/video4linux/zr364xx.txt F: drivers/media/usb/zr364xx/ +ULPI BUS +M: Heikki Krogerus <[email protected]> +L: [email protected] +S: Maintained +F: drivers/usb/common/ulpi.c +F: include/linux/ulpi/ + USER-MODE LINUX (UML) M: Jeff Dike <[email protected]> M: Richard Weinberger <[email protected]>
drivers/usb/common/Makefile +1 -0
@@ -7,3 +7,4 @@ usb-common-y += common.o usb-common-$(CONFIG_USB_LED_TRIG) += led.o obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o +obj-$(CONFIG_USB_ULPI_BUS) += ulpi.o
drivers/usb/common/ulpi.c new file +246 -0
246 lines not on this page · raw message
drivers/usb/core/Kconfig +8 -0
@@ -84,3 +84,11 @@ config USB_OTG_FSM Implements OTG Finite State Machine as specified in On-The-Go and Embedded Host Supplement to the USB Revision 2.0 Specification. +config USB_ULPI_BUS + bool "USB ULPI PHY interface support" + depends on USB || USB_GADGET + help + Say yes if you have ULPI PHY attached to your USB controller. + + If unsure, say N. +
include/linux/mod_devicetable.h +6 -0
@@ -621,4 +621,10 @@ struct mcb_device_id { kernel_ulong_t driver_data; }; +struct ulpi_device_id { +__u16 vendor; +__u16 product; +kernel_ulong_t driver_data; +}; +#endif /* LINUX_MOD_DEVICETABLE_H */
include/linux/ulpi/driver.h new file +62 -0
62 lines not on this page · raw message
include/linux/ulpi/interface.h new file +23 -0
@@ -0,0 +1,23 @@ +#ifndef __LINUX_ULPI_INTERFACE_H +#define __LINUX_ULPI_INTERFACE_H + +#include <linux/types.h> + +struct ulpi ; + +/** +* struct ulpi_ops - ULPI register access +* @dev: the interface provider +* @read: read opearation for ULPI register access +* @write: write opearation for ULPI register access +*/ +struct ulpi_ops { +struct device *dev; +int (*read)(struct ulpi_ops *ops,u8 addr); +int (*write)(struct ulpi_ops *ops,u8 addr,u8 val); +}; + +struct ulpi *ulpi_register_interface (struct device *,struct ulpi_ops *); +void ulpi_unregister_interface (struct ulpi *); + +#endif /* __LINUX_ULPI_INTERFACE_H */
include/linux/ulpi/regs.h new file +130 -0
130 lines not on this page · raw message
include/linux/usb/ulpi.h +2 -132
146 lines not on this page · raw message
scripts/mod/devicetable-offsets.c +4 -0
@@ -186,5 +186,9 @@ int main(void)DEVID_FIELD (rio_device_id, asm_did);DEVID_FIELD (rio_device_id, asm_vid); +DEVID (ulpi_device_id); +DEVID_FIELD (ulpi_device_id, vendor); +DEVID_FIELD (ulpi_device_id, product); +return 0 ; }
scripts/mod/file2alias.c +13 -0
@@ -1176,6 +1176,19 @@ static int do_rio_entry(const char *filename, }ADD_TO_DEVTABLE ("rapidio" , rio_device_id, do_rio_entry); +/* Looks like: ulpi:vNpN */ +static int do_ulpi_entry (const char *filename,void *symval, +char *alias) +{ +DEF_FIELD (symval, ulpi_device_id, vendor); +DEF_FIELD (symval, ulpi_device_id, product); + +sprintf (alias,"ulpi:v%04xp%04x" , vendor, product); + +return 1 ; +} +ADD_TO_DEVTABLE ("ulpi" , ulpi_device_id, do_ulpi_entry); +/* Does namelen bytes of name exactly match the symbol? */ static bool sym_is (const char *name,unsigned namelen,const char *symbol) {
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v4 1/12 usb: add bus type for USB ULPI
UTMI+ Low Pin Interface (ULPI) is a commonly used PHY interface for USB 2.0. The ULPI specification describes a standard set of registers which the vendors can extend for their specific needs. ULPI PHYs provide often functions such as charger detection and ADP sensing and probing.
There are two major issues that the bus type is meant to tackle:
Firstly, ULPI registers are accessed from the controller. The bus provides convenient method for the controller drivers to share that access with the actual PHY drivers.
Secondly, there are already platforms that assume ULPI PHYs are runtime detected, such as many Intel Baytrail based platforms. They do not provide any kind of hardware description for the ULPI PHYs like separate ACPI device object that could be used to enumerate a device from.
---
Since v3:
- Fix type in comment
MAINTAINERS | 7 ++ drivers/usb/common/Makefile | 1 + drivers/usb/common/ulpi.c | 246 ++++++++++++++++++++++++++++++++++++++ drivers/usb/core/Kconfig | 8 ++ include/linux/mod_devicetable.h | 6 + include/linux/ulpi/driver.h | 62 ++++++++++ include/linux/ulpi/interface.h | 23 ++++ include/linux/ulpi/regs.h | 130 ++++++++++++++++++++ include/linux/usb/ulpi.h | 134 +-------------------- scripts/mod/devicetable-offsets.c | 4 + scripts/mod/file2alias.c | 13 ++ 11 files changed, 502 insertions(+), 132 deletions(-) create mode 100644 drivers/usb/common/ulpi.c create mode 100644 include/linux/ulpi/driver.h create mode 100644 include/linux/ulpi/interface.h create mode 100644 include/linux/ulpi/regs.h
MAINTAINERS +7 -0
@@ -10440,6 +10440,13 @@ S: Maintained F: Documentation/video4linux/zr364xx.txt F: drivers/media/usb/zr364xx/ +ULPI BUS +M: Heikki Krogerus <[email protected]> +L: [email protected] +S: Maintained +F: drivers/usb/common/ulpi.c +F: include/linux/ulpi/ + USER-MODE LINUX (UML) M: Jeff Dike <[email protected]> M: Richard Weinberger <[email protected]>
drivers/usb/common/Makefile +1 -0
@@ -7,3 +7,4 @@ usb-common-y += common.o usb-common-$(CONFIG_USB_LED_TRIG) += led.o obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o +obj-$(CONFIG_USB_ULPI_BUS) += ulpi.o
drivers/usb/common/ulpi.c new file +246 -0
246 lines not on this page · raw message
drivers/usb/core/Kconfig +8 -0
@@ -84,3 +84,11 @@ config USB_OTG_FSM Implements OTG Finite State Machine as specified in On-The-Go and Embedded Host Supplement to the USB Revision 2.0 Specification. +config USB_ULPI_BUS + bool "USB ULPI PHY interface support" + depends on USB || USB_GADGET + help + Say yes if you have ULPI PHY attached to your USB controller. + + If unsure, say N. +
include/linux/mod_devicetable.h +6 -0
@@ -629,4 +629,10 @@ struct mcb_device_id { kernel_ulong_t driver_data; }; +struct ulpi_device_id { +__u16 vendor; +__u16 product; +kernel_ulong_t driver_data; +}; +#endif /* LINUX_MOD_DEVICETABLE_H */
include/linux/ulpi/driver.h new file +62 -0
62 lines not on this page · raw message
include/linux/ulpi/interface.h new file +23 -0
@@ -0,0 +1,23 @@ +#ifndef __LINUX_ULPI_INTERFACE_H +#define __LINUX_ULPI_INTERFACE_H + +#include <linux/types.h> + +struct ulpi ; + +/** +* struct ulpi_ops - ULPI register access +* @dev: the interface provider +* @read: read opearation for ULPI register access +* @write: write opearation for ULPI register access +*/ +struct ulpi_ops { +struct device *dev; +int (*read)(struct ulpi_ops *ops,u8 addr); +int (*write)(struct ulpi_ops *ops,u8 addr,u8 val); +}; + +struct ulpi *ulpi_register_interface (struct device *,struct ulpi_ops *); +void ulpi_unregister_interface (struct ulpi *); + +#endif /* __LINUX_ULPI_INTERFACE_H */
include/linux/ulpi/regs.h new file +130 -0
130 lines not on this page · raw message
include/linux/usb/ulpi.h +2 -132
146 lines not on this page · raw message
scripts/mod/devicetable-offsets.c +4 -0
@@ -189,5 +189,9 @@ int main(void)DEVID_FIELD (rio_device_id, asm_did);DEVID_FIELD (rio_device_id, asm_vid); +DEVID (ulpi_device_id); +DEVID_FIELD (ulpi_device_id, vendor); +DEVID_FIELD (ulpi_device_id, product); +return 0 ; }
scripts/mod/file2alias.c +13 -0
@@ -1192,6 +1192,19 @@ static int do_rio_entry(const char *filename, }ADD_TO_DEVTABLE ("rapidio" , rio_device_id, do_rio_entry); +/* Looks like: ulpi:vNpN */ +static int do_ulpi_entry (const char *filename,void *symval, +char *alias) +{ +DEF_FIELD (symval, ulpi_device_id, vendor); +DEF_FIELD (symval, ulpi_device_id, product); + +sprintf (alias,"ulpi:v%04xp%04x" , vendor, product); + +return 1 ; +} +ADD_TO_DEVTABLE ("ulpi" , ulpi_device_id, do_ulpi_entry); +/* Does namelen bytes of name exactly match the symbol? */ static bool sym_is (const char *name,unsigned namelen,const char *symbol) {
Signature · 1 line
2.1.4
Re: [PATCHv2 01/12] usb: add bus type for USB ULPI
In reply to Heikki Krogerusdrivers/usb/common/ulpi.c line 143
Quoted 3 lines · Heikki Krogerus
drivers/usb/common/ulpi.c new file +3
-0+ +/** +* ulpi_register_driver - unregister a driver with the ULPI bus
Hi Heikki,
"ulpi_register_driver" should be changed to "ulpi_unregister_driver".
Thanks,
Baolu
Quoted 10 lines
+ * @drv: driver to unregister
+ *
+ * Unregisters a driver with the ULPI bus.
+ */drivers/usb/common/ulpi.c new file +6
-0+void ulpi_unregister_driver (struct ulpi_driver *drv) +{ +driver_unregister (&drv->driver); +} +EXPORT_SYMBOL_GPL (ulpi_unregister_driver); +
Heikki Krogerus
maintainerRe: [PATCHv2 01/12] usb: add bus type for USB ULPI
Quoted 6 lines
drivers/usb/common/ulpi.c line 143
Quoted 3 lines
drivers/usb/common/ulpi.c new file +3
-0+ +/** +* ulpi_register_driver - unregister a driver with the ULPI bus Hi Heikki,
"
ulpi_register_driver" should be changed to "ulpi_unregister_driver".
OK,
Thanks,
Signature · 1 line
heikki
Heikki Krogerus
maintainerPATCH v2 2/12 usb: dwc3: USB2 PHY register access bits
In reply to Heikki KrogerusDefinitions for Global USB2 PHY Vendor Control Register bits. We will need them to access ULPI PHY registers later.
--- drivers/usb/dwc3/core.h | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/usb/dwc3/core.h +8 -0
@@ -174,6 +174,14 @@#define DWC3_GUSB2PHYCFG_PHYSOFTRST (1 << 31)#define DWC3_GUSB2PHYCFG_SUSPHY (1 << 6) +/* Global USB2 PHY Vendor Control Register */ +#define DWC3_GUSB2PHYACC_NEWREGREQ (1 << 25) +#define DWC3_GUSB2PHYACC_BUSY (1 << 23) +#define DWC3_GUSB2PHYACC_WRITE (1 << 22) +#define DWC3_GUSB2PHYACC_ADDR (n) (n << 16) +#define DWC3_GUSB2PHYACC_EXTEND_ADDR (n) (n << 8) +#define DWC3_GUSB2PHYACC_DATA (n) (n & 0xff) +/* Global USB3 PIPE Control Register */ #define DWC3_GUSB3PIPECTL_PHYSOFTRST (1 << 31)#define DWC3_GUSB3PIPECTL_U2SSINP3OK (1 << 29)
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 3/12 usb: dwc3: ULPI or UTMI+ select
In reply to Heikki KrogerusMake selection between ULPI and UTMI+ interfaces possible by providing definition for the bit in Global USB2 PHY Configuration Register that controls it.
--- drivers/usb/dwc3/core.h | 1 + 1 file changed, 1 insertion(+)
drivers/usb/dwc3/core.h +1 -0
@@ -173,6 +173,7 @@/* Global USB2 PHY Configuration Register */ #define DWC3_GUSB2PHYCFG_PHYSOFTRST (1 << 31)#define DWC3_GUSB2PHYCFG_SUSPHY (1 << 6) +#define DWC3_GUSB2PHYCFG_ULPI_UTMI (1 << 4)/* Global USB2 PHY Vendor Control Register */ #define DWC3_GUSB2PHYACC_NEWREGREQ (1 << 25)
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 4/12 usb: dwc3: store driver data earlier
In reply to Heikki KrogerusWe need to store it before phys are handled, so we can later use it in ULPI interface support code.
--- drivers/usb/dwc3/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/dwc3/core.c +2 -1
@@ -875,12 +875,13 @@ static int dwc3_probe(struct platform_device *pdev) dwc->hird_threshold = hird_threshold | (dwc->is_utmi_l1_suspend <<4 ); +platform_set_drvdata (pdev, dwc); + ret =dwc3_core_get_phy (dwc);if (ret) goto err0;spin_lock_init (&dwc->lock); -platform_set_drvdata (pdev, dwc);if (!dev->dma_mask) { dev->dma_mask = dev->parent->dma_mask;
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 5/12 usb: dwc3: cache hwparams earlier
In reply to Heikki KrogerusSo they are available when ULPI interface support is added.
--- drivers/usb/dwc3/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/dwc3/core.c +1 -2
@@ -876,6 +876,7 @@ static int dwc3_probe(struct platform_device *pdev) | (dwc->is_utmi_l1_suspend << 4);platform_set_drvdata (pdev, dwc); +dwc3_cache_hwparams (dwc); ret =dwc3_core_get_phy (dwc);if (ret)
@@ -893,8 +894,6 @@ static int dwc3_probe(struct platform_device *pdev)pm_runtime_get_sync (dev);pm_runtime_forbid (dev); -dwc3_cache_hwparams (dwc); - ret =dwc3_alloc_event_buffers (dwc,DWC3_EVENT_BUFFERS_SIZE );if (ret) {dev_err (dwc->dev,"failed to allocate event buffers\n" );
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 6/12 usb: dwc3: soft reset to it's own function
In reply to Heikki KrogerusSo it can be called from other places later.
--- drivers/usb/dwc3/core.c | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-)
drivers/usb/dwc3/core.c +30 -16
@@ -117,6 +117,33 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc) }/** +* dwc3_soft_reset - Issue soft reset +* @dwc: Pointer to our controller context structure +*/ +static int dwc3_soft_reset (struct dwc3 *dwc) +{ +unsigned long timeout; +u32 reg; + + timeout = jiffies +msecs_to_jiffies (500 ); +dwc3_writel (dwc->regs,DWC3_DCTL ,DWC3_DCTL_CSFTRST ); +do { + reg =dwc3_readl (dwc->regs,DWC3_DCTL ); +if (!(reg &DWC3_DCTL_CSFTRST )) +break ; + +if (time_after (jiffies, timeout)) { +dev_err (dwc->dev,"Reset Timed Out\n" ); +return -ETIMEDOUT ; + } + +cpu_relax (); + }while (true); + +return 0 ; +} + +/** * dwc3_free_one_event_buffer - Frees one event buffer * @dwc: Pointer to our controller context structure * @evt: Pointer to event buffer to be freed
@@ -438,7 +465,6 @@ static void dwc3_phy_setup(struct dwc3 *dwc)*/ static int dwc3_core_init (struct dwc3 *dwc) { -unsigned long timeout;u32 hwparams4 = dwc->hwparams.hwparams4;u32 reg;int ret;
@@ -466,21 +492,9 @@ static int dwc3_core_init(struct dwc3 *dwc) }/* issue device SoftReset too */ - timeout = jiffies +msecs_to_jiffies (500 ); -dwc3_writel (dwc->regs,DWC3_DCTL ,DWC3_DCTL_CSFTRST ); -do { - reg =dwc3_readl (dwc->regs,DWC3_DCTL ); -if (!(reg &DWC3_DCTL_CSFTRST )) -break ; - -if (time_after (jiffies, timeout)) { -dev_err (dwc->dev,"Reset Timed Out\n" ); - ret = -ETIMEDOUT ; - goto err0; - } - -cpu_relax (); - }while (true); + ret =dwc3_soft_reset (dwc); +if (ret) + goto err0; ret =dwc3_core_soft_reset (dwc);if (ret)
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 7/12 usb: dwc3: setup phys earlier
In reply to Heikki KrogerusThis allows dwc3_phy_setup() to be more useful later. There is nothing preventing the PHY configuration registers from being programmed early. They do not loose their context in soft reset.
There are however other PHY related operations that should be executed before the driver request handles to the PHYs, such as registering DWC3's ULPI interface, which can now be done in dwc3_phy_setup().
Also, if there ever was need for the two 100ms delays in dwc3_phy_setup() there isn't anymore. The PHYs are now reset after the PHY interfaces are setup.
--- drivers/usb/dwc3/core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/usb/dwc3/core.c +2 -6
@@ -436,8 +436,6 @@ static void dwc3_phy_setup(struct dwc3 *dwc)dwc3_writel (dwc->regs,DWC3_GUSB3PIPECTL (0 ), reg); -mdelay (100 ); - reg =dwc3_readl (dwc->regs,DWC3_GUSB2PHYCFG (0 ));/*
@@ -453,8 +451,6 @@ static void dwc3_phy_setup(struct dwc3 *dwc) reg &= ~DWC3_GUSB2PHYCFG_SUSPHY ;dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), reg); - -mdelay (100 ); }/**
@@ -569,8 +565,6 @@ static int dwc3_core_init(struct dwc3 *dwc)dwc3_writel (dwc->regs,DWC3_GCTL , reg); -dwc3_phy_setup (dwc); - ret =dwc3_alloc_scratch_buffers (dwc);if (ret) goto err1;
@@ -892,6 +886,8 @@ static int dwc3_probe(struct platform_device *pdev)platform_set_drvdata (pdev, dwc);dwc3_cache_hwparams (dwc); +dwc3_phy_setup (dwc); + ret =dwc3_core_get_phy (dwc);if (ret) goto err0;
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 8/12 usb: dwc3: add hsphy_interface property
In reply to Heikki KrogerusPlatforms that have configured DWC_USB3_HSPHY_INTERFACE with value 3, i.e. UTMI+ and ULPI, need to inform the driver of the actual HSPHY interface type with the property. "utmi" if the interface is UTMI+ or "ulpi" if the interface is ULPI.
--- Documentation/devicetree/bindings/usb/dwc3.txt | 2 ++ drivers/usb/dwc3/core.c | 29 ++++++++++++++++++++++++-- drivers/usb/dwc3/core.h | 3 +++ drivers/usb/dwc3/platform_data.h | 2 ++ 4 files changed, 34 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/usb/dwc3.txt +2 -0
@@ -38,6 +38,8 @@ Optional properties: - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal utmi_l1_suspend_n, false when asserts utmi_sleep_n - snps,hird-threshold: HIRD threshold + - snps,hsphy_interface: High-Speed PHY interface selection between "utmi" for + UTMI+ and "ulpi" for ULPI when the DWC_USB3_HSPHY_INTERFACE has value 3. This is usually a subnode to DWC3 glue to which it is connected.
drivers/usb/dwc3/core.c +27 -2
@@ -395,9 +395,10 @@ static void dwc3_cache_hwparams(struct dwc3 *dwc)* dwc3_phy_setup - Configure USB PHY Interface of DWC3 Core * @dwc: Pointer to our controller context structure */ -static void dwc3_phy_setup (struct dwc3 *dwc) +static int dwc3_phy_setup (struct dwc3 *dwc) {u32 reg; +int ret; reg =dwc3_readl (dwc->regs,DWC3_GUSB3PIPECTL (0 ));
@@ -438,6 +439,22 @@ static void dwc3_phy_setup(struct dwc3 *dwc) reg =dwc3_readl (dwc->regs,DWC3_GUSB2PHYCFG (0 )); +/* Select the HS PHY interface */ +switch (DWC3_GHWPARAMS3_HSPHY_IFC (dwc->hwparams.hwparams3)) { +case DWC3_GHWPARAMS3_HSPHY_IFC_UTMI_ULPI : +if (!strncmp (dwc->hsphy_interface,"utmi" ,4 )) { + reg &= ~DWC3_GUSB2PHYCFG_ULPI_UTMI ; + }else if (!strncmp (dwc->hsphy_interface,"ulpi" ,4 )) { + reg |=DWC3_GUSB2PHYCFG_ULPI_UTMI ; + }else { +dev_err (dwc->dev,"HSPHY Interface not defined\n" ); +return -EINVAL ; + } +/* FALLTHROUGH */ +default : +break ; + } +/* * Above 1.94a, it is recommended to set DWC3_GUSB2PHYCFG_SUSPHY to * '0' during coreConsultant configuration. So default value will
@@ -451,6 +468,8 @@ static void dwc3_phy_setup(struct dwc3 *dwc) reg &= ~DWC3_GUSB2PHYCFG_SUSPHY ;dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), reg); + +return 0 ; }/**
@@ -844,6 +863,8 @@ static int dwc3_probe(struct platform_device *pdev) "snps,tx_de_emphasis_quirk");of_property_read_u8 (node,"snps,tx_de_emphasis" , &tx_de_emphasis); +of_property_read_string (node,"snps,hsphy_interface" , + &dwc->hsphy_interface); }else if (pdata) { dwc->maximum_speed = pdata->maximum_speed; dwc->has_lpm_erratum = pdata->has_lpm_erratum;
@@ -871,6 +892,8 @@ static int dwc3_probe(struct platform_device *pdev) dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk;if (pdata->tx_de_emphasis) tx_de_emphasis = pdata->tx_de_emphasis; + + dwc->hsphy_interface = pdata->hsphy_interface; }/* default to superspeed if no maximum_speed passed */
@@ -886,7 +909,9 @@ static int dwc3_probe(struct platform_device *pdev)platform_set_drvdata (pdev, dwc);dwc3_cache_hwparams (dwc); -dwc3_phy_setup (dwc); + ret =dwc3_phy_setup (dwc); +if (ret) + goto err0; ret =dwc3_core_get_phy (dwc);if (ret)
drivers/usb/dwc3/core.h +3 -0
@@ -682,6 +682,7 @@ struct dwc3_scratchpad_array {* @test_mode_nr: test feature selector * @lpm_nyet_threshold: LPM NYET response threshold * @hird_threshold: HIRD threshold +* @hsphy_interface: "utmi" or "ulpi" * @delayed_status: true when gadget driver asks for delayed status * @ep0_bounced: true when we used bounce buffer * @ep0_expect_in: true when we expect a DATA IN transfer
@@ -809,6 +810,8 @@ struct dwc3 {u8 lpm_nyet_threshold;u8 hird_threshold; +const char *hsphy_interface; + unsigned delayed_status:1; unsigned ep0_bounced:1; unsigned ep0_expect_in:1;
drivers/usb/dwc3/platform_data.h +2 -0
@@ -45,4 +45,6 @@ struct dwc3_platform_data { unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2; + +const char *hsphy_interface; };
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 9/12 usb: dwc3: pci: add quirk for Baytrails
In reply to Heikki KrogerusOn some BYT platforms the USB2 PHY needs to be put into operational mode by the controller driver with GPIOs controlling the PHYs reset and cs signals.
--- drivers/usb/dwc3/dwc3-pci.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
drivers/usb/dwc3/dwc3-pci.c +36 -0
@@ -21,6 +21,8 @@#include <linux/slab.h> #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/gpio/consumer.h> +#include <linux/acpi.h> #include "platform_data.h"
@@ -31,6 +33,15 @@#define PCI_DEVICE_ID_INTEL_SPTLP 0x9d30#define PCI_DEVICE_ID_INTEL_SPTH 0xa130 +static const struct acpi_gpio_params reset_gpios = {0 ,0 , false }; +static const struct acpi_gpio_params cs_gpios = {1 ,0 , false }; + +static const struct acpi_gpio_mapping acpi_dwc3_byt_gpios[] = { + {"reset-gpios" , &reset_gpios,1 }, + {"cs-gpios" , &cs_gpios,1 }, + { }, +}; +static int dwc3_pci_quirks (struct pci_dev *pdev) { if (pdev->vendor == PCI_VENDOR_ID_AMD &&
@@ -65,6 +76,31 @@ static int dwc3_pci_quirks(struct pci_dev *pdev) sizeof(pdata)); } +if (pdev->vendor ==PCI_VENDOR_ID_INTEL && + pdev->device ==PCI_DEVICE_ID_INTEL_BYT ) { +struct gpio_desc *gpio; + +acpi_dev_add_driver_gpios (ACPI_COMPANION (&pdev->dev), + acpi_dwc3_byt_gpios); + + gpio =gpiod_get (&pdev->dev,"reset" ); +if (IS_ERR (gpio)) +return 0 ; + +/* These GPIOs will turn on the USB2 PHY */ +gpiod_direction_output (gpio,0 ); +gpiod_set_value_cansleep (gpio,1 ); +gpiod_put (gpio); + + gpio =gpiod_get (&pdev->dev,"cs" ); +if (!IS_ERR (gpio)) { +gpiod_direction_output (gpio,0 ); +gpiod_set_value_cansleep (gpio,1 ); +gpiod_put (gpio); + } +msleep (10 ); + } +return 0 ; }
Signature · 1 line
2.1.4
Re: [PATCHv2 09/12] usb: dwc3: pci: add quirk for Baytrails
Hi Heikki,
Quoted 49 lines · Heikki Krogerus
On some BYT platforms the USB2 PHY needs to be put into operational mode by the controller driver with GPIOs controlling the PHYs reset and cs signals.
Signed-off-by Heikki Krogerus <[email protected]>--- drivers/usb/dwc3/dwc3-pci.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)drivers/usb/dwc3/dwc3-pci.c +18
-0@@ -21,6 +21,8 @@#include <linux/slab.h> #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/gpio/consumer.h> +#include <linux/acpi.h> #include "platform_data.h" @@ -31,6 +33,15 @@#define PCI_DEVICE_ID_INTEL_SPTLP 0x9d30#define PCI_DEVICE_ID_INTEL_SPTH 0xa130 +static const struct acpi_gpio_params reset_gpios = {0 ,0 , false }; +static const struct acpi_gpio_params cs_gpios = {1 ,0 , false }; + +static const struct acpi_gpio_mapping acpi_dwc3_byt_gpios[] = { + {"reset-gpios" , &reset_gpios,1 }, + {"cs-gpios" , &cs_gpios,1 }, + { }, +}; +static int dwc3_pci_quirks (struct pci_dev *pdev) { if (pdev->vendor == PCI_VENDOR_ID_AMD &&@@ -65,6 +76,31 @@ static int dwc3_pci_quirks(struct pci_dev *pdev) sizeof(pdata)); } +if (pdev->vendor ==PCI_VENDOR_ID_INTEL && + pdev->device ==PCI_DEVICE_ID_INTEL_BYT ) { +struct gpio_desc *gpio; + +acpi_dev_add_driver_gpios (ACPI_COMPANION (&pdev->dev), + acpi_dwc3_byt_gpios); +
drivers/usb/dwc3/dwc3-pci.c static int dwc3_pci_quirks(struct pci_dev *pdev) · line 95
Quoted 10 lines
drivers/usb/dwc3/dwc3-pci.c +10
-0+ gpio =gpiod_get (&pdev->dev,"reset" ); +if (IS_ERR (gpio)) +return 0 ; + +/* These GPIOs will turn on the USB2 PHY */ +gpiod_direction_output (gpio,0 ); +gpiod_set_value_cansleep (gpio,1 ); +gpiod_put (gpio); + + gpio =gpiod_get (&pdev->dev,"cs" );
CS GPIO should be handled before RESET.
BR, David
Quoted 14 lines
drivers/usb/dwc3/dwc3-pci.c +8
-0+if (!IS_ERR (gpio)) { +gpiod_direction_output (gpio,0 ); +gpiod_set_value_cansleep (gpio,1 ); +gpiod_put (gpio); + } +msleep (10 ); + } +return 0 ; }Signature · 1 line
2.1.4
Heikki Krogerus
maintainerRe: [PATCHv2 09/12] usb: dwc3: pci: add quirk for Baytrails
Quoted 15 lines
Quoted 15 lines
drivers/usb/dwc3/dwc3-pci.c +11
-0@@ -65,6 +76,31 @@ static int dwc3_pci_quirks(struct pci_dev *pdev) sizeof(pdata)); } +if (pdev->vendor ==PCI_VENDOR_ID_INTEL && + pdev->device ==PCI_DEVICE_ID_INTEL_BYT ) { +struct gpio_desc *gpio; + +acpi_dev_add_driver_gpios (ACPI_COMPANION (&pdev->dev), + acpi_dwc3_byt_gpios); + + gpio =gpiod_get (&pdev->dev,"reset" ); +if (IS_ERR (gpio)) +return 0 ; +
Quoted 8 lines
drivers/usb/dwc3/dwc3-pci.c static int dwc3_pci_quirks(struct pci_dev *pdev) · line 95
Quoted 6 lines
drivers/usb/dwc3/dwc3-pci.c +6
-0+/* These GPIOs will turn on the USB2 PHY */ +gpiod_direction_output (gpio,0 ); +gpiod_set_value_cansleep (gpio,1 ); +gpiod_put (gpio); + + gpio =gpiod_get (&pdev->dev,"cs" );CS GPIO should be handled before RESET.
OK, I'll fix it.
Thanks,
Signature · 1 line
heikki
Heikki Krogerus
maintainerPATCH v3 9/12 usb: dwc3: pci: add quirk for Baytrails
On some BYT platforms the USB2 PHY needs to be put into operational mode by the controller driver with GPIOs controlling the PHYs reset and cs signals.
--- drivers/usb/dwc3/dwc3-pci.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
drivers/usb/dwc3/dwc3-pci.c +35 -0
@@ -21,6 +21,8 @@#include <linux/slab.h> #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/gpio/consumer.h> +#include <linux/acpi.h> #include "platform_data.h"
@@ -31,6 +33,15 @@#define PCI_DEVICE_ID_INTEL_SPTLP 0x9d30#define PCI_DEVICE_ID_INTEL_SPTH 0xa130 +static const struct acpi_gpio_params reset_gpios = {0 ,0 , false }; +static const struct acpi_gpio_params cs_gpios = {1 ,0 , false }; + +static const struct acpi_gpio_mapping acpi_dwc3_byt_gpios[] = { + {"reset-gpios" , &reset_gpios,1 }, + {"cs-gpios" , &cs_gpios,1 }, + { }, +}; +static int dwc3_pci_quirks (struct pci_dev *pdev) { if (pdev->vendor == PCI_VENDOR_ID_AMD &&
@@ -65,6 +76,30 @@ static int dwc3_pci_quirks(struct pci_dev *pdev) sizeof(pdata)); } +if (pdev->vendor ==PCI_VENDOR_ID_INTEL && + pdev->device ==PCI_DEVICE_ID_INTEL_BYT ) { +struct gpio_desc *gpio; + +acpi_dev_add_driver_gpios (ACPI_COMPANION (&pdev->dev), + acpi_dwc3_byt_gpios); + +/* These GPIOs will turn on the USB2 PHY */ + gpio =gpiod_get (&pdev->dev,"cs" ); +if (!IS_ERR (gpio)) { +gpiod_direction_output (gpio,0 ); +gpiod_set_value_cansleep (gpio,1 ); +gpiod_put (gpio); + } + + gpio =gpiod_get (&pdev->dev,"reset" ); +if (!IS_ERR (gpio)) { +gpiod_direction_output (gpio,0 ); +gpiod_set_value_cansleep (gpio,1 ); +gpiod_put (gpio); +msleep (10 ); + } + } +return 0 ; }
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 10/12 usb: dwc3: add ULPI interface support
In reply to Heikki KrogerusRegisters DWC3's ULPI interface with the ULPI bus when it's available.
--- drivers/usb/dwc3/Kconfig | 7 ++++ drivers/usb/dwc3/Makefile | 4 +++ drivers/usb/dwc3/core.c | 14 ++++++++ drivers/usb/dwc3/core.h | 14 ++++++++ drivers/usb/dwc3/ulpi.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+) create mode 100644 drivers/usb/dwc3/ulpi.c
drivers/usb/dwc3/Kconfig +7 -0
@@ -11,6 +11,13 @@ config USB_DWC3 if USB_DWC3 +config USB_DWC3_ULPI + bool "Register ULPI PHY Interface" + depends on USB_ULPI_BUS=y + help + Select this if you have ULPI type PHY attached to your DWC3 + controller. + choice bool "DWC3 Mode Selection" default USB_DWC3_DUAL_ROLE if (USB && USB_GADGET)
drivers/usb/dwc3/Makefile +4 -0
@@ -15,6 +15,10 @@ ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET) $(CONFIG_USB_DWC3_DUAL_ROLE)),) dwc3-y += gadget.o ep0.o endif +ifneq ($(CONFIG_USB_DWC3_ULPI),) + dwc3-y += ulpi.o +endif + ifneq ($(CONFIG_DEBUG_FS),) dwc3-y += debugfs.o endif
drivers/usb/dwc3/core.c +14 -0
@@ -444,13 +444,25 @@ static int dwc3_phy_setup(struct dwc3 *dwc)case DWC3_GHWPARAMS3_HSPHY_IFC_UTMI_ULPI :if (!strncmp (dwc->hsphy_interface,"utmi" ,4 )) { reg &= ~DWC3_GUSB2PHYCFG_ULPI_UTMI ; +break ; }else if (!strncmp (dwc->hsphy_interface,"ulpi" ,4 )) { reg |=DWC3_GUSB2PHYCFG_ULPI_UTMI ; +dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), reg); }else {dev_err (dwc->dev,"HSPHY Interface not defined\n" );return -EINVAL ; }/* FALLTHROUGH */ +case DWC3_GHWPARAMS3_HSPHY_IFC_ULPI : +/* Soft reset here to sync the clocks */ + ret =dwc3_soft_reset (dwc); +if (ret) +return ret; + + ret =dwc3_ulpi_init (dwc); +if (ret) +return ret; +/* FALLTHROUGH */ default :break ; }
@@ -999,6 +1011,7 @@ err2: err1:dwc3_free_event_buffers (dwc); +dwc3_ulpi_exit (dwc); err0:/*
@@ -1034,6 +1047,7 @@ static int dwc3_remove(struct platform_device *pdev)phy_power_off (dwc->usb3_generic_phy);dwc3_core_exit (dwc); +dwc3_ulpi_exit (dwc);pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);
drivers/usb/dwc3/core.h +14 -0
@@ -30,6 +30,7 @@#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/otg.h> +#include <linux/ulpi/interface.h> #include <linux/phy/phy.h>
@@ -661,6 +662,7 @@ struct dwc3_scratchpad_array {* @usb3_phy: pointer to USB3 PHY * @usb2_generic_phy: pointer to USB2 PHY * @usb3_generic_phy: pointer to USB3 PHY +* @ulpi: pointer to ulpi interface * @dcfg: saved contents of DCFG register * @gctl: saved contents of GCTL register * @isoch_delay: wValue from Set Isochronous Delay request;
@@ -749,6 +751,8 @@ struct dwc3 {struct phy *usb2_generic_phy;struct phy *usb3_generic_phy; +struct ulpi *ulpi; +void __iomem *regs;size_t regs_size;
@@ -1047,4 +1051,14 @@ static inline int dwc3_gadget_resume(struct dwc3 *dwc) }#endif /* !IS_ENABLED(CONFIG_USB_DWC3_HOST) */ +#if IS_ENABLED (CONFIG_USB_DWC3_ULPI ) +int dwc3_ulpi_init (struct dwc3 *dwc); +void dwc3_ulpi_exit (struct dwc3 *dwc); +#else +static inline int dwc3_ulpi_init (struct dwc3 *dwc) +{return 0 ; } +static inline void dwc3_ulpi_exit (struct dwc3 *dwc) +{ } +#endif +#endif /* __DRIVERS_USB_DWC3_CORE_H */
drivers/usb/dwc3/ulpi.c new file +91 -0
91 lines not on this page · raw message
Signature · 1 line
2.1.4
Re: [PATCHv2 10/12] usb: dwc3: add ULPI interface support
drivers/usb/dwc3/Kconfig config USB_DWC3 · line 16
Quoted 9 lines · Heikki Krogerus
drivers/usb/dwc3/Kconfig +3
-0@@ -11,6 +11,13 @@ config USB_DWC3 if USB_DWC3 +config USB_DWC3_ULPI + bool "Register ULPI PHY Interface" + depends on USB_ULPI_BUS=y
USB_ULPI_BUS is added in 01/12 as a bool symbol. So why not use just
depends on USB_ULPI_BUS
here?
drivers/usb/dwc3/Kconfig config USB_DWC3 · line 20
Quoted 4 lines
drivers/usb/dwc3/Kconfig +4
-0+ help + Select this if you have ULPI type PHY attached to your DWC3 + controller. +
Thanks,
Paul Bolle
Heikki Krogerus
maintainerRe: [PATCHv2 10/12] usb: dwc3: add ULPI interface support
Quoted 6 lines
drivers/usb/dwc3/Kconfig config USB_DWC3 · line 16
Quoted 3 lines
drivers/usb/dwc3/Kconfig +3
-0+config USB_DWC3_ULPI + bool "Register ULPI PHY Interface" + depends on USB_ULPI_BUS=y
USB_ULPI_BUSis added in 01/12 as a bool symbol. So why not use just
depends onUSB_ULPI_BUS
True. Originally I was planning to support building the ULPI bus as a module and have never cleaned these. Thanks for catching them.
Cheers,
Signature · 1 line
heikki
Heikki Krogerus
maintainerPATCH v3 10/12 usb: dwc3: add ULPI interface support
Registers DWC3's ULPI interface with the ULPI bus when it's available.
--- drivers/usb/dwc3/Kconfig | 7 ++++ drivers/usb/dwc3/Makefile | 4 +++ drivers/usb/dwc3/core.c | 14 ++++++++ drivers/usb/dwc3/core.h | 14 ++++++++ drivers/usb/dwc3/ulpi.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+) create mode 100644 drivers/usb/dwc3/ulpi.c
drivers/usb/dwc3/Kconfig +7 -0
@@ -11,6 +11,13 @@ config USB_DWC3 if USB_DWC3 +config USB_DWC3_ULPI + bool "Register ULPI PHY Interface" + depends on USB_ULPI_BUS + help + Select this if you have ULPI type PHY attached to your DWC3 + controller. + choice bool "DWC3 Mode Selection" default USB_DWC3_DUAL_ROLE if (USB && USB_GADGET)
drivers/usb/dwc3/Makefile +4 -0
@@ -15,6 +15,10 @@ ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET) $(CONFIG_USB_DWC3_DUAL_ROLE)),) dwc3-y += gadget.o ep0.o endif +ifneq ($(CONFIG_USB_DWC3_ULPI),) + dwc3-y += ulpi.o +endif + ifneq ($(CONFIG_DEBUG_FS),) dwc3-y += debugfs.o endif
drivers/usb/dwc3/core.c +14 -0
@@ -444,13 +444,25 @@ static int dwc3_phy_setup(struct dwc3 *dwc)case DWC3_GHWPARAMS3_HSPHY_IFC_UTMI_ULPI :if (!strncmp (dwc->hsphy_interface,"utmi" ,4 )) { reg &= ~DWC3_GUSB2PHYCFG_ULPI_UTMI ; +break ; }else if (!strncmp (dwc->hsphy_interface,"ulpi" ,4 )) { reg |=DWC3_GUSB2PHYCFG_ULPI_UTMI ; +dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), reg); }else {dev_err (dwc->dev,"HSPHY Interface not defined\n" );return -EINVAL ; }/* FALLTHROUGH */ +case DWC3_GHWPARAMS3_HSPHY_IFC_ULPI : +/* Soft reset here to sync the clocks */ + ret =dwc3_soft_reset (dwc); +if (ret) +return ret; + + ret =dwc3_ulpi_init (dwc); +if (ret) +return ret; +/* FALLTHROUGH */ default :break ; }
@@ -999,6 +1011,7 @@ err2: err1:dwc3_free_event_buffers (dwc); +dwc3_ulpi_exit (dwc); err0:/*
@@ -1034,6 +1047,7 @@ static int dwc3_remove(struct platform_device *pdev)phy_power_off (dwc->usb3_generic_phy);dwc3_core_exit (dwc); +dwc3_ulpi_exit (dwc);pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);
drivers/usb/dwc3/core.h +14 -0
@@ -30,6 +30,7 @@#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/otg.h> +#include <linux/ulpi/interface.h> #include <linux/phy/phy.h>
@@ -661,6 +662,7 @@ struct dwc3_scratchpad_array {* @usb3_phy: pointer to USB3 PHY * @usb2_generic_phy: pointer to USB2 PHY * @usb3_generic_phy: pointer to USB3 PHY +* @ulpi: pointer to ulpi interface * @dcfg: saved contents of DCFG register * @gctl: saved contents of GCTL register * @isoch_delay: wValue from Set Isochronous Delay request;
@@ -749,6 +751,8 @@ struct dwc3 {struct phy *usb2_generic_phy;struct phy *usb3_generic_phy; +struct ulpi *ulpi; +void __iomem *regs;size_t regs_size;
@@ -1047,4 +1051,14 @@ static inline int dwc3_gadget_resume(struct dwc3 *dwc) }#endif /* !IS_ENABLED(CONFIG_USB_DWC3_HOST) */ +#if IS_ENABLED (CONFIG_USB_DWC3_ULPI ) +int dwc3_ulpi_init (struct dwc3 *dwc); +void dwc3_ulpi_exit (struct dwc3 *dwc); +#else +static inline int dwc3_ulpi_init (struct dwc3 *dwc) +{return 0 ; } +static inline void dwc3_ulpi_exit (struct dwc3 *dwc) +{ } +#endif +#endif /* __DRIVERS_USB_DWC3_CORE_H */
drivers/usb/dwc3/ulpi.c new file +91 -0
91 lines not on this page · raw message
Signature · 1 line
2.1.4
Heikki Krogerus
maintainerPATCH v2 11/12 phy: helpers for USB ULPI PHY registering
In reply to Heikki KrogerusULPI PHYs need to be bound to their controllers with a lookup. This adds helpers that the ULPI drivers can use to do both, the registration of the PHY and the lookup, at the same time.
--- drivers/phy/ulpi_phy.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 drivers/phy/ulpi_phy.h
drivers/phy/ulpi_phy.h new file +31 -0
@@ -0,0 +1,31 @@ +#include <linux/phy/phy.h> + +/** +* Helper that registers PHY for a ULPI device and adds a lookup for binding it +* and it's controller, which is always the parent. +*/ +static inline struct phy +*ulpi_phy_create (struct ulpi *ulpi,struct phy_ops *ops) +{ +struct phy *phy; +int ret; + + phy =phy_create (&ulpi->dev,NULL , ops); +if (IS_ERR (phy)) +return phy; + + ret =phy_create_lookup (phy,"usb2-phy" ,dev_name (ulpi->dev.parent)); +if (ret) { +phy_destroy (phy); +return ERR_PTR (ret); + } + +return phy; +} + +/* Remove a PHY that was created with ulpi_phy_create() and it's lookup. */ +static inline void ulpi_phy_destroy (struct ulpi *ulpi,struct phy *phy) +{ +phy_remove_lookup (phy,"usb2-phy" ,dev_name (ulpi->dev.parent)); +phy_destroy (phy); +}
Signature · 1 line
2.1.4
Re: [PATCHv2 11/12] phy: helpers for USB ULPI PHY registering
Hello.
Quoted 18 lines · Heikki Krogerus
ULPI PHYs need to be bound to their controllers with a lookup. This adds helpers that the ULPI drivers can use to do both, the registration of the PHY and the lookup, at the same time.
Signed-off-by Heikki Krogerus <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>--- drivers/phy/ulpi_phy.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)create mode 100644
drivers/phy/ulpi_phy.hdrivers/phy/ulpi_phy.h new file +0
-0
drivers/phy/ulpi_phy.h line 8
Quoted 8 lines
drivers/phy/ulpi_phy.h new file +8
-0@@ -0,0 +1,31 @@ +#include <linux/phy/phy.h> + +/** +* Helper that registers PHY for a ULPI device and adds a lookup for binding it +* and it's controller, which is always the parent. +*/ +static inline struct phy +*ulpi_phy_create (struct ulpi *ulpi,struct phy_ops *ops)
Please either keep the prototype on a single line or don't break it like
this. The result type should be all on the 1st line.
[...]
WBR, Sergei
Re: [PATCHv2 11/12] phy: helpers for USB ULPI PHY registering
Quoted 25 lines · Sergei Shtylyov
Hello.
Quoted 21 lines · Heikki Krogerus
ULPI PHYs need to be bound to their controllers with a lookup. This adds helpers that the ULPI drivers can use to do both, the registration of the PHY and the lookup, at the same time.
Signed-off-by Heikki Krogerus <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>--- drivers/phy/ulpi_phy.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 drivers/phy/ulpi_phy.hdrivers/phy/ulpi_phy.h new file +3
-0@@ -0,0 +1,31 @@ +#include <linux/phy/phy.h> + +/**
Quoted 8 lines
drivers/phy/ulpi_phy.h line 8
Quoted 5 lines
drivers/phy/ulpi_phy.h new file +5
-0+* Helper that registers PHY for a ULPI device and adds a lookup for binding it +* and it's controller, which is always the parent. +*/ +static inline struct phy +*ulpi_phy_create (struct ulpi *ulpi,struct phy_ops *ops)Please either keep the prototype on a single line or don't break it like
this. The result type should be all on the 1st line.
IMHO this is quite fine and readable. We can find this style in many places of the kernel.
Maybe it's a matter of taste :)
BR, David
Quoted 5 lines
[...]
WBR, Sergei
Re: [PATCHv2 11/12] phy: helpers for USB ULPI PHY registering
Hello.
Quoted 30 lines · David Cohen
Quoted 21 lines
Quoted 21 lines
ULPI PHYs need to be bound to their controllers with a lookup. This adds helpers that the ULPI drivers can use to do both, the registration of the PHY and the lookup, at the same time.
Signed-off-by Heikki Krogerus <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>--- drivers/phy/ulpi_phy.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)create mode 100644
drivers/phy/ulpi_phy.hdrivers/phy/ulpi_phy.h new file +3
-0@@ -0,0 +1,31 @@ +#include <linux/phy/phy.h> + +/** Quoted 8 lines
drivers/phy/ulpi_phy.h line 8
Quoted 5 lines
drivers/phy/ulpi_phy.h new file +5
-0+* Helper that registers PHY for a ULPI device and adds a lookup for binding it +* and it's controller, which is always the parent. +*/ +static inline struct phy +*ulpi_phy_create (struct ulpi *ulpi,struct phy_ops *ops)Please either keep the prototype on a single line or don't break it like
this. The result type should be all on the 1st line.
Quoted 2 lines
IMHO this is quite fine and readable. We can find this style in many places of the kernel.
It's the first time I'm seeing this particular "flavor".
Quoted 1 line
Maybe it's a matter of taste :)
Hopefully a good taste. :-)
Some people also put the operator on the second line, when breaking up the
expressions. Ew. :-)
Quoted 3 lines
BR, David
Quoted 1 line
[...]
WBR, Sergei
Heikki Krogerus
maintainerPATCH v2 12/12 phy: add driver for TI TUSB1210 ULPI PHY
In reply to Heikki KrogerusTUSB1210 ULPI PHY has vendor specific register for eye diagram tuning. On some platforms the system firmware has set optimized value to it. In order to not loose the optimized value, the driver stores it during probe and restores it every time the PHY is powered back on.
--- drivers/phy/Kconfig | 7 +++ drivers/phy/Makefile | 1 + drivers/phy/phy-tusb1210.c | 153 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 drivers/phy/phy-tusb1210.c
drivers/phy/Kconfig +7 -0
@@ -291,4 +291,11 @@ config PHY_QCOM_UFS help Support for UFS PHY on QCOM chipsets. +config PHY_TUSB1210 + tristate "TI TUSB1210 ULPI PHY module" + depends on USB_ULPI_BUS + select GENERIC_PHY + help + Support for TI TUSB1210 USB ULPI PHY. + endmenu
drivers/phy/Makefile +1 -0
@@ -38,3 +38,4 @@ obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o +obj-$(CONFIG_PHY_TUSB1210) += phy-tusb1210.o
drivers/phy/phy-tusb1210.c new file +153 -0
153 lines not on this page · raw message
Signature · 1 line
2.1.4
Hi,
Quoted 11 lines · Heikki Krogerus
Major changes since v1:
- callingdwc3_phy_setupearlier and registering the ULPI interface there.
- new property to dwc3 for selecting the interface in case of UTMI+ and ULPI as suggested by Felipe
- dwc3 soft reset before registration of the ULPI interface to sync the clocks as suggested by David
- Including support for the BYT boards that have the GPIOs controlling the reset and cs signals.
Quoted 13 lines
Heikki Krogerus (12):
usb: add bus type for USB ULPI
usb: dwc3: USB2 PHY register access bits
usb: dwc3: ULPI or UTMI+ select
usb: dwc3: store driver data earlier
usb: dwc3: cache hwparams earlier
usb: dwc3: soft reset to it's own function
usb: dwc3: setup phys earlier
usb: dwc3: addhsphy_interfaceproperty
usb: dwc3: pci: add quirk for Baytrails
usb: dwc3: add ULPI interface support
phy: helpers for USB ULPI PHY registering
phy: add driver for TI TUSB1210 ULPI PHY
Except for my comment on patch "9/12", this version looks fine on my side.
BR, David
David Cohen
Acked-byQuoted 28 lines · David Cohen
Hi,
Quoted 11 lines · Heikki Krogerus
Major changes since v1:
- callingdwc3_phy_setupearlier and registering the ULPI interface there.
- new property to dwc3 for selecting the interface in case of UTMI+ and ULPI as suggested by Felipe
- dwc3 soft reset before registration of the ULPI interface to sync the clocks as suggested by David
- Including support for the BYT boards that have the GPIOs controlling the reset and cs signals.Quoted 13 lines
Heikki Krogerus (12):
usb: add bus type for USB ULPI
usb: dwc3: USB2 PHY register access bits
usb: dwc3: ULPI or UTMI+ select
usb: dwc3: store driver data earlier
usb: dwc3: cache hwparams earlier
usb: dwc3: soft reset to it's own function
usb: dwc3: setup phys earlier
usb: dwc3: addhsphy_interfaceproperty
usb: dwc3: pci: add quirk for Baytrails
usb: dwc3: add ULPI interface support
phy: helpers for USB ULPI PHY registering
phy: add driver for TI TUSB1210 ULPI PHY
Quoted 2 lines
Except for my comment on patch "9/12", this version looks fine on my side.
Making things official. For the whole series (except 9/12):