diff options
| author | Sven Schwermer <sven@svenschwermer.de> | 2018-11-21 08:43:56 +0100 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2018-11-26 21:19:03 +0100 |
| commit | fd09c205fc57b90a782cac33449ef172575d0a8c (patch) | |
| tree | b23d462a78db88ec589c50d769fa6522b3f16c63 /drivers/usb/host/ehci-fsl.c | |
| parent | ab5817027f9b4fce25f5f2a3e20577ac55bbd7e0 (diff) | |
usb: s/CONFIG_DM_USB/CONFIG_IS_ENABLED(DM_USB)/
This allows to disable the USB driver model in SPL because it checks
the CONFIG_SPL_DM_USB variable for SPL builds. Nothing changes for
regular non-SPL builds.
Signed-off-by: Sven Schwermer <sven@svenschwermer.de>
Diffstat (limited to 'drivers/usb/host/ehci-fsl.c')
| -rw-r--r-- | drivers/usb/host/ehci-fsl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index a8fb2b8ac3..23e7e7125f 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) struct ehci_fsl_priv { struct ehci_ctrl ehci; fdt_addr_t hcd_base; @@ -34,7 +34,7 @@ struct ehci_fsl_priv { #endif static void set_txfifothresh(struct usb_ehci *, u32); -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) static int ehci_fsl_init(struct ehci_fsl_priv *priv, struct usb_ehci *ehci, struct ehci_hccr *hccr, struct ehci_hcor *hcor); #else @@ -54,7 +54,7 @@ static int usb_phy_clk_valid(struct usb_ehci *ehci) } } -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) static int ehci_fsl_ofdata_to_platdata(struct udevice *dev) { struct ehci_fsl_priv *priv = dev_get_priv(dev); @@ -183,7 +183,7 @@ int ehci_hcd_stop(int index) } #endif -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) static int ehci_fsl_init(struct ehci_fsl_priv *priv, struct usb_ehci *ehci, struct ehci_hccr *hccr, struct ehci_hcor *hcor) #else @@ -192,7 +192,7 @@ static int ehci_fsl_init(int index, struct usb_ehci *ehci, #endif { const char *phy_type = NULL; -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) size_t len; char current_usb_controller[5]; #endif @@ -218,7 +218,7 @@ static int ehci_fsl_init(int index, struct usb_ehci *ehci, out_be32(&ehci->snoop2, 0x80000000 | SNOOP_SIZE_2GB); /* Init phy */ -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) if (priv->phy_type) phy_type = priv->phy_type; #else |