dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-26 04:51:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

usb: Drop dm.h header file

Browse Source 
This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Also move the inline function out into a C file. We should not include C
code in headers.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2020-07-19 10:15:55 -06:00
committed by Tom Rini
parent 98eb4ce592
commit 161786259c
3 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/usb/musb-new/musb_uboot.c
View File

@@ -1,5 +1,6 @@
#include <common.h> #include <common.h>
#include <console.h> #include <console.h>
#include <dm.h>
#include <malloc.h> #include <malloc.h>
#include <watchdog.h> #include <watchdog.h>
#include <linux/delay.h> #include <linux/delay.h>
@@ -452,3 +453,39 @@ struct musb *musb_register(struct musb_hdrc_platform_data *plat, void *bdata,
return *musbp; return *musbp;
} }
#if CONFIG_IS_ENABLED(DM_USB)
struct usb_device *usb_dev_get_parent(struct usb_device *udev)
{
struct udevice *parent = udev->dev->parent;
/*
* When called from usb-uclass.c: usb_scan_device() udev->dev points
* to the parent udevice, not the actual udevice belonging to the
* udev as the device is not instantiated yet.
*
* If dev is an usb-bus, then we are called from usb_scan_device() for
* an usb-device plugged directly into the root port, return NULL.
*/
if (device_get_uclass_id(udev->dev) == UCLASS_USB)
return NULL;
/*
* If these 2 are not the same we are being called from
* usb_scan_device() and udev itself is the parent.
*/
if (dev_get_parent_priv(udev->dev) != udev)
return udev;
/* We are being called normally, use the parent pointer */
if (device_get_uclass_id(parent) == UCLASS_USB_HUB)
return dev_get_parent_priv(parent);
return NULL;
}
#else
struct usb_device *usb_dev_get_parent(struct usb_device *udev)
{
return udev->parent;
}
#endif

1
drivers/usb/musb-new/pic32.c
View File

@@ -10,6 +10,7 @@
*/ */
#include <common.h> #include <common.h>
#include <dm.h>
#include <dm/device_compat.h> #include <dm/device_compat.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/delay.h> #include <linux/delay.h>

45
drivers/usb/musb-new/usb-compat.h
View File

@@ -1,9 +1,10 @@
#ifndef __USB_COMPAT_H__ #ifndef __USB_COMPAT_H__
#define __USB_COMPAT_H__ #define __USB_COMPAT_H__
#include <dm.h>
#include "usb.h" #include "usb.h"
struct udevice;
struct usb_hcd { struct usb_hcd {
void *hcd_priv; void *hcd_priv;
}; };
@@ -67,40 +68,12 @@ static inline int usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd,
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(DM_USB) /**
static inline struct usb_device *usb_dev_get_parent(struct usb_device *udev) * usb_dev_get_parent() - Get the parent of a USB device
{ *
struct udevice *parent = udev->dev->parent; * @udev: USB struct containing information about the device
* @return associated device for which udev == dev_get_parent_priv(dev)
/* */
* When called from usb-uclass.c: usb_scan_device() udev->dev points struct usb_device *usb_dev_get_parent(struct usb_device *udev);
* to the parent udevice, not the actual udevice belonging to the
* udev as the device is not instantiated yet.
*
* If dev is an usb-bus, then we are called from usb_scan_device() for
* an usb-device plugged directly into the root port, return NULL.
*/
if (device_get_uclass_id(udev->dev) == UCLASS_USB)
return NULL;
/*
* If these 2 are not the same we are being called from
* usb_scan_device() and udev itself is the parent.
*/
if (dev_get_parent_priv(udev->dev) != udev)
return udev;
/* We are being called normally, use the parent pointer */
if (device_get_uclass_id(parent) == UCLASS_USB_HUB)
return dev_get_parent_priv(parent);
return NULL;
}
#else
static inline struct usb_device *usb_dev_get_parent(struct usb_device *dev)
{
return dev->parent;
}
#endif
#endif /* __USB_COMPAT_H__ */ #endif /* __USB_COMPAT_H__ */