mfd: omap-usb-host: Device tree support for 3.10
Subsystems (3)
cover mfd: omap-usb-host: Device tree support for 3.10
Hi Samuel,
These patches implement device tree support for the OMAP High Speed USB Host subsystem. The corresponding EHCI & SoC patches will be sent separately and this set has no build dependencies with them.
Patch 3 is acutally a bug fix which should go into 3.9-rc. I've sent it separately to you before.
The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9:
Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)
are available in the git repository at:
git://github.com/rogerq/linux.git usbhost-mfd-next
Roger Quadros (6):
mfd: omap-usb-host: update nports in platform_data
mfd: omap-usb-host: Remove PHY reset handling code
mfd: omap-usb-host: Actually update hostconfig
mfd: omap-usb-tll: move configuration code to omap_tll_init()
mfd: omap-usb-tll: Add device tree support and binding information
mfd: omap-usb-host: Add device tree support and binding information
.../devicetree/bindings/mfd/omap-usb-host.txt | 80 ++++++++ .../devicetree/bindings/mfd/omap-usb-tll.txt | 17 ++ drivers/mfd/omap-usb-host.c | 206 ++++++++++++++----- drivers/mfd/omap-usb-tll.c | 214 ++++++++++---------- drivers/mfd/omap-usb.h | 5 +- 5 files changed, 365 insertions(+), 157 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-tll.txt
--
cheers,
-roger
PATCH 1/6 mfd: omap-usb-host: update nports in platform_data
EHCI driver would need to know the number of ports available on the platform. We set the nports parameter of platform_data based on IP version if it was not already provided.
--- drivers/mfd/omap-usb-host.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/mfd/omap-usb-host.c +1 -0
@@ -575,6 +575,7 @@ static int usbhs_omap_probe(struct platform_device *pdev) omap->usbhs_rev, omap->nports);break ; } + pdata->nports = omap->nports; } i =sizeof (struct clk *) * omap->nports;
Signature · 1 line
1.7.4.1
PATCH 2/6 mfd: omap-usb-host: Remove PHY reset handling code
In reply to Roger QuadrosPHY reset GPIO handling will be done in the PHY driver
--- drivers/mfd/omap-usb-host.c | 47 ------------------------------------------- 1 files changed, 0 insertions(+), 47 deletions(-)
drivers/mfd/omap-usb-host.c +0 -47
@@ -430,24 +430,10 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,static void omap_usbhs_init (struct device *dev) {struct usbhs_hcd_omap *omap =dev_get_drvdata (dev); -struct usbhs_omap_platform_data *pdata = omap->pdata;unsigned reg;dev_dbg (dev,"starting TI HSUSB Controller\n" ); -if (pdata->phy_reset) { -if (gpio_is_valid (pdata->reset_gpio_port[0 ])) -gpio_request_one (pdata->reset_gpio_port[0 ], -GPIOF_OUT_INIT_LOW ,"USB1 PHY reset" ); - -if (gpio_is_valid (pdata->reset_gpio_port[1 ])) -gpio_request_one (pdata->reset_gpio_port[1 ], -GPIOF_OUT_INIT_LOW ,"USB2 PHY reset" ); - -/* Hold the PHY in RESET for enough time till DIR is high */ -udelay (10 ); - } -pm_runtime_get_sync (dev); reg =usbhs_read (omap->uhh_base,OMAP_UHH_HOSTCONFIG );
@@ -476,37 +462,8 @@ static void omap_usbhs_init(struct device *dev)dev_dbg (dev,"UHH setup done, uhh_hostconfig=%x\n" , reg);pm_runtime_put_sync (dev); -if (pdata->phy_reset) { -/* Hold the PHY in RESET for enough time till -* PHY is settled and ready -*/ -udelay (10 ); - -if (gpio_is_valid (pdata->reset_gpio_port[0 ])) -gpio_set_value_cansleep - (pdata->reset_gpio_port[0 ],1 ); - -if (gpio_is_valid (pdata->reset_gpio_port[1 ])) -gpio_set_value_cansleep - (pdata->reset_gpio_port[1 ],1 ); - } -} - -static void omap_usbhs_deinit (struct device *dev) -{ -struct usbhs_hcd_omap *omap =dev_get_drvdata (dev); -struct usbhs_omap_platform_data *pdata = omap->pdata; - -if (pdata->phy_reset) { -if (gpio_is_valid (pdata->reset_gpio_port[0 ])) -gpio_free (pdata->reset_gpio_port[0 ]); - -if (gpio_is_valid (pdata->reset_gpio_port[1 ])) -gpio_free (pdata->reset_gpio_port[1 ]); - } } -/** * usbhs_omap_probe - initialize TI-based HCDs *
@@ -710,8 +667,6 @@ static int usbhs_omap_probe(struct platform_device *pdev)return 0 ; err_alloc: -omap_usbhs_deinit (&pdev->dev); -for (i =0 ; i < omap->nports; i++) {if (!IS_ERR (omap->utmi_clk[i]))clk_put (omap->utmi_clk[i]);
@@ -756,8 +711,6 @@ static int usbhs_omap_remove(struct platform_device *pdev)struct usbhs_hcd_omap *omap =platform_get_drvdata (pdev);int i; -omap_usbhs_deinit (&pdev->dev); -for (i =0 ; i < omap->nports; i++) {if (!IS_ERR (omap->utmi_clk[i]))clk_put (omap->utmi_clk[i]);
Signature · 1 line
1.7.4.1
PATCH 3/6 mfd: omap-usb-host: Actually update hostconfig
In reply to Roger QuadrosThe helper functions omap_usbhs_rev1_hostconfig() and omap_usbhs_rev2_hostconfig() don't write into the hostconfig register. Make sure that we write the return value into the hostconfig register.
--- drivers/mfd/omap-usb-host.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/mfd/omap-usb-host.c +3 -3
@@ -446,15 +446,15 @@ static void omap_usbhs_init(struct device *dev)switch (omap->usbhs_rev) {case OMAP_USBHS_REV1 : -omap_usbhs_rev1_hostconfig (omap, reg); + reg =omap_usbhs_rev1_hostconfig (omap, reg);break ;case OMAP_USBHS_REV2 : -omap_usbhs_rev2_hostconfig (omap, reg); + reg =omap_usbhs_rev2_hostconfig (omap, reg);break ;default :/* newer revisions */ -omap_usbhs_rev2_hostconfig (omap, reg); + reg =omap_usbhs_rev2_hostconfig (omap, reg);break ; }
Signature · 1 line
1.7.4.1
Re: [PATCH 3/6] mfd: omap-usb-host: Actually update hostconfig
Quoted 6 lines · Roger Quadros
The helper functions
omap_usbhs_rev1_hostconfig()andomap_usbhs_rev2_hostconfig()don't write into the hostconfig register. Make sure that we write the return value into the hostconfig register.Signed-off-by Roger Quadros <[email protected]>
makes sense :-)
Signature · 1 line
balbi
_______________________________________________
devicetree-discuss mailing list devicetree-discuss-uLR06cmDAlY/[email protected]
https://lists.ozlabs.org/listinfo/devicetree-discuss
PATCH 4/6 mfd: omap-usb-tll: move configuration code to omap_tll_init()
In reply to Roger QuadrosThis is because we want to get rid of platform_data usage from probe(). The only information we need is PORT_MODE, and this can be supplied to us by the user (i.e. omap-usb-host.c).
We also move channel clock management from runtime PM handlers into omap_tll_enable/disable().
--- drivers/mfd/omap-usb-host.c | 7 +- drivers/mfd/omap-usb-tll.c | 204 +++++++++++++++++++++---------------------- drivers/mfd/omap-usb.h | 5 +- 3 files changed, 107 insertions(+), 109 deletions(-)
drivers/mfd/omap-usb-host.c +5 -2
@@ -278,7 +278,7 @@ static int usbhs_runtime_resume(struct device *dev)dev_dbg (dev,"usbhs_runtime_resume\n" ); -omap_tll_enable (); +omap_tll_enable (pdata);if (!IS_ERR (omap->ehci_logic_fck))clk_enable (omap->ehci_logic_fck);
@@ -353,7 +353,7 @@ static int usbhs_runtime_suspend(struct device *dev)if (!IS_ERR (omap->ehci_logic_fck))clk_disable (omap->ehci_logic_fck); -omap_tll_disable (); +omap_tll_disable (pdata);return 0 ; }
@@ -499,6 +499,9 @@ static int usbhs_omap_probe(struct platform_device *pdev) omap->pdata = pdata; +/* Initialize the TLL subsystem */ +omap_tll_init (pdata); +pm_runtime_enable (dev);platform_set_drvdata (pdev, omap);
drivers/mfd/omap-usb-tll.c +99 -105
296 lines not on this page · raw message
drivers/mfd/omap-usb.h +3 -2
@@ -1,2 +1,3 @@ -extern int omap_tll_enable (void ); -extern int omap_tll_disable (void ); +extern int omap_tll_init (struct usbhs_omap_platform_data *pdata); +extern int omap_tll_enable (struct usbhs_omap_platform_data *pdata); +extern int omap_tll_disable (struct usbhs_omap_platform_data *pdata);
Signature · 1 line
1.7.4.1
PATCH 5/6 mfd: omap-usb-tll: Add device tree support and binding information
In reply to Roger QuadrosAllows the OMAP USB TLL module to be specified via device tree.
--- .../devicetree/bindings/mfd/omap-usb-tll.txt | 17 +++++++++++++++++ drivers/mfd/omap-usb-tll.c | 10 ++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-tll.txt
Documentation/devicetree/bindings/mfd/omap-usb-tll.txt new file +17 -0
@@ -0,0 +1,17 @@ +OMAP HS USB Host TLL (Transceiver-Less Interface) + +Required properties: + +- compatible : should be "ti,usbhs-tll" +- reg : should contain one register range i.e. start and length +- interrupts : should contain the TLL module's interrupt +- ti,hwmod : must contain "usb_tll_hs" + +Example: + + usbhstll: usbhstll@4a062000 { + compatible = "ti,usbhs-tll"; + reg = <0x4a062000 0x1000>; + interrupts = <78>; + ti,hwmods = "usb_tll_hs"; + };
drivers/mfd/omap-usb-tll.c +10 -0
@@ -28,6 +28,7 @@#include <linux/err.h> #include <linux/pm_runtime.h> #include <linux/platform_data/usb-omap.h> +#include <linux/of.h> #define USBTLL_DRIVER_NAME "usbhs_tll"
@@ -311,10 +312,18 @@ static int usbtll_omap_remove(struct platform_device *pdev)return 0 ; } +static const struct of_device_id usbtll_omap_dt_ids[] = { + { .compatible ="ti,usbhs-tll" }, + { } +}; + +MODULE_DEVICE_TABLE (of, usbtll_omap_dt_ids); +static struct platform_driver usbtll_omap_driver = { .driver = { .name = (char *)usbtll_driver_name, .owner =THIS_MODULE , + .of_match_table =of_match_ptr (usbtll_omap_dt_ids), }, .probe = usbtll_omap_probe, .remove = usbtll_omap_remove,
@@ -467,6 +476,7 @@ int omap_tll_disable(struct usbhs_omap_platform_data *pdata)EXPORT_SYMBOL_GPL (omap_tll_disable);MODULE_AUTHOR ("Keshava Munegowda <[email protected]>" ); +MODULE_AUTHOR ("Roger Quadros <[email protected]>" );MODULE_ALIAS ("platform:" USBHS_DRIVER_NAME );MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("usb tll driver for TI OMAP EHCI and OHCI controllers" );
Signature · 1 line
1.7.4.1
PATCH 6/6 mfd: omap-usb-host: Add device tree support and binding information
In reply to Roger QuadrosAllows the OMAP HS USB host controller to be specified via device tree.
--- .../devicetree/bindings/mfd/omap-usb-host.txt | 80 ++++++++++ drivers/mfd/omap-usb-host.c | 161 +++++++++++++++++++- 2 files changed, 235 insertions(+), 6 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt
Documentation/devicetree/bindings/mfd/omap-usb-host.txt new file +80 -0
@@ -0,0 +1,80 @@ +OMAP HS USB Host + +Required properties: + +- compatible: should be "ti,usbhs-host" +- reg: should contain one register range i.e. start and length +- ti,hwmods: must contain "usb_host_hs" + +Optional properties: + +- num-ports: number of USB ports. Usually this is automatically detected + from the IP's revision register but can be overridden by specifying + this property. A maximum of 3 ports are supported at the moment. + +- portN-mode: String specifying the port mode for port N, where N can be + from 1 to 3. If the port mode is not specified, that port is treated + as unused. When specified, it must be one of the following. + "ehci-phy", + "ehci-tll", + "ehci-hsic", + "ohci-phy-6pin-datse0", + "ohci-phy-6pin-dpdm", + "ohci-phy-3pin-datse0", + "ohci-phy-4pin-dpdm", + "ohci-tll-6pin-datse0", + "ohci-tll-6pin-dpdm", + "ohci-tll-3pin-datse0", + "ohci-tll-4pin-dpdm", + "ohci-tll-2pin-datse0", + "ohci-tll-2pin-dpdm", + +- single-ulpi-bypass: Must be present if the controller contains a single + ULPI bypass control bit. e.g. OMAP3 silicon <= ES2.1 + +Required properties if child node exists: + +- #address-cells: Must be 1 +- #size-cells: Must be 1 +- ranges: must be present + +Properties for children: + +The OMAP HS USB Host subsystem contains EHCI and OHCI controllers. +See Documentation/devicetree/bindings/usb/omap-ehci.txt and +omap3-ohci.txt + +Example for OMAP4: + +usbhshost: usbhshost@4a064000 { + compatible = "ti,usbhs-host"; + reg = <0x4a064000 0x800>; + ti,hwmods = "usb_host_hs"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + usbhsohci: ohci@4a064800 { + compatible = "ti,ohci-omap3", "usb-ohci"; + reg = <0x4a064800 0x400>; + interrupt-parent = <&gic>; + interrupts = <0 76 0x4>; + }; + + usbhsehci: ehci@4a064c00 { + compatible = "ti,ehci-omap", "usb-ehci"; + reg = <0x4a064c00 0x400>; + interrupt-parent = <&gic>; + interrupts = <0 77 0x4>; + }; +}; + +&usbhshost { + port1-mode = "ehci-phy"; + port2-mode = "ehci-tll"; + port3-mode = "ehci-phy"; +}; + +&usbhsehci { + phys = <&hsusb1_phy 0 &hsusb3_phy>; +};
drivers/mfd/omap-usb-host.c +155 -6
237 lines not on this page · raw message
Signature · 6 lines
1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Samuel,
I've rebased this now on top of 3.9-rc4. Please pull this into your next branch when appropriate. Thanks.
The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:
Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
are available in the git repository at:
git://github.com/rogerq/linux.git usbhost-mfd-next
Roger Quadros (5):
mfd: omap-usb-host: update nports in platform_data
mfd: omap-usb-host: Remove PHY reset handling code
mfd: omap-usb-tll: move configuration code to omap_tll_init()
mfd: omap-usb-tll: Add device tree support and binding information
mfd: omap-usb-host: Add device tree support and binding information
.../devicetree/bindings/mfd/omap-usb-host.txt | 80 ++++++++ .../devicetree/bindings/mfd/omap-usb-tll.txt | 17 ++ drivers/mfd/omap-usb-host.c | 200 ++++++++++++++----- drivers/mfd/omap-usb-tll.c | 214 ++++++++++---------- drivers/mfd/omap-usb.h | 5 +- 5 files changed, 362 insertions(+), 154 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-tll.txt
cheers,
-roger
Quoted 37 lines · Roger Quadros
Hi Samuel,
These patches implement device tree support for the OMAP High Speed USB Host subsystem. The corresponding EHCI & SoC patches will be sent separately and this set has no build dependencies with them.
Patch 3 is acutally a bug fix which should go into 3.9-rc. I've sent it separately to you before.
The following changes since commit
f6161aa153581da4a3867a2d1a7caf4be19b6ec9:Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)
are available in the git repository at:
git://github.com/rogerq/linux.gitusbhost-mfd-nextRoger Quadros (6):
mfd: omap-usb-host: update nports inplatform_data
mfd: omap-usb-host: Remove PHY reset handling code
mfd: omap-usb-host: Actually update hostconfig
mfd: omap-usb-tll: move configuration code toomap_tll_init()
mfd: omap-usb-tll: Add device tree support and binding information
mfd: omap-usb-host: Add device tree support and binding information.../devicetree/bindings/mfd/omap-usb-host.txt | 80 ++++++++ .../devicetree/bindings/mfd/omap-usb-tll.txt | 17 ++ drivers/mfd/omap-usb-host.c | 206 ++++++++++++++----- drivers/mfd/omap-usb-tll.c | 214 ++++++++++---------- drivers/mfd/omap-usb.h | 5 +- 5 files changed, 365 insertions(+), 157 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-tll.txt--
cheers,
-roger
Hi Roger,
Quoted 12 lines · Roger Quadros
Hi Samuel,
I've rebased this now on top of 3.9-rc4. Please pull this into your next branch when appropriate. Thanks.
The following changes since commit
8bb9660418e05bb1845ac1a2428444d78e322cc7:Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
are available in the git repository at:
git://github.com/rogerq/linux.gitusbhost-mfd-next
Quoted 6 lines
Roger Quadros (5):
mfd: omap-usb-host: update nports inplatform_data
mfd: omap-usb-host: Remove PHY reset handling code
mfd: omap-usb-tll: move configuration code toomap_tll_init()
mfd: omap-usb-tll: Add device tree support and binding information
mfd: omap-usb-host: Add device tree support and binding information
I had to apply them manually, as patches #2 and #5 do not apply. I am pushing #1, #3 and #4, please rebase 2 and 5 on top of mfd-next and resend them to me.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Samuel,
You had the conflicts because a patch [*] was introduced and is not required since the reset logic is being removed from the driver.
Anyways, I've rebased the 2 patches on top of mfd-next, so now it shouldn't matter.
cheers,
-roger
[*]
commit 71f4b9cdfccfb82cff702fe61f4ace97a1dfb0e0
Author: Jingoo Han <[email protected]> Date: Wed Feb 20 18:29:30 2013 +0900
mfd: omap-usb-host: Use devm_gpio_request_one()
PATCH 1/2 mfd: omap-usb-host: Remove PHY reset handling code
PHY reset GPIO handling will be done in the PHY driver
--- drivers/mfd/omap-usb-host.c | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-)
drivers/mfd/omap-usb-host.c +0 -23
@@ -430,24 +430,10 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,static void omap_usbhs_init (struct device *dev) {struct usbhs_hcd_omap *omap =dev_get_drvdata (dev); -struct usbhs_omap_platform_data *pdata = omap->pdata;unsigned reg;dev_dbg (dev,"starting TI HSUSB Controller\n" ); -if (pdata->phy_reset) { -if (gpio_is_valid (pdata->reset_gpio_port[0 ])) -devm_gpio_request_one (dev, pdata->reset_gpio_port[0 ], -GPIOF_OUT_INIT_LOW ,"USB1 PHY reset" ); - -if (gpio_is_valid (pdata->reset_gpio_port[1 ])) -devm_gpio_request_one (dev, pdata->reset_gpio_port[1 ], -GPIOF_OUT_INIT_LOW ,"USB2 PHY reset" ); - -/* Hold the PHY in RESET for enough time till DIR is high */ -udelay (10 ); - } -pm_runtime_get_sync (dev); reg =usbhs_read (omap->uhh_base,OMAP_UHH_HOSTCONFIG );
@@ -476,20 +462,6 @@ static void omap_usbhs_init(struct device *dev)dev_dbg (dev,"UHH setup done, uhh_hostconfig=%x\n" , reg);pm_runtime_put_sync (dev); -if (pdata->phy_reset) { -/* Hold the PHY in RESET for enough time till -* PHY is settled and ready -*/ -udelay (10 ); - -if (gpio_is_valid (pdata->reset_gpio_port[0 ])) -gpio_set_value_cansleep - (pdata->reset_gpio_port[0 ],1 );
PATCH 2/2 mfd: omap-usb-host: Add device tree support and binding information
In reply to Roger QuadrosAllows the OMAP HS USB host controller to be specified via device tree.
--- .../devicetree/bindings/mfd/omap-usb-host.txt | 80 ++++++++++ drivers/mfd/omap-usb-host.c | 161 +++++++++++++++++++- 2 files changed, 235 insertions(+), 6 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt
Documentation/devicetree/bindings/mfd/omap-usb-host.txt new file +80 -0
@@ -0,0 +1,80 @@ +OMAP HS USB Host + +Required properties: + +- compatible: should be "ti,usbhs-host" +- reg: should contain one register range i.e. start and length +- ti,hwmods: must contain "usb_host_hs" + +Optional properties: + +- num-ports: number of USB ports. Usually this is automatically detected + from the IP's revision register but can be overridden by specifying + this property. A maximum of 3 ports are supported at the moment. + +- portN-mode: String specifying the port mode for port N, where N can be + from 1 to 3. If the port mode is not specified, that port is treated + as unused. When specified, it must be one of the following. + "ehci-phy", + "ehci-tll", + "ehci-hsic", + "ohci-phy-6pin-datse0", + "ohci-phy-6pin-dpdm", + "ohci-phy-3pin-datse0", + "ohci-phy-4pin-dpdm", + "ohci-tll-6pin-datse0", + "ohci-tll-6pin-dpdm", + "ohci-tll-3pin-datse0", + "ohci-tll-4pin-dpdm", + "ohci-tll-2pin-datse0", + "ohci-tll-2pin-dpdm", + +- single-ulpi-bypass: Must be present if the controller contains a single + ULPI bypass control bit. e.g. OMAP3 silicon <= ES2.1 + +Required properties if child node exists: + +- #address-cells: Must be 1 +- #size-cells: Must be 1 +- ranges: must be present + +Properties for children: + +The OMAP HS USB Host subsystem contains EHCI and OHCI controllers. +See Documentation/devicetree/bindings/usb/omap-ehci.txt and +omap3-ohci.txt + +Example for OMAP4: + +usbhshost: usbhshost@4a064000 { + compatible = "ti,usbhs-host"; + reg = <0x4a064000 0x800>; + ti,hwmods = "usb_host_hs"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + usbhsohci: ohci@4a064800 { + compatible = "ti,ohci-omap3", "usb-ohci"; + reg = <0x4a064800 0x400>; + interrupt-parent = <&gic>; + interrupts = <0 76 0x4>; + }; + + usbhsehci: ehci@4a064c00 { + compatible = "ti,ehci-omap", "usb-ehci"; + reg = <0x4a064c00 0x400>; + interrupt-parent = <&gic>; + interrupts = <0 77 0x4>; + }; +}; + +&usbhshost { + port1-mode = "ehci-phy"; + port2-mode = "ehci-tll"; + port3-mode = "ehci-phy"; +}; + +&usbhsehci { + phys = <&hsusb1_phy 0 &hsusb3_phy>; +};
drivers/mfd/omap-usb-host.c +155 -6
237 lines not on this page · raw message
Signature · 1 line
1.7.4.1
Quoted 7 lines · Roger Quadros
Samuel,
You had the conflicts because a patch [*] was introduced and is not required since the reset logic is being removed from the driver.
Anyways, I've rebased the 2 patches on top of mfd-next, so now it shouldn't matter.
Both patches applied, thanks a lot.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/