mtd: nand: pxa3xx: add support for 2KB 8-bit flash

[oweals/u-boot.git] / drivers / usb / host / ohci-lpc32xx.c

diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
index 2f2b4b90def72b4407d6a3a1fea238d6802a6431..34a4b00dda56ded00b9fd52bd2f047e91984a461 100644 (file)
--- a/drivers/usb/host/ohci-lpc32xx.c
+++ b/drivers/usb/host/ohci-lpc32xx.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2008 by NXP Semiconductors
  * @Author: Based on code by Kevin Wells
  * @Descr: USB driver - Embedded Artists LPC3250 OEM Board support functions
  *
  * Copyright (c) 2015 Tyco Fire Protection Products.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -143,8 +142,8 @@ static int usbpll_setup(void)
        setbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_POSTDIV_2POW(0x01));
        setbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_PLL_PWRUP);
 
-       ret = wait_for_bit(__func__, &clk_pwr->usb_ctrl, CLK_USBCTRL_PLL_STS,
-                          true, CONFIG_SYS_HZ, false);
+       ret = wait_for_bit_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_PLL_STS,
+                               true, CONFIG_SYS_HZ, false);
        if (ret)
                return ret;
 
@@ -178,8 +177,8 @@ int usb_cpu_init(void)
 
        /* enable I2C clock */
        writel(OTG_CLK_I2C_EN, &otg->otg_clk_ctrl);
-       ret = wait_for_bit(__func__, &otg->otg_clk_sts, OTG_CLK_I2C_EN, true,
-                          CONFIG_SYS_HZ, false);
+       ret = wait_for_bit_le32(&otg->otg_clk_sts, OTG_CLK_I2C_EN, true,
+                               CONFIG_SYS_HZ, false);
        if (ret)
                return ret;
 
@@ -199,8 +198,8 @@ int usb_cpu_init(void)
                         OTG_CLK_I2C_EN | OTG_CLK_HOST_EN;
        writel(mask, &otg->otg_clk_ctrl);
 
-       ret = wait_for_bit(__func__, &otg->otg_clk_sts, mask, true,
-                          CONFIG_SYS_HZ, false);
+       ret = wait_for_bit_le32(&otg->otg_clk_sts, mask, true,
+                               CONFIG_SYS_HZ, false);
        if (ret)
                return ret;