usb: dwc3-omap: Minor fixes to get dt working
Subsystems (4)
PATCH 1/3 usb: dwc3-omap: Minor fixes to get dt working
Includes few minor fixes in dwc3-omap like populating the compatible string in a correct way, extracting the utmi-mode property properly and changing the index of get_irq since irq of core is removed from hwmod entry.
Also updated the documentation with dwc3-omap device tree binding information.
Signed-off-by Kishon Vijay Abraham I <[email protected]>
--- Documentation/devicetree/bindings/usb/omap-usb.txt | 28 ++++++++++++ drivers/usb/dwc3/dwc3-omap.c | 45 +++++++++----------- 2 files changed, 49 insertions(+), 24 deletions(-)
Documentation/devicetree/bindings/usb/omap-usb.txt +28 -0
@@ -41,6 +41,34 @@ Board specific device node entry power = <50>; }; +OMAP DWC3 GLUE + - compatible : Should be "ti,dwc3" + - ti,hwmods : Should be "usb_otg_ss" + - reg : Address and length of the register set for the device. + - interrupts : The irq number of this device that is used to interrupt the + MPU + - #address-cells, #size-cells : Must be present if the device has sub-nodes + - utmi-mode : controls the source of UTMI/PIPE status for VBUS and OTG ID. + It should be set to "1" for HW mode and "2" for SW mode. + - ranges: the child address space are mapped 1:1 onto the parent address space + +Sub-nodes: +The dwc3 core should be added as subnode to omap dwc3 glue. +- dwc3 : + The binding details of dwc3 can be found in: + Documentation/devicetree/bindings/usb/dwc3.txt + +omap_dwc3 { + compatible = "ti,dwc3"; + ti,hwmods = "usb_otg_ss"; + reg = <0x4a020000 0x1ff>; + interrupts = <0 93 4>; + #address-cells = <1>; + #size-cells = <1>; + utmi-mode = <2>; + ranges; +}; + OMAP CONTROL USB Required properties:
drivers/usb/dwc3/dwc3-omap.c +21 -24
77 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 2/3 usb: dwc3-omap: remove platform data associated with dwc3-omap
omap5 is not going to have support for non-dt boot making the platform data associated with dwc3 useless. Removed it here.
Signed-off-by Kishon Vijay Abraham I <[email protected]>
--- drivers/usb/dwc3/dwc3-omap.c | 24 ++++++++++-------------- include/linux/platform_data/dwc3-omap.h | 4 ---- 2 files changed, 10 insertions(+), 18 deletions(-)
drivers/usb/dwc3/dwc3-omap.c +10 -14
@@ -311,7 +311,6 @@ static int dwc3_omap_remove_core(struct device *dev, void *c)static int dwc3_omap_probe (struct platform_device *pdev) { -struct dwc3_omap_data *pdata = pdev->dev.platform_data;struct device_node *node = pdev->dev.of_node;struct dwc3_omap *omap;
@@ -328,6 +327,11 @@ static int dwc3_omap_probe(struct platform_device *pdev)void __iomem *base;void *context; +if (!node) { +dev_err (dev,"device node not found\n" ); +return -EINVAL ; + } + omap =devm_kzalloc (dev,sizeof (*omap),GFP_KERNEL );if (!omap) {dev_err (dev,"not enough memory\n" );
@@ -389,12 +393,7 @@ static int dwc3_omap_probe(struct platform_device *pdev) reg =dwc3_omap_readl (omap->base,USBOTGSS_UTMI_OTG_STATUS ); -if (node) -of_property_read_u32 (node,"utmi-mode" , &utmi_mode); -else if (pdata) - utmi_mode = pdata->utmi_mode; -else -dev_dbg (dev,"missing platform data\n" ); +of_property_read_u32 (node,"utmi-mode" , &utmi_mode);switch (utmi_mode) {case DWC3_OMAP_UTMI_MODE_SW :
@@ -437,13 +436,10 @@ static int dwc3_omap_probe(struct platform_device *pdev)dwc3_omap_writel (omap->base,USBOTGSS_IRQENABLE_SET_1 , reg); -if (node) { - ret =of_platform_populate (node,NULL ,NULL , dev); -if (ret) { -dev_err (&pdev->dev, -"failed to add create dwc3 core\n" ); -return ret; - } + ret =of_platform_populate (node,NULL ,NULL , dev); +if (ret) { +dev_err (&pdev->dev,"failed to create dwc3 core\n" ); +return ret; }return 0 ;
include/linux/platform_data/dwc3-omap.h +0 -4
@@ -41,7 +41,3 @@ enum dwc3_omap_utmi_mode {DWC3_OMAP_UTMI_MODE_HW , DWC3_OMAP_UTMI_MODE_SW, }; - -struct dwc3_omap_data { -enum dwc3_omap_utmi_mode utmi_mode; -};
Signature · 1 line
1.7.10.4
PATCH 3/3 usb: dwc3-omap: stop using nop-usb-xceiv
In reply to Kishon Vijay Abraham INow that we have drivers for omap-usb2 phy and omap-usb3 phy, stop using nop-usb-xceiv.
Signed-off-by Kishon Vijay Abraham I <[email protected]>
--- drivers/usb/dwc3/dwc3-omap.c | 67 ------------------------------------------ 1 file changed, 67 deletions(-)
drivers/usb/dwc3/dwc3-omap.c +0 -67
@@ -52,7 +52,6 @@#include <linux/of_platform.h> #include <linux/usb/otg.h> -#include <linux/usb/nop-usb-xceiv.h> #include "core.h"
@@ -119,8 +118,6 @@ struct dwc3_omap {/* device lock */ spinlock_t lock; -struct platform_device *usb2_phy; -struct platform_device *usb3_phy;struct device *dev;int irq;
@@ -195,60 +192,6 @@ void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status) }EXPORT_SYMBOL_GPL (dwc3_omap_mailbox); -static int dwc3_omap_register_phys (struct dwc3_omap *omap) -{ -struct nop_usb_xceiv_platform_data pdata; -struct platform_device *pdev; -int ret; - -memset (&pdata,0x00 ,sizeof (pdata)); - - pdev =platform_device_alloc ("nop_usb_xceiv" ,PLATFORM_DEVID_AUTO ); -if (!pdev) -return -ENOMEM ; - - omap->usb2_phy = pdev; - pdata.type =USB_PHY_TYPE_USB2 ; - - ret =platform_device_add_data (omap->usb2_phy, &pdata,sizeof (pdata)); -if (ret) - goto err1; - - pdev =platform_device_alloc ("nop_usb_xceiv" ,PLATFORM_DEVID_AUTO ); -if (!pdev) { - ret = -ENOMEM ; - goto err1; - } - - omap->usb3_phy = pdev; - pdata.type =USB_PHY_TYPE_USB3 ; - - ret =platform_device_add_data (omap->usb3_phy, &pdata,sizeof (pdata)); -if (ret) - goto err2; - - ret =platform_device_add (omap->usb2_phy); -if (ret) - goto err2; - - ret =platform_device_add (omap->usb3_phy); -if (ret) - goto err3; - -return 0 ; - -err3: -platform_device_del (omap->usb2_phy); - -err2: -platform_device_put (omap->usb3_phy); - -err1: -platform_device_put (omap->usb2_phy); - -return ret; -} -static irqreturn_t dwc3_omap_interrupt (int irq,void *_omap) {struct dwc3_omap *omap = _omap;
@@ -358,12 +301,6 @@ static int dwc3_omap_probe(struct platform_device *pdev)return -ENOMEM ; } - ret =dwc3_omap_register_phys (omap); -if (ret) { -dev_err (dev,"couldn't register PHYs\n" ); -return ret; - } - context =devm_kzalloc (dev,resource_size (res),GFP_KERNEL );if (!context) {dev_err (dev,"couldn't allocate dwc3 context memory\n" );
@@ -447,10 +384,6 @@ static int dwc3_omap_probe(struct platform_device *pdev)static int dwc3_omap_remove (struct platform_device *pdev) { -struct dwc3_omap *omap =platform_get_drvdata (pdev); - -platform_device_unregister (omap->usb2_phy); -platform_device_unregister (omap->usb3_phy);pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);device_for_each_child (&pdev->dev,NULL , dwc3_omap_remove_core);
Signature · 1 line
1.7.10.4