Merge tag 'efi-2020-07-rc5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

Pull request for UEFI sub-system for efi-2020-07-rc5

Use correct printf code in efi_image_parse().
Add random number generation to HTML documentation.

diff --git a/Kconfig b/Kconfig
index 0e7ccc0b074cb0300d1e12018b2606d208e0851d..8f3fba085a71b075966769d07d84e47a70cb9016 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -146,7 +146,7 @@ config SYS_MALLOC_F_LEN
        default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
                           ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \
                           ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \
-                          ARCH_LS1046A)
+                          ARCH_LS1046A || ARCH_QEMU)
        default 0x400
        help
          Before relocation, memory is very limited on many platforms. Still,

diff --git a/arch/arm/dts/ca-presidio-engboard.dts b/arch/arm/dts/ca-presidio-engboard.dts
index c03dacc54a2aff316f8f9bce7035d577a7805d4c..40c93d70423bfefbe6a966c6240ad97a69ddc844 100644 (file)
--- a/arch/arm/dts/ca-presidio-engboard.dts
+++ b/arch/arm/dts/ca-presidio-engboard.dts
@@ -10,11 +10,9 @@
    #size-cells = <1>;
 
        mmc0: mmc@f4400000 {
-               compatible = "snps,dw-cortina";
+               compatible = "cortina,ca-mmc";
                reg = <0x0 0xf4400000 0x1000>;
                bus-width = <4>;
-               io_ds = <0x77>;
-               fifo-mode;
                sd_dll_ctrl = <0xf43200e8>;
                io_drv_ctrl = <0xf432004c>;
        };

diff --git a/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
index 7d9874cafa0bc63d7c6ebad28fab9d5fceabe199..d24f621cd66952063c1fc7b1b9c09087bb09fd2a 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
@@ -68,3 +68,7 @@
 &portc {
        bank-name = "portc";
 };
+
+&i2c0 {
+       i2c-scl-falling-time-ns = <300>;
+};

diff --git a/board/freescale/p1010rdb/README.P1010RDB-PA b/board/freescale/p1010rdb/README.P1010RDB-PA
index 46c61237c72790f11498e5039c4853d9ac71038a..0cb950d845e7e4e033091c92fd6be7f5b3ad44e9 100644 (file)
--- a/board/freescale/p1010rdb/README.P1010RDB-PA
+++ b/board/freescale/p1010rdb/README.P1010RDB-PA
@@ -88,7 +88,7 @@ Note: 1 stands for 'on', 0 stands for 'off'
 Setting of hwconfig
 ===================
 If FlexCAN or TDM is needed, please set "fsl_p1010mux:tdm_can=can" or
-"fsl_p1010mux:tdm_can=tdm" explicitly in u-booot prompt as below for example:
+"fsl_p1010mux:tdm_can=tdm" explicitly in u-boot prompt as below for example:
 setenv hwconfig "fsl_p1010mux:tdm_can=tdm;usb1:dr_mode=host,phy_type=utmi"
 By default, don't set fsl_p1010mux:tdm_can, in this case, spi chip selection
 is set to spi-flash instead of to SLIC/TDM/DAC and tdm_can_sel is set to TDM

diff --git a/cmd/mmc.c b/cmd/mmc.c
index 97e5d91859c9fc9e2ec200fcc128c4c0d1a4b5a6..1c252e050282403904d2be7bedb01f3b43d5b708 100644 (file)
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -1004,7 +1004,7 @@ U_BOOT_CMD(
        "mmc part - lists available partition on current mmc device\n"
        "mmc dev [dev] [part] - show or set current mmc device [partition]\n"
        "mmc list - lists available devices\n"
-       "mmc wp - power on write protect booot partitions\n"
+       "mmc wp - power on write protect boot partitions\n"
 #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
        "mmc hwpartition [args...] - does hardware partitioning\n"
        "  arguments (sizes in 512-byte blocks):\n"

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 3c4f057373fce6d4f89c9809c5012f55bd7d7fb9..8f56572c39a00c46be9861bfbfab23124f2157f0 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -727,6 +727,21 @@ config FSL_ESDHC
          This selects support for the eSDHC (Enhanced Secure Digital Host
          Controller) found on numerous Freescale/NXP SoCs.
 
+config FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND
+       bool "enable eSDHC workaround for 3.3v IO reliability issue"
+       depends on FSL_ESDHC && DM_MMC
+       default n
+       help
+         When eSDHC operates at 3.3v, damage can accumulate in an internal
+         level shifter at a higher than expected rate. The faster the interface
+         runs, the more damage accumulates. This issue now is found on LX2160A
+         eSDHC1 for only SD card. The hardware workaround is recommended to use
+         an on-board level shifter that is 1.8v on SoC side and 3.3v on SD card
+         side. For boards without hardware workaround, this option could be
+         enabled, ensuring 1.8v IO voltage and disabling eSDHC if no card.
+         This option assumes no hotplug, and u-boot has to make all the way to
+         to linux to use 1.8v UHS-I speed mode if has card.
+
 config FSL_ESDHC_IMX
        bool "Freescale/NXP i.MX eSDHC controller support"
        help

diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index acbc850fcb843afc5a2cd1dc45cc6784006a46cd..198c41f451feb90fe2d6ff93592a9e1cb6e247db 100644 (file)
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -19,6 +19,7 @@
 
 #define SD_CLK_SEL_200MHZ (0x2)
 #define SD_CLK_SEL_100MHZ (0x1)
+#define SD_CLK_SEL_50MHZ (0x0)
 
 #define IO_DRV_SD_DS_OFFSET (16)
 #define IO_DRV_SD_DS_MASK   (0xff << IO_DRV_SD_DS_OFFSET)
@@ -44,15 +45,11 @@ static void ca_dwmci_clksel(struct dwmci_host *host)
        struct ca_dwmmc_priv_data *priv = host->priv;
        u32 val = readl(priv->sd_dll_reg);
 
-       if (host->bus_hz >= 200000000) {
-               val &= ~SD_CLK_SEL_MASK;
+       val &= ~SD_CLK_SEL_MASK;
+       if (host->bus_hz >= 200000000)
                val |= SD_CLK_SEL_200MHZ;
-       } else if (host->bus_hz >= 100000000) {
-               val &= ~SD_CLK_SEL_MASK;
+       else if (host->bus_hz >= 100000000)
                val |= SD_CLK_SEL_100MHZ;
-       } else {
-               val &= ~SD_CLK_SEL_MASK;
-       }
 
        writel(val, priv->sd_dll_reg);
 }
@@ -77,14 +74,14 @@ unsigned int ca_dwmci_get_mmc_clock(struct dwmci_host *host, uint freq)
        u8 clk_div;
 
        switch (sd_clk_sel) {
-       case 2:
-               clk_div = 1;
+       case SD_CLK_SEL_50MHZ:
+               clk_div = 4;
                break;
-       case 1:
+       case SD_CLK_SEL_100MHZ:
                clk_div = 2;
                break;
        default:
-               clk_div = 4;
+               clk_div = 1;
        }
 
        return SD_SCLK_MAX / clk_div / (host->div + 1);
@@ -100,9 +97,6 @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
        host->dev_index = 0;
 
        host->buswidth = dev_read_u32_default(dev, "bus-width", 1);
-       if (host->buswidth != 1 && host->buswidth != 4)
-               return -EINVAL;
-
        host->bus_hz = dev_read_u32_default(dev, "max-frequency", 50000000);
        priv->ds = dev_read_u32_default(dev, "io_ds", 0x33);
        host->fifo_mode = dev_read_bool(dev, "fifo-mode");
@@ -118,10 +112,8 @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
                return -EINVAL;
 
        host->ioaddr = dev_read_addr_ptr(dev);
-       if (host->ioaddr == (void *)FDT_ADDR_T_NONE) {
-               printf("DWMMC: base address is invalid\n");
+       if (!host->ioaddr)
                return -EINVAL;
-       }
 
        host->priv = priv;
 
@@ -140,10 +132,8 @@ static int ca_dwmmc_probe(struct udevice *dev)
        memcpy(&ca_dwmci_dm_ops, &dm_dwmci_ops, sizeof(struct dm_mmc_ops));
 
        dwmci_setup_cfg(&plat->cfg, host, host->bus_hz, MIN_FREQ);
-       if (host->buswidth == 1) {
-               (&plat->cfg)->host_caps &= ~MMC_MODE_8BIT;
-               (&plat->cfg)->host_caps &= ~MMC_MODE_4BIT;
-       }
+       if (host->buswidth == 1)
+               (&plat->cfg)->host_caps &= ~(MMC_MODE_8BIT | MMC_MODE_4BIT);
 
        host->mmc = &plat->mmc;
        host->mmc->priv = &priv->host;
@@ -164,7 +154,7 @@ static int ca_dwmmc_bind(struct udevice *dev)
 }
 
 static const struct udevice_id ca_dwmmc_ids[] = {
-       { .compatible = "snps,dw-cortina" },
+       { .compatible = "cortina,ca-mmc" },
        { }
 };
 

diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index d5d955846cde964b028b2d1c24153dea13f34543..a4b923ab99f2d1719596aa9d5badb01d3457eb8f 100644 (file)
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc
- * Copyright 2019 NXP Semiconductors
+ * Copyright 2019-2020 NXP
  * Andy Fleming
  *
  * Based vaguely on the pxa mmc code:
@@ -630,16 +630,15 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
 static int esdhc_getcd_common(struct fsl_esdhc_priv *priv)
 {
        struct fsl_esdhc *regs = priv->esdhc_regs;
-       int timeout = 1000;
 
 #ifdef CONFIG_ESDHC_DETECT_QUIRK
        if (CONFIG_ESDHC_DETECT_QUIRK)
                return 1;
 #endif
-       while (!(esdhc_read32(&regs->prsstat) & PRSSTAT_CINS) && --timeout)
-               udelay(1000);
+       if (esdhc_read32(&regs->prsstat) & PRSSTAT_CINS)
+               return 1;
 
-       return timeout > 0;
+       return 0;
 }
 
 static void fsl_esdhc_get_cfg_common(struct fsl_esdhc_priv *priv,
@@ -724,13 +723,38 @@ __weak int esdhc_status_fixup(void *blob, const char *compat)
        return 0;
 }
 
+#ifdef CONFIG_FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND
+static int fsl_esdhc_get_cd(struct udevice *dev);
+
+static void esdhc_disable_for_no_card(void *blob)
+{
+       struct udevice *dev;
+
+       for (uclass_first_device(UCLASS_MMC, &dev);
+            dev;
+            uclass_next_device(&dev)) {
+               char esdhc_path[50];
+
+               if (fsl_esdhc_get_cd(dev))
+                       continue;
+
+               snprintf(esdhc_path, sizeof(esdhc_path), "/soc/esdhc@%lx",
+                        (unsigned long)dev_read_addr(dev));
+               do_fixup_by_path(blob, esdhc_path, "status", "disabled",
+                                sizeof("disabled"), 1);
+       }
+}
+#endif
+
 void fdt_fixup_esdhc(void *blob, bd_t *bd)
 {
        const char *compat = "fsl,esdhc";
 
        if (esdhc_status_fixup(blob, compat))
                return;
-
+#ifdef CONFIG_FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND
+       esdhc_disable_for_no_card(blob);
+#endif
        do_fixup_by_compat_u32(blob, compat, "clock-frequency",
                               gd->arch.sdhc_clk, 1);
 }
@@ -849,6 +873,7 @@ static int fsl_esdhc_probe(struct udevice *dev)
        struct fsl_esdhc_priv *priv = dev_get_priv(dev);
        fdt_addr_t addr;
        struct mmc *mmc;
+       int ret;
 
        addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
@@ -882,7 +907,15 @@ static int fsl_esdhc_probe(struct udevice *dev)
 
        upriv->mmc = mmc;
 
-       return esdhc_init_common(priv, mmc);
+       ret = esdhc_init_common(priv, mmc);
+       if (ret)
+               return ret;
+
+#ifdef CONFIG_FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND
+       if (!fsl_esdhc_get_cd(dev))
+               esdhc_setbits32(&priv->esdhc_regs->proctl, PROCTL_VOLT_SEL);
+#endif
+       return 0;
 }
 
 static int fsl_esdhc_get_cd(struct udevice *dev)

diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 588d6a9d7643d41a87c43287a537be135e50376c..f42e01843434127bca39026bff05e5e27f271a2c 100644 (file)
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -791,7 +791,7 @@ static int esdhc_set_voltage(struct mmc *mmc)
        switch (mmc->signal_voltage) {
        case MMC_SIGNAL_VOLTAGE_330:
                if (priv->vs18_enable)
-                       return -EIO;
+                       return -ENOTSUPP;
 #if CONFIG_IS_ENABLED(DM_REGULATOR)
                if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) {
                        ret = regulator_set_value(priv->vqmmc_dev, 3300000);
@@ -972,7 +972,8 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
        if (priv->signal_voltage != mmc->signal_voltage) {
                ret = esdhc_set_voltage(mmc);
                if (ret) {
-                       printf("esdhc_set_voltage error %d\n", ret);
+                       if (ret != -ENOTSUPP)
+                               printf("esdhc_set_voltage error %d\n", ret);
                        return ret;
                }
        }
@@ -1455,6 +1456,7 @@ static int fsl_esdhc_probe(struct udevice *dev)
        if (ret) {
                dev_dbg(dev, "no vqmmc-supply\n");
        } else {
+               priv->vqmmc_dev = vqmmc_dev;
                ret = regulator_set_enable(vqmmc_dev, true);
                if (ret) {
                        dev_err(dev, "fail to enable vqmmc-supply\n");

diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index 7dcb3171928c4d6b515f005e38f029848a73ac83..da679a572c23b0d1002c6aa87c371595dbe0e7ab 100644 (file)
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -466,9 +466,6 @@ static int regulator_pre_probe(struct udevice *dev)
            (uc_pdata->min_uA == uc_pdata->max_uA))
                uc_pdata->flags |= REGULATOR_FLAG_AUTOSET_UA;
 
-       if (uc_pdata->boot_on)
-               regulator_set_enable(dev, uc_pdata->boot_on);
-
        return 0;
 }
 

diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c
index 16d9412cd52d1f78c202404161815302be6e8e8d..4cfcc31298eadb03aaa41173b159e131c9ce391f 100644 (file)
--- a/drivers/power/regulator/regulator_common.c
+++ b/drivers/power/regulator/regulator_common.c
@@ -19,6 +19,8 @@ int regulator_common_ofdata_to_platdata(struct udevice *dev,
 
        if (!dev_read_bool(dev, "enable-active-high"))
                flags |= GPIOD_ACTIVE_LOW;
+       if (dev_read_bool(dev, "regulator-boot-on"))
+               flags |= GPIOD_IS_OUT_ACTIVE;
 
        /* Get optional enable GPIO desc */
        gpio = &dev_pdata->gpio;

diff --git a/drivers/usb/eth/r8152.h b/drivers/usb/eth/r8152.h
index c7f62b8b3ed0bdad57dc53e85288ed445faa67a9..10e0da8eb105ff1b16ceb1b39074781bd4a47b53 100644 (file)
--- a/drivers/usb/eth/r8152.h
+++ b/drivers/usb/eth/r8152.h
@@ -25,6 +25,7 @@
 #define PLA_BDC_CR             0xd1a0
 #define PLA_TEREDO_TIMER       0xd2cc
 #define PLA_REALWOW_TIMER      0xd2e8
+#define PLA_EXTRA_STATUS       0xd398
 #define PLA_LEDSEL             0xdd90
 #define PLA_LED_FEATURE                0xdd92
 #define PLA_PHYAR              0xde00
@@ -76,6 +77,7 @@
 #define USB_DEV_STAT           0xb808
 #define USB_CONNECT_TIMER      0xcbf8
 #define USB_BURST_SIZE         0xcfc0
+#define USB_FW_FIX_EN1         0xcfcc
 #define USB_USB_CTRL           0xd406
 #define USB_PHY_CTRL           0xd408
 #define USB_TX_AGG             0xd40a
@@ -285,6 +287,9 @@
 /* PLA_BOOT_CTRL */
 #define AUTOLOAD_DONE          0x0002
 
+/* PLA_EXTRA_STATUS */
+#define U3P3_CHECK_EN          BIT(7)
+
 /* USB_USB2PHY */
 #define USB2PHY_SUSPEND                0x0001
 #define USB2PHY_L1             0x0002
@@ -304,6 +309,9 @@
 #define STAT_SPEED_HIGH                0x0000
 #define STAT_SPEED_FULL                0x0002
 
+/* USB_FW_FIX_EN1 */
+#define FW_IP_RESET_EN         BIT(9)
+
 /* USB_TX_AGG */
 #define TX_AGG_MAX_THRESHOLD   0x03
 

diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c
index 3ebbd533cc0d791580ecd12a91c46d7edb746bdd..f953b0384b88b2799e979700f602304e784656d4 100644 (file)
--- a/drivers/usb/eth/r8152_fw.c
+++ b/drivers/usb/eth/r8152_fw.c
@@ -293,7 +293,7 @@ static u8 r8152b_pla_patch_a2[] = {
        0x00, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
 static u16 r8152b_pla_patch_a2_bp[] = {
-       0xfc28, 0x8000, 0xfc28, 0x17a5, 0xfc2a, 0x13ad,
+       0xfc26, 0x8000, 0xfc28, 0x17a5, 0xfc2a, 0x13ad,
        0xfc2c, 0x184d, 0xfc2e, 0x01e1 };
 
 static u16 r8153_ram_code_a[] = {
@@ -321,181 +321,150 @@ static u16 r8153_ram_code_a[] = {
        0xB438, 0x3591, 0xB436, 0xB820, 0xB438, 0x0210 };
 
 static u8 r8153_usb_patch_c[] = {
-       0x08, 0xe0, 0x0a, 0xe0, 0x14, 0xe0, 0x2e, 0xe0,
-       0x37, 0xe0, 0x3e, 0xe0, 0x6d, 0xe0, 0x78, 0xe0,
+       0x08, 0xe0, 0x0a, 0xe0, 0x14, 0xe0, 0x58, 0xe0,
+       0x64, 0xe0, 0x79, 0xe0, 0xab, 0xe0, 0xb6, 0xe0,
        0x02, 0xc5, 0x00, 0xbd, 0x38, 0x3b, 0xdb, 0x49,
        0x04, 0xf1, 0x06, 0xc3, 0x00, 0xbb, 0x5a, 0x02,
        0x05, 0xc4, 0x03, 0xc3, 0x00, 0xbb, 0xa4, 0x04,
-       0x7e, 0x02, 0x30, 0xd4, 0x30, 0x18, 0x18, 0xc1,
-       0x0c, 0xe8, 0x17, 0xc6, 0xc7, 0x65, 0xd0, 0x49,
+       0x7e, 0x02, 0x30, 0xd4, 0x65, 0xc6, 0x66, 0x61,
+       0x92, 0x49, 0x12, 0xf1, 0x3e, 0xc0, 0x02, 0x61,
+       0x97, 0x49, 0x05, 0xf0, 0x3c, 0xc0, 0x00, 0x61,
+       0x90, 0x49, 0x0a, 0xf1, 0xca, 0x63, 0xb0, 0x49,
+       0x09, 0xf1, 0xb1, 0x49, 0x05, 0xf0, 0x32, 0xc0,
+       0x00, 0x71, 0x9e, 0x49, 0x03, 0xf1, 0xb0, 0x48,
+       0x05, 0xe0, 0x30, 0x48, 0xda, 0x61, 0x10, 0x48,
+       0xda, 0x89, 0x4a, 0xc6, 0xc0, 0x60, 0x85, 0x49,
+       0x03, 0xf0, 0x31, 0x48, 0x04, 0xe0, 0xb1, 0x48,
+       0xb2, 0x48, 0x0f, 0xe0, 0x30, 0x18, 0x1b, 0xc1,
+       0x0f, 0xe8, 0x1a, 0xc6, 0xc7, 0x65, 0xd0, 0x49,
        0x05, 0xf0, 0x32, 0x48, 0x02, 0xc2, 0x00, 0xba,
        0x3e, 0x16, 0x02, 0xc2, 0x00, 0xba, 0x48, 0x16,
-       0x02, 0xb4, 0x09, 0xc2, 0x40, 0x99, 0x0e, 0x48,
-       0x42, 0x98, 0x42, 0x70, 0x8e, 0x49, 0xfe, 0xf1,
-       0x02, 0xb0, 0x80, 0xff, 0xc0, 0xd4, 0xe4, 0x40,
-       0x20, 0xd4, 0xb0, 0x49, 0x04, 0xf0, 0x30, 0x18,
-       0x06, 0xc1, 0xef, 0xef, 0xfa, 0xc7, 0x02, 0xc0,
-       0x00, 0xb8, 0xd0, 0x10, 0xe4, 0x4b, 0x07, 0xc3,
-       0x70, 0x61, 0x12, 0x48, 0x70, 0x89, 0x02, 0xc3,
-       0x00, 0xbb, 0x9c, 0x15, 0x20, 0xd4, 0x2b, 0xc5,
-       0xa0, 0x77, 0x00, 0x1c, 0xa0, 0x9c, 0x28, 0xc5,
-       0xa0, 0x64, 0xc0, 0x48, 0xc1, 0x48, 0xc2, 0x48,
-       0xa0, 0x8c, 0xb1, 0x64, 0xc0, 0x48, 0xb1, 0x8c,
-       0x20, 0xc5, 0xa0, 0x64, 0x40, 0x48, 0x41, 0x48,
-       0xc2, 0x48, 0xa0, 0x8c, 0x19, 0xc5, 0xa4, 0x64,
-       0x44, 0x48, 0xa4, 0x8c, 0xb1, 0x64, 0x40, 0x48,
-       0xb1, 0x8c, 0x14, 0xc4, 0x80, 0x73, 0x13, 0xc4,
-       0x82, 0x9b, 0x11, 0x1b, 0x80, 0x9b, 0x0c, 0xc5,
-       0xa0, 0x64, 0x40, 0x48, 0x41, 0x48, 0x42, 0x48,
-       0xa0, 0x8c, 0x05, 0xc5, 0xa0, 0x9f, 0x02, 0xc5,
-       0x00, 0xbd, 0x6c, 0x3a, 0x1e, 0xfc, 0x10, 0xd8,
-       0x86, 0xd4, 0xf8, 0xcb, 0x20, 0xe4, 0x0a, 0xc0,
-       0x16, 0x61, 0x91, 0x48, 0x16, 0x89, 0x07, 0xc0,
-       0x11, 0x19, 0x0c, 0x89, 0x02, 0xc1, 0x00, 0xb9,
-       0x02, 0x06, 0x00, 0xd4, 0x40, 0xb4, 0xfe, 0xc0,
-       0x16, 0x61, 0x91, 0x48, 0x16, 0x89, 0xfb, 0xc0,
-       0x11, 0x19, 0x0c, 0x89, 0x02, 0xc1, 0x00, 0xb9,
-       0xd2, 0x05, 0x00, 0x00 };
+       0x02, 0xc2, 0x00, 0xba, 0x4a, 0x16, 0x02, 0xb4,
+       0x09, 0xc2, 0x40, 0x99, 0x0e, 0x48, 0x42, 0x98,
+       0x42, 0x70, 0x8e, 0x49, 0xfe, 0xf1, 0x02, 0xb0,
+       0x80, 0xff, 0xc0, 0xd4, 0xe4, 0x40, 0x20, 0xd4,
+       0xca, 0xcf, 0x00, 0xcf, 0x3c, 0xe4, 0x0c, 0xc0,
+       0x00, 0x63, 0xb5, 0x49, 0x09, 0xc0, 0x30, 0x18,
+       0x06, 0xc1, 0xea, 0xef, 0xf5, 0xc7, 0x02, 0xc0,
+       0x00, 0xb8, 0xd0, 0x10, 0xe4, 0x4b, 0x00, 0xd8,
+       0x14, 0xc3, 0x60, 0x61, 0x90, 0x49, 0x06, 0xf0,
+       0x11, 0xc3, 0x70, 0x61, 0x12, 0x48, 0x70, 0x89,
+       0x08, 0xe0, 0x0a, 0xc6, 0xd4, 0x61, 0x93, 0x48,
+       0xd4, 0x89, 0x02, 0xc1, 0x00, 0xb9, 0x72, 0x17,
+       0x02, 0xc1, 0x00, 0xb9, 0x9c, 0x15, 0x00, 0xd8,
+       0xef, 0xcf, 0x20, 0xd4, 0x30, 0x18, 0xe7, 0xc1,
+       0xcb, 0xef, 0x2b, 0xc5, 0xa0, 0x77, 0x00, 0x1c,
+       0xa0, 0x9c, 0x28, 0xc5, 0xa0, 0x64, 0xc0, 0x48,
+       0xc1, 0x48, 0xc2, 0x48, 0xa0, 0x8c, 0xb1, 0x64,
+       0xc0, 0x48, 0xb1, 0x8c, 0x20, 0xc5, 0xa0, 0x64,
+       0x40, 0x48, 0x41, 0x48, 0xc2, 0x48, 0xa0, 0x8c,
+       0x19, 0xc5, 0xa4, 0x64, 0x44, 0x48, 0xa4, 0x8c,
+       0xb1, 0x64, 0x40, 0x48, 0xb1, 0x8c, 0x14, 0xc4,
+       0x80, 0x73, 0x13, 0xc4, 0x82, 0x9b, 0x11, 0x1b,
+       0x80, 0x9b, 0x0c, 0xc5, 0xa0, 0x64, 0x40, 0x48,
+       0x41, 0x48, 0x42, 0x48, 0xa0, 0x8c, 0x05, 0xc5,
+       0xa0, 0x9f, 0x02, 0xc5, 0x00, 0xbd, 0x6c, 0x3a,
+       0x1e, 0xfc, 0x10, 0xd8, 0x86, 0xd4, 0xf8, 0xcb,
+       0x20, 0xe4, 0x0a, 0xc0, 0x16, 0x61, 0x91, 0x48,
+       0x16, 0x89, 0x07, 0xc0, 0x11, 0x19, 0x0c, 0x89,
+       0x02, 0xc1, 0x00, 0xb9, 0x02, 0x06, 0x00, 0xd4,
+       0x40, 0xb4, 0xfe, 0xc0, 0x16, 0x61, 0x91, 0x48,
+       0x16, 0x89, 0xfb, 0xc0, 0x11, 0x19, 0x0c, 0x89,
+       0x02, 0xc1, 0x00, 0xb9, 0xd2, 0x05, 0x00, 0x00 };
 
 static u16 r8153_usb_patch_c_bp[] = {
-       0xfc26, 0xa000, 0xfc28, 0x3b34, 0xfc2a, 0x027c, 0xfc2c, 0x162c,
-       0xfc2e, 0x10ce, 0xfc30, 0x0000, 0xfc32, 0x3a28, 0xfc34, 0x05f8,
-       0xfc36, 0x05c8 };
+       0xfc26, 0xa000, 0xfc28, 0x3b34, 0xfc2a, 0x027c, 0xfc2c, 0x15de,
+       0xfc2e, 0x10ce, 0xfc30, 0x1adc, 0xfc32, 0x3a28, 0xfc34, 0x05f8,
+       0xfc36, 0x05c8, 0xfc38, 0x00f3 };
 
 static u8 r8153_pla_patch_c[] = {
-       0x08, 0xe0, 0xea, 0xe0, 0xf2, 0xe0, 0x04, 0xe1,
-       0x06, 0xe1, 0x08, 0xe1, 0x40, 0xe1, 0xf1, 0xe1,
-       0x14, 0xc2, 0x40, 0x73, 0xba, 0x48, 0x40, 0x9b,
-       0x11, 0xc2, 0x40, 0x73, 0xb0, 0x49, 0x17, 0xf0,
-       0xbf, 0x49, 0x03, 0xf1, 0x09, 0xc5, 0x00, 0xbd,
-       0xb1, 0x49, 0x11, 0xf0, 0xb1, 0x48, 0x40, 0x9b,
-       0x02, 0xc2, 0x00, 0xba, 0xde, 0x18, 0x00, 0xe0,
-       0x1e, 0xfc, 0xbc, 0xc0, 0xf0, 0xc0, 0xde, 0xe8,
-       0x00, 0x80, 0x00, 0x20, 0x2c, 0x75, 0xd4, 0x49,
-       0x12, 0xf1, 0x32, 0xe0, 0xf8, 0xc2, 0x46, 0x71,
-       0xf7, 0xc2, 0x40, 0x73, 0xbe, 0x49, 0x03, 0xf1,
-       0xf5, 0xc7, 0x02, 0xe0, 0xf2, 0xc7, 0x4f, 0x30,
-       0x26, 0x62, 0xa1, 0x49, 0xf0, 0xf1, 0x22, 0x72,
-       0xa0, 0x49, 0xed, 0xf1, 0x25, 0x25, 0x18, 0x1f,
-       0x97, 0x30, 0x91, 0x30, 0x36, 0x9a, 0x2c, 0x75,
-       0x3c, 0xc3, 0x60, 0x73, 0xb1, 0x49, 0x0d, 0xf1,
-       0xdc, 0x21, 0xbc, 0x25, 0x30, 0xc6, 0xc0, 0x77,
-       0x04, 0x13, 0x21, 0xf0, 0x03, 0x13, 0x22, 0xf0,
-       0x02, 0x13, 0x23, 0xf0, 0x01, 0x13, 0x24, 0xf0,
-       0x08, 0x13, 0x08, 0xf1, 0x2e, 0x73, 0xba, 0x21,
-       0xbd, 0x25, 0x05, 0x13, 0x03, 0xf1, 0x24, 0xc5,
-       0x00, 0xbd, 0xd4, 0x49, 0x03, 0xf1, 0x1c, 0xc5,
-       0x00, 0xbd, 0xc4, 0xc6, 0xc6, 0x67, 0x2e, 0x75,
-       0xd7, 0x22, 0xdd, 0x26, 0x05, 0x15, 0x1b, 0xf0,
-       0x14, 0xc6, 0x00, 0xbe, 0x13, 0xc5, 0x00, 0xbd,
-       0x12, 0xc5, 0x00, 0xbd, 0xf1, 0x49, 0xfb, 0xf1,
-       0xef, 0xe7, 0xf4, 0x49, 0xfa, 0xf1, 0xec, 0xe7,
-       0xf3, 0x49, 0xf7, 0xf1, 0xe9, 0xe7, 0xf2, 0x49,
-       0xf4, 0xf1, 0xe6, 0xe7, 0xb6, 0xc0, 0x50, 0x14,
-       0x90, 0x13, 0xbc, 0x13, 0xf2, 0x14, 0x00, 0xa0,
-       0xa0, 0xd1, 0x00, 0x00, 0xc0, 0x75, 0xd0, 0x49,
-       0x46, 0xf0, 0x26, 0x72, 0xa7, 0x49, 0x43, 0xf0,
-       0x22, 0x72, 0x25, 0x25, 0x20, 0x1f, 0x97, 0x30,
-       0x91, 0x30, 0x40, 0x73, 0xf3, 0xc4, 0x1c, 0x40,
-       0x04, 0xf0, 0xd7, 0x49, 0x05, 0xf1, 0x37, 0xe0,
-       0x53, 0x48, 0xc0, 0x9d, 0x08, 0x02, 0x40, 0x66,
-       0x64, 0x27, 0x06, 0x16, 0x30, 0xf1, 0x46, 0x63,
-       0x3b, 0x13, 0x2d, 0xf1, 0x34, 0x9b, 0x18, 0x1b,
-       0x93, 0x30, 0x2b, 0xc3, 0x10, 0x1c, 0x2b, 0xe8,
-       0x01, 0x14, 0x25, 0xf1, 0x00, 0x1d, 0x26, 0x1a,
-       0x8a, 0x30, 0x22, 0x73, 0xb5, 0x25, 0x0e, 0x0b,
-       0x00, 0x1c, 0x2c, 0xe8, 0x1f, 0xc7, 0x27, 0x40,
-       0x1a, 0xf1, 0x38, 0xe8, 0x32, 0x1f, 0x8f, 0x30,
-       0x08, 0x1b, 0x24, 0xe8, 0x36, 0x72, 0x46, 0x77,
-       0x00, 0x17, 0x0d, 0xf0, 0x13, 0xc3, 0x1f, 0x40,
-       0x03, 0xf1, 0x00, 0x1f, 0x46, 0x9f, 0x44, 0x77,
-       0x9f, 0x44, 0x5f, 0x44, 0x17, 0xe8, 0x0a, 0xc7,
-       0x27, 0x40, 0x05, 0xf1, 0x02, 0xc3, 0x00, 0xbb,
-       0xbe, 0x1a, 0x74, 0x14, 0xff, 0xc7, 0x00, 0xbf,
-       0xb8, 0xcd, 0xff, 0xff, 0x02, 0x0c, 0x54, 0xa5,
-       0xdc, 0xa5, 0x2f, 0x40, 0x05, 0xf1, 0x00, 0x14,
-       0xfa, 0xf1, 0x01, 0x1c, 0x02, 0xe0, 0x00, 0x1c,
-       0x80, 0xff, 0xb0, 0x49, 0x04, 0xf0, 0x01, 0x0b,
-       0xd3, 0xa1, 0x03, 0xe0, 0x02, 0x0b, 0xd3, 0xa5,
-       0x27, 0x31, 0x20, 0x37, 0x02, 0x0b, 0xd3, 0xa5,
-       0x27, 0x31, 0x20, 0x37, 0x00, 0x13, 0xfb, 0xf1,
-       0x80, 0xff, 0x22, 0x73, 0xb5, 0x25, 0x18, 0x1e,
-       0xde, 0x30, 0xd9, 0x30, 0x64, 0x72, 0x11, 0x1e,
-       0x68, 0x23, 0x16, 0x31, 0x80, 0xff, 0x08, 0xc2,
-       0x40, 0x73, 0x3a, 0x48, 0x40, 0x9b, 0x06, 0xff,
-       0x02, 0xc6, 0x00, 0xbe, 0xcc, 0x17, 0x1e, 0xfc,
-       0x2c, 0x75, 0xdc, 0x21, 0xbc, 0x25, 0x04, 0x13,
-       0x0b, 0xf0, 0x03, 0x13, 0x09, 0xf0, 0x02, 0x13,
-       0x07, 0xf0, 0x01, 0x13, 0x05, 0xf0, 0x08, 0x13,
-       0x03, 0xf0, 0x04, 0xc3, 0x00, 0xbb, 0x03, 0xc3,
-       0x00, 0xbb, 0x50, 0x17, 0x3a, 0x17, 0x02, 0xc6,
-       0x00, 0xbe, 0x00, 0x00, 0x02, 0xc6, 0x00, 0xbe,
-       0x00, 0x00, 0x33, 0xc5, 0xa0, 0x74, 0xc0, 0x49,
-       0x1f, 0xf0, 0x30, 0xc5, 0xa0, 0x73, 0x00, 0x13,
-       0x04, 0xf1, 0xa2, 0x73, 0x00, 0x13, 0x14, 0xf0,
-       0x28, 0xc5, 0xa0, 0x74, 0xc8, 0x49, 0x1b, 0xf1,
-       0x26, 0xc5, 0xa0, 0x76, 0xa2, 0x74, 0x01, 0x06,
-       0x20, 0x37, 0xa0, 0x9e, 0xa2, 0x9c, 0x1e, 0xc5,
-       0xa2, 0x73, 0x23, 0x40, 0x10, 0xf8, 0x04, 0xf3,
-       0xa0, 0x73, 0x33, 0x40, 0x0c, 0xf8, 0x15, 0xc5,
-       0xa0, 0x74, 0x41, 0x48, 0xa0, 0x9c, 0x14, 0xc5,
-       0xa0, 0x76, 0x62, 0x48, 0xe0, 0x48, 0xa0, 0x9e,
-       0x10, 0xc6, 0x00, 0xbe, 0x0a, 0xc5, 0xa0, 0x74,
-       0x48, 0x48, 0xa0, 0x9c, 0x0b, 0xc5, 0x20, 0x1e,
-       0xa0, 0x9e, 0xe5, 0x48, 0xa0, 0x9e, 0xf0, 0xe7,
-       0xbc, 0xc0, 0xc8, 0xd2, 0xcc, 0xd2, 0x28, 0xe4,
-       0xfa, 0x01, 0xf0, 0xc0, 0x18, 0x89, 0x00, 0x1d,
-       0x43, 0xc3, 0x62, 0x62, 0xa0, 0x49, 0x06, 0xf0,
-       0x41, 0xc0, 0x02, 0x71, 0x60, 0x99, 0x3f, 0xc1,
-       0x03, 0xe0, 0x3c, 0xc0, 0x3d, 0xc1, 0x02, 0x99,
-       0x00, 0x61, 0x67, 0x11, 0x3d, 0xf1, 0x69, 0x33,
-       0x34, 0xc0, 0x28, 0x40, 0xf7, 0xf1, 0x35, 0xc0,
-       0x00, 0x19, 0x81, 0x1b, 0x89, 0xe8, 0x32, 0xc0,
-       0x04, 0x1a, 0x84, 0x1b, 0x85, 0xe8, 0x7a, 0xe8,
-       0xa3, 0x49, 0xfe, 0xf0, 0x2c, 0xc0, 0x76, 0xe8,
-       0xa1, 0x48, 0x29, 0xc0, 0x84, 0x1b, 0x7c, 0xe8,
-       0x00, 0x1d, 0x69, 0x33, 0x00, 0x1e, 0x01, 0x06,
-       0xff, 0x18, 0x30, 0x40, 0xfd, 0xf1, 0x7f, 0xc0,
-       0x00, 0x76, 0x2e, 0x40, 0xf7, 0xf1, 0x21, 0x48,
-       0x1a, 0xc0, 0x84, 0x1b, 0x6d, 0xe8, 0x76, 0xc0,
-       0x61, 0xe8, 0xa1, 0x49, 0xfd, 0xf0, 0x12, 0xc0,
-       0x00, 0x1a, 0x84, 0x1b, 0x65, 0xe8, 0x5a, 0xe8,
-       0xa5, 0x49, 0xfe, 0xf0, 0x0a, 0xc0, 0x01, 0x19,
-       0x81, 0x1b, 0x5e, 0xe8, 0x48, 0xe0, 0x8c, 0xd3,
-       0xb8, 0x0b, 0x50, 0xe8, 0x83, 0x00, 0x82, 0x00,
-       0x20, 0xb4, 0x10, 0xd8, 0x84, 0xd4, 0xfa, 0xc0,
-       0x00, 0x61, 0x9c, 0x20, 0x9c, 0x24, 0x06, 0x11,
-       0x06, 0xf1, 0x5d, 0xc0, 0x00, 0x61, 0x11, 0x48,
-       0x00, 0x89, 0x35, 0xe0, 0x00, 0x11, 0x02, 0xf1,
-       0x03, 0xe0, 0x04, 0x11, 0x06, 0xf1, 0x53, 0xc0,
-       0x00, 0x61, 0x92, 0x48, 0x00, 0x89, 0x2b, 0xe0,
-       0x05, 0x11, 0x08, 0xf1, 0x4c, 0xc0, 0x00, 0x61,
-       0x91, 0x49, 0x04, 0xf0, 0x91, 0x48, 0x00, 0x89,
-       0x11, 0xe0, 0xdc, 0xc0, 0x00, 0x61, 0x98, 0x20,
-       0x98, 0x24, 0x25, 0x11, 0x1c, 0xf1, 0x40, 0xc0,
-       0x25, 0xe8, 0x95, 0x49, 0x18, 0xf0, 0xd2, 0xc0,
-       0x00, 0x61, 0x98, 0x20, 0x98, 0x24, 0x25, 0x11,
-       0x12, 0xf1, 0x35, 0xc0, 0x00, 0x61, 0x92, 0x49,
-       0x0e, 0xf1, 0x12, 0x48, 0x00, 0x89, 0x2d, 0xc0,
-       0x00, 0x19, 0x00, 0x89, 0x2b, 0xc0, 0x01, 0x89,
-       0x27, 0xc0, 0x10, 0xe8, 0x25, 0xc0, 0x12, 0x48,
-       0x81, 0x1b, 0x16, 0xe8, 0xb9, 0xc3, 0x62, 0x62,
-       0xa0, 0x49, 0x05, 0xf0, 0xb5, 0xc3, 0x60, 0x71,
-       0xb5, 0xc0, 0x02, 0x99, 0x02, 0xc0, 0x00, 0xb8,
-       0xd6, 0x07, 0x13, 0xc4, 0x84, 0x98, 0x00, 0x1b,
-       0x86, 0x8b, 0x86, 0x73, 0xbf, 0x49, 0xfe, 0xf1,
-       0x80, 0x71, 0x82, 0x72, 0x80, 0xff, 0x09, 0xc4,
-       0x84, 0x98, 0x80, 0x99, 0x82, 0x9a, 0x86, 0x8b,
-       0x86, 0x73, 0xbf, 0x49, 0xfe, 0xf1, 0x80, 0xff,
-       0x08, 0xea, 0x10, 0xd4, 0x88, 0xd3, 0x30, 0xd4,
-       0x10, 0xc0, 0x12, 0xe8, 0x8a, 0xd3, 0x00, 0xd8,
-       0x02, 0xc0, 0x00, 0xb8, 0xe0, 0x08, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+       0x5d, 0xe0, 0x07, 0xe0, 0x0f, 0xe0, 0x5a, 0xe0,
+       0x59, 0xe0, 0x1f, 0xe0, 0x57, 0xe0, 0x3e, 0xe1,
+       0x08, 0xc2, 0x40, 0x73, 0x3a, 0x48, 0x40, 0x9b,
+       0x06, 0xff, 0x02, 0xc6, 0x00, 0xbe, 0xcc, 0x17,
+       0x1e, 0xfc, 0x2c, 0x75, 0xdc, 0x21, 0xbc, 0x25,
+       0x04, 0x13, 0x0b, 0xf0, 0x03, 0x13, 0x09, 0xf0,
+       0x02, 0x13, 0x07, 0xf0, 0x01, 0x13, 0x05, 0xf0,
+       0x08, 0x13, 0x03, 0xf0, 0x04, 0xc3, 0x00, 0xbb,
+       0x03, 0xc3, 0x00, 0xbb, 0x50, 0x17, 0x3a, 0x17,
+       0x33, 0xc5, 0xa0, 0x74, 0xc0, 0x49, 0x1f, 0xf0,
+       0x30, 0xc5, 0xa0, 0x73, 0x00, 0x13, 0x04, 0xf1,
+       0xa2, 0x73, 0x00, 0x13, 0x14, 0xf0, 0x28, 0xc5,
+       0xa0, 0x74, 0xc8, 0x49, 0x1b, 0xf1, 0x26, 0xc5,
+       0xa0, 0x76, 0xa2, 0x74, 0x01, 0x06, 0x20, 0x37,
+       0xa0, 0x9e, 0xa2, 0x9c, 0x1e, 0xc5, 0xa2, 0x73,
+       0x23, 0x40, 0x10, 0xf8, 0x04, 0xf3, 0xa0, 0x73,
+       0x33, 0x40, 0x0c, 0xf8, 0x15, 0xc5, 0xa0, 0x74,
+       0x41, 0x48, 0xa0, 0x9c, 0x14, 0xc5, 0xa0, 0x76,
+       0x62, 0x48, 0xe0, 0x48, 0xa0, 0x9e, 0x10, 0xc6,
+       0x00, 0xbe, 0x0a, 0xc5, 0xa0, 0x74, 0x48, 0x48,
+       0xa0, 0x9c, 0x0b, 0xc5, 0x20, 0x1e, 0xa0, 0x9e,
+       0xe5, 0x48, 0xa0, 0x9e, 0xf0, 0xe7, 0xbc, 0xc0,
+       0xc8, 0xd2, 0xcc, 0xd2, 0x28, 0xe4, 0xfa, 0x01,
+       0xf0, 0xc0, 0x18, 0x89, 0x74, 0xc0, 0xcd, 0xe8,
+       0x80, 0x76, 0x00, 0x1d, 0x6e, 0xc3, 0x66, 0x62,
+       0xa0, 0x49, 0x06, 0xf0, 0x64, 0xc0, 0x02, 0x71,
+       0x60, 0x99, 0x62, 0xc1, 0x03, 0xe0, 0x5f, 0xc0,
+       0x60, 0xc1, 0x02, 0x99, 0x00, 0x61, 0x0f, 0x1b,
+       0x59, 0x41, 0x03, 0x13, 0x18, 0xf1, 0xe4, 0x49,
+       0x20, 0xf1, 0xe5, 0x49, 0x1e, 0xf0, 0x59, 0xc6,
+       0xd0, 0x73, 0xb7, 0x49, 0x08, 0xf0, 0x01, 0x0b,
+       0x80, 0x13, 0x03, 0xf0, 0xd0, 0x8b, 0x03, 0xe0,
+       0x3f, 0x48, 0xd0, 0x9b, 0x51, 0xc0, 0x10, 0x1a,
+       0x84, 0x1b, 0xb1, 0xe8, 0x4b, 0xc2, 0x40, 0x63,
+       0x30, 0x48, 0x0a, 0xe0, 0xe5, 0x49, 0x09, 0xf0,
+       0x47, 0xc0, 0x00, 0x1a, 0x84, 0x1b, 0xa7, 0xe8,
+       0x41, 0xc2, 0x40, 0x63, 0xb0, 0x48, 0x40, 0x8b,
+       0x67, 0x11, 0x3f, 0xf1, 0x69, 0x33, 0x32, 0xc0,
+       0x28, 0x40, 0xd2, 0xf1, 0x33, 0xc0, 0x00, 0x19,
+       0x81, 0x1b, 0x99, 0xe8, 0x30, 0xc0, 0x04, 0x1a,
+       0x84, 0x1b, 0x95, 0xe8, 0x8a, 0xe8, 0xa3, 0x49,
+       0xfe, 0xf0, 0x2a, 0xc0, 0x86, 0xe8, 0xa1, 0x48,
+       0x84, 0x1b, 0x8d, 0xe8, 0x00, 0x1d, 0x69, 0x33,
+       0x00, 0x1e, 0x01, 0x06, 0xff, 0x18, 0x30, 0x40,
+       0xfd, 0xf1, 0x1f, 0xc0, 0x00, 0x76, 0x2e, 0x40,
+       0xf7, 0xf1, 0x21, 0x48, 0x19, 0xc0, 0x84, 0x1b,
+       0x7e, 0xe8, 0x74, 0x08, 0x72, 0xe8, 0xa1, 0x49,
+       0xfd, 0xf0, 0x11, 0xc0, 0x00, 0x1a, 0x84, 0x1b,
+       0x76, 0xe8, 0x6b, 0xe8, 0xa5, 0x49, 0xfe, 0xf0,
+       0x09, 0xc0, 0x01, 0x19, 0x81, 0x1b, 0x6f, 0xe8,
+       0x5a, 0xe0, 0xb8, 0x0b, 0x50, 0xe8, 0x83, 0x00,
+       0x82, 0x00, 0x20, 0xb4, 0x10, 0xd8, 0x84, 0xd4,
+       0x88, 0xd3, 0x10, 0xe0, 0x00, 0xd8, 0x24, 0xd4,
+       0xf9, 0xc0, 0x57, 0xe8, 0x48, 0x33, 0xf3, 0xc0,
+       0x00, 0x61, 0x6a, 0xc0, 0x47, 0x11, 0x03, 0xf0,
+       0x57, 0x11, 0x05, 0xf1, 0x00, 0x61, 0x17, 0x48,
+       0x00, 0x89, 0x41, 0xe0, 0x9c, 0x20, 0x9c, 0x24,
+       0xd0, 0x49, 0x09, 0xf0, 0x04, 0x11, 0x07, 0xf1,
+       0x00, 0x61, 0x97, 0x49, 0x38, 0xf0, 0x97, 0x48,
+       0x00, 0x89, 0x2b, 0xe0, 0x00, 0x11, 0x05, 0xf1,
+       0x00, 0x61, 0x92, 0x48, 0x00, 0x89, 0x2f, 0xe0,
+       0x06, 0x11, 0x05, 0xf1, 0x00, 0x61, 0x11, 0x48,
+       0x00, 0x89, 0x29, 0xe0, 0x05, 0x11, 0x0f, 0xf1,
+       0x00, 0x61, 0x93, 0x49, 0x1a, 0xf1, 0x91, 0x49,
+       0x0a, 0xf0, 0x91, 0x48, 0x00, 0x89, 0x0f, 0xe0,
+       0xc6, 0xc0, 0x00, 0x61, 0x98, 0x20, 0x98, 0x24,
+       0x25, 0x11, 0x80, 0xff, 0xfa, 0xef, 0x17, 0xf1,
+       0x38, 0xc0, 0x1f, 0xe8, 0x95, 0x49, 0x13, 0xf0,
+       0xf4, 0xef, 0x11, 0xf1, 0x31, 0xc0, 0x00, 0x61,
+       0x92, 0x49, 0x0d, 0xf1, 0x12, 0x48, 0x00, 0x89,
+       0x29, 0xc0, 0x00, 0x19, 0x00, 0x89, 0x27, 0xc0,
+       0x01, 0x89, 0x23, 0xc0, 0x0e, 0xe8, 0x12, 0x48,
+       0x81, 0x1b, 0x15, 0xe8, 0xae, 0xc3, 0x66, 0x62,
+       0xa0, 0x49, 0x04, 0xf0, 0x64, 0x71, 0xa3, 0xc0,
+       0x02, 0x99, 0x02, 0xc0, 0x00, 0xb8, 0xd6, 0x07,
+       0x13, 0xc4, 0x84, 0x98, 0x00, 0x1b, 0x86, 0x8b,
+       0x86, 0x73, 0xbf, 0x49, 0xfe, 0xf1, 0x80, 0x71,
+       0x82, 0x72, 0x80, 0xff, 0x09, 0xc4, 0x84, 0x98,
+       0x80, 0x99, 0x82, 0x9a, 0x86, 0x8b, 0x86, 0x73,
+       0xbf, 0x49, 0xfe, 0xf1, 0x80, 0xff, 0x08, 0xea,
+       0x30, 0xd4, 0x10, 0xc0, 0x12, 0xe8, 0x8a, 0xd3,
+       0x00, 0xd8, 0x02, 0xc6, 0x00, 0xbe, 0xe0, 0x08 };
 
 static u16 r8153_pla_patch_c_bp[] = {
        0xfc26, 0x8000, 0xfc28, 0x1306, 0xfc2a, 0x17ca, 0xfc2c, 0x171e,
        0xfc2e, 0x0000, 0xfc30, 0x0000, 0xfc32, 0x01b4, 0xfc34, 0x07d4,
-       0xfc36, 0x0894, 0xfc38, 0x00e7 };
+       0xfc36, 0x0894, 0xfc38, 0x00e6 };
 
 static u16 r8153_ram_code_bc[] = {
        0xB436, 0xB820, 0xB438, 0x0290, 0xB436, 0xA012, 0xB438, 0x0000,
@@ -560,7 +529,7 @@ static u16 r8153_usb_patch_b_bp[] = {
 
 static u8 r8153_pla_patch_b[] = {
        0x08, 0xe0, 0xea, 0xe0, 0xf2, 0xe0, 0x04, 0xe1,
-       0x09, 0xe1, 0x0e, 0xe1, 0x46, 0xe1, 0xf3, 0xe1,
+       0x09, 0xe1, 0x0e, 0xe1, 0x46, 0xe1, 0xf7, 0xe1,
        0x14, 0xc2, 0x40, 0x73, 0xba, 0x48, 0x40, 0x9b,
        0x11, 0xc2, 0x40, 0x73, 0xb0, 0x49, 0x17, 0xf0,
        0xbf, 0x49, 0x03, 0xf1, 0x09, 0xc5, 0x00, 0xbd,
@@ -642,51 +611,51 @@ static u8 r8153_pla_patch_b[] = {
        0x0b, 0xc5, 0x20, 0x1e, 0xa0, 0x9e, 0xe5, 0x48,
        0xa0, 0x9e, 0xf0, 0xe7, 0xbc, 0xc0, 0xc8, 0xd2,
        0xcc, 0xd2, 0x28, 0xe4, 0xe6, 0x01, 0xf0, 0xc0,
-       0x18, 0x89, 0x00, 0x1d, 0x3c, 0xc3, 0x60, 0x71,
+       0x18, 0x89, 0x00, 0x1d, 0x3c, 0xc3, 0x64, 0x71,
        0x3c, 0xc0, 0x02, 0x99, 0x00, 0x61, 0x67, 0x11,
        0x3c, 0xf1, 0x69, 0x33, 0x35, 0xc0, 0x28, 0x40,
        0xf6, 0xf1, 0x34, 0xc0, 0x00, 0x19, 0x81, 0x1b,
-       0x8c, 0xe8, 0x31, 0xc0, 0x04, 0x1a, 0x84, 0x1b,
-       0x88, 0xe8, 0x7d, 0xe8, 0xa3, 0x49, 0xfe, 0xf0,
-       0x2b, 0xc0, 0x79, 0xe8, 0xa1, 0x48, 0x28, 0xc0,
-       0x84, 0x1b, 0x7f, 0xe8, 0x00, 0x1d, 0x69, 0x33,
+       0x91, 0xe8, 0x31, 0xc0, 0x04, 0x1a, 0x84, 0x1b,
+       0x8d, 0xe8, 0x82, 0xe8, 0xa3, 0x49, 0xfe, 0xf0,
+       0x2b, 0xc0, 0x7e, 0xe8, 0xa1, 0x48, 0x28, 0xc0,
+       0x84, 0x1b, 0x84, 0xe8, 0x00, 0x1d, 0x69, 0x33,
        0x00, 0x1e, 0x01, 0x06, 0xff, 0x18, 0x30, 0x40,
-       0xfd, 0xf1, 0x18, 0xc0, 0x00, 0x76, 0x2e, 0x40,
+       0xfd, 0xf1, 0x19, 0xc0, 0x00, 0x76, 0x2e, 0x40,
        0xf7, 0xf1, 0x21, 0x48, 0x19, 0xc0, 0x84, 0x1b,
-       0x70, 0xe8, 0x79, 0xc0, 0x64, 0xe8, 0xa1, 0x49,
+       0x75, 0xe8, 0x10, 0xc0, 0x69, 0xe8, 0xa1, 0x49,
        0xfd, 0xf0, 0x11, 0xc0, 0x00, 0x1a, 0x84, 0x1b,
-       0x68, 0xe8, 0x5d, 0xe8, 0xa5, 0x49, 0xfe, 0xf0,
-       0x09, 0xc0, 0x01, 0x19, 0x81, 0x1b, 0x61, 0xe8,
-       0x4f, 0xe0, 0x88, 0xd3, 0x8c, 0xd3, 0xb8, 0x0b,
+       0x6d, 0xe8, 0x62, 0xe8, 0xa5, 0x49, 0xfe, 0xf0,
+       0x09, 0xc0, 0x01, 0x19, 0x81, 0x1b, 0x66, 0xe8,
+       0x54, 0xe0, 0x10, 0xd4, 0x88, 0xd3, 0xb8, 0x0b,
        0x50, 0xe8, 0x20, 0xb4, 0x10, 0xd8, 0x84, 0xd4,
-       0xfc, 0xc0, 0x00, 0x61, 0x9c, 0x20, 0x9c, 0x24,
-       0x06, 0x11, 0x06, 0xf1, 0x60, 0xc0, 0x00, 0x61,
-       0x11, 0x48, 0x00, 0x89, 0x3d, 0xe0, 0x00, 0x11,
-       0x02, 0xf1, 0x03, 0xe0, 0x04, 0x11, 0x06, 0xf1,
-       0x56, 0xc0, 0x00, 0x61, 0x92, 0x48, 0x00, 0x89,
-       0x33, 0xe0, 0x05, 0x11, 0x08, 0xf1, 0x4f, 0xc0,
-       0x00, 0x61, 0x91, 0x49, 0x04, 0xf0, 0x91, 0x48,
-       0x00, 0x89, 0x11, 0xe0, 0xde, 0xc0, 0x00, 0x61,
-       0x98, 0x20, 0x98, 0x24, 0x25, 0x11, 0x24, 0xf1,
-       0x45, 0xc0, 0x29, 0xe8, 0x95, 0x49, 0x20, 0xf0,
-       0xd4, 0xc0, 0x00, 0x61, 0x98, 0x20, 0x98, 0x24,
-       0x25, 0x11, 0x1a, 0xf1, 0x38, 0xc0, 0x00, 0x61,
-       0x92, 0x49, 0x16, 0xf1, 0x12, 0x48, 0x00, 0x89,
-       0x30, 0xc0, 0x00, 0x19, 0x00, 0x89, 0x2e, 0xc0,
-       0x01, 0x89, 0x2e, 0xc0, 0x04, 0x19, 0x81, 0x1b,
-       0x1c, 0xe8, 0x2b, 0xc0, 0x14, 0x19, 0x81, 0x1b,
-       0x18, 0xe8, 0x22, 0xc0, 0x0c, 0xe8, 0x20, 0xc0,
-       0x12, 0x48, 0x81, 0x1b, 0x12, 0xe8, 0xb3, 0xc3,
-       0x62, 0x71, 0xb3, 0xc0, 0x02, 0x99, 0x02, 0xc0,
-       0x00, 0xb8, 0x96, 0x07, 0x13, 0xc4, 0x84, 0x98,
-       0x00, 0x1b, 0x86, 0x8b, 0x86, 0x73, 0xbf, 0x49,
-       0xfe, 0xf1, 0x80, 0x71, 0x82, 0x72, 0x80, 0xff,
-       0x09, 0xc4, 0x84, 0x98, 0x80, 0x99, 0x82, 0x9a,
-       0x86, 0x8b, 0x86, 0x73, 0xbf, 0x49, 0xfe, 0xf1,
-       0x80, 0xff, 0x08, 0xea, 0x10, 0xd4, 0x30, 0xd4,
+       0xfd, 0xc0, 0x52, 0xe8, 0x48, 0x33, 0xf9, 0xc0,
+       0x00, 0x61, 0x9c, 0x20, 0x9c, 0x24, 0xd0, 0x49,
+       0x04, 0xf0, 0x04, 0x11, 0x02, 0xf1, 0x03, 0xe0,
+       0x00, 0x11, 0x06, 0xf1, 0x5c, 0xc0, 0x00, 0x61,
+       0x92, 0x48, 0x00, 0x89, 0x3a, 0xe0, 0x06, 0x11,
+       0x06, 0xf1, 0x55, 0xc0, 0x00, 0x61, 0x11, 0x48,
+       0x00, 0x89, 0x33, 0xe0, 0x05, 0x11, 0x08, 0xf1,
+       0x4e, 0xc0, 0x00, 0x61, 0x91, 0x49, 0x04, 0xf0,
+       0x91, 0x48, 0x00, 0x89, 0x11, 0xe0, 0xd9, 0xc0,
+       0x00, 0x61, 0x98, 0x20, 0x98, 0x24, 0x25, 0x11,
+       0x24, 0xf1, 0x44, 0xc0, 0x29, 0xe8, 0x95, 0x49,
+       0x20, 0xf0, 0xcf, 0xc0, 0x00, 0x61, 0x98, 0x20,
+       0x98, 0x24, 0x25, 0x11, 0x1a, 0xf1, 0x37, 0xc0,
+       0x00, 0x61, 0x92, 0x49, 0x16, 0xf1, 0x12, 0x48,
+       0x00, 0x89, 0x2f, 0xc0, 0x00, 0x19, 0x00, 0x89,
+       0x2d, 0xc0, 0x01, 0x89, 0x2d, 0xc0, 0x04, 0x19,
+       0x81, 0x1b, 0x1c, 0xe8, 0x2a, 0xc0, 0x14, 0x19,
+       0x81, 0x1b, 0x18, 0xe8, 0x21, 0xc0, 0x0c, 0xe8,
+       0x1f, 0xc0, 0x12, 0x48, 0x81, 0x1b, 0x12, 0xe8,
+       0xae, 0xc3, 0x66, 0x71, 0xae, 0xc0, 0x02, 0x99,
+       0x02, 0xc0, 0x00, 0xb8, 0x96, 0x07, 0x13, 0xc4,
+       0x84, 0x98, 0x00, 0x1b, 0x86, 0x8b, 0x86, 0x73,
+       0xbf, 0x49, 0xfe, 0xf1, 0x80, 0x71, 0x82, 0x72,
+       0x80, 0xff, 0x09, 0xc4, 0x84, 0x98, 0x80, 0x99,
+       0x82, 0x9a, 0x86, 0x8b, 0x86, 0x73, 0xbf, 0x49,
+       0xfe, 0xf1, 0x80, 0xff, 0x08, 0xea, 0x30, 0xd4,
        0x10, 0xc0, 0x12, 0xe8, 0x8a, 0xd3, 0x28, 0xe4,
-       0x2c, 0xe4, 0x00, 0xd8, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+       0x2c, 0xe4, 0x00, 0xd8, 0x00, 0x00, 0x00, 0x00 };
 
 static u16 r8153_pla_patch_b_bp[] = {
        0xfc26, 0x8000, 0xfc28, 0x1154, 0xfc2a, 0x1606, 0xfc2c, 0x155a,
@@ -694,33 +663,71 @@ static u16 r8153_pla_patch_b_bp[] = {
        0xfc36, 0x0000, 0xfc38, 0x007f };
 
 static u16 r8153_ram_code_d[] = {
-       0xa436, 0xb820, 0xa438, 0x0290, 0xa436, 0xa012, 0xa438, 0x0000,
-       0xa436, 0xa014, 0xa438, 0x2c04, 0xb438, 0x2c07, 0xb438, 0x2c07,
-       0xb438, 0x2c07, 0xb438, 0xa240, 0xb438, 0xa104, 0xb438, 0x2944,
-       0xa436, 0xa01a, 0xa438, 0x0000, 0xa436, 0xa006, 0xa438, 0x0fff,
-       0xa436, 0xa004, 0xa438, 0x0fff, 0xa436, 0xa002, 0xa438, 0x0fff,
-       0xa436, 0xa000, 0xa438, 0x1943, 0xa436, 0xb820, 0xa438, 0x0210 };
+       0xB436, 0xB820, 0xB438, 0x0290, 0xB436, 0xA012, 0xB438, 0x0000,
+       0xB436, 0xA014, 0xB438, 0x2c04, 0xB438, 0x2c07, 0xB438, 0x2c07,
+       0xB438, 0x2c07, 0xB438, 0xa240, 0xB438, 0xa104, 0xB438, 0x2944,
+       0xB436, 0xA01A, 0xB438, 0x0000, 0xB436, 0xA006, 0xB438, 0x0fff,
+       0xB436, 0xA004, 0xB438, 0x0fff, 0xB436, 0xA002, 0xB438, 0x0fff,
+       0xB436, 0xA000, 0xB438, 0x1943, 0xB436, 0xB820, 0xB438, 0x0210 };
 
 static u8 usb_patch_d[] = {
-       0x08, 0xe0, 0x0a, 0xe0, 0x0c, 0xe0, 0x1f, 0xe0,
-       0x28, 0xe0, 0x2a, 0xe0, 0x2c, 0xe0, 0x2e, 0xe0,
-       0x02, 0xc5, 0x00, 0xbd, 0x00, 0x00, 0x02, 0xc3,
-       0x00, 0xbb, 0x00, 0x00, 0x30, 0x18, 0x11, 0xc1,
-       0x05, 0xe8, 0x10, 0xc6, 0x02, 0xc2, 0x00, 0xba,
-       0x94, 0x17, 0x02, 0xb4, 0x09, 0xc2, 0x40, 0x99,
-       0x0e, 0x48, 0x42, 0x98, 0x42, 0x70, 0x8e, 0x49,
-       0xfe, 0xf1, 0x02, 0xb0, 0x80, 0xff, 0xc0, 0xd4,
-       0xe4, 0x40, 0x20, 0xd4, 0xb0, 0x49, 0x04, 0xf0,
-       0x30, 0x18, 0x06, 0xc1, 0xef, 0xef, 0xfa, 0xc7,
-       0x02, 0xc0, 0x00, 0xb8, 0x38, 0x12, 0xe4, 0x4b,
-       0x02, 0xc3, 0x00, 0xbb, 0x00, 0x00, 0x02, 0xc5,
-       0x00, 0xbd, 0x00, 0x00, 0x02, 0xc1, 0x00, 0xb9,
-       0x00, 0x00, 0x02, 0xc1, 0x00, 0xb9, 0x00, 0x00 };
+       0x08, 0xe0, 0x0e, 0xe0, 0x11, 0xe0, 0x24, 0xe0,
+       0x2b, 0xe0, 0x33, 0xe0, 0x3a, 0xe0, 0x3c, 0xe0,
+       0x1e, 0xc3, 0x70, 0x61, 0x12, 0x48, 0x70, 0x89,
+       0x02, 0xc3, 0x00, 0xbb, 0x02, 0x17, 0x32, 0x19,
+       0x02, 0xc3, 0x00, 0xbb, 0x44, 0x14, 0x30, 0x18,
+       0x11, 0xc1, 0x05, 0xe8, 0x10, 0xc6, 0x02, 0xc2,
+       0x00, 0xba, 0x94, 0x17, 0x02, 0xb4, 0x09, 0xc2,
+       0x40, 0x99, 0x0e, 0x48, 0x42, 0x98, 0x42, 0x70,
+       0x8e, 0x49, 0xfe, 0xf1, 0x02, 0xb0, 0x80, 0xff,
+       0xc0, 0xd4, 0xe4, 0x40, 0x20, 0xd4, 0x30, 0x18,
+       0x06, 0xc1, 0xf1, 0xef, 0xfc, 0xc7, 0x02, 0xc0,
+       0x00, 0xb8, 0x38, 0x12, 0xe4, 0x4b, 0x0c, 0x61,
+       0x92, 0x48, 0x93, 0x48, 0x95, 0x48, 0x96, 0x48,
+       0x0c, 0x89, 0x02, 0xc0, 0x00, 0xb8, 0x0e, 0x06,
+       0x30, 0x18, 0xf5, 0xc1, 0xe0, 0xef, 0x04, 0xc5,
+       0x02, 0xc4, 0x00, 0xbc, 0x76, 0x3c, 0x1e, 0xfc,
+       0x02, 0xc6, 0x00, 0xbe, 0x00, 0x00, 0x02, 0xc6,
+       0x00, 0xbe, 0x00, 0x00 };
 
 static u16 r8153_usb_patch_d_bp[] = {
-       0xfc26, 0xa000, 0xfc28, 0x0000, 0xfc2a, 0x0000, 0xfc2c, 0x1792,
-       0xfc2e, 0x1236, 0xfc30, 0x0000, 0xfc32, 0x0000, 0xfc34, 0x0000,
-       0xfc36, 0x0000, 0xfc38, 0x000c };
+       0xfc26, 0xa000, 0xfc28, 0x16de, 0xfc2a, 0x1442, 0xfc2c, 0x1792,
+       0xfc2e, 0x1236, 0xfc30, 0x0606, 0xfc32, 0x3c74, 0xfc34, 0x0000,
+       0xfc36, 0x0000, 0xfc38, 0x003e };
+
+static u8 pla_patch_d[] = {
+       0x03, 0xe0, 0x16, 0xe0, 0x30, 0xe0, 0x12, 0xc2,
+       0x40, 0x73, 0xb0, 0x49, 0x08, 0xf0, 0xb8, 0x49,
+       0x06, 0xf0, 0xb8, 0x48, 0x40, 0x9b, 0x0b, 0xc2,
+       0x40, 0x76, 0x05, 0xe0, 0x02, 0x61, 0x02, 0xc3,
+       0x00, 0xbb, 0x54, 0x08, 0x02, 0xc3, 0x00, 0xbb,
+       0x64, 0x08, 0x98, 0xd3, 0x1e, 0xfc, 0xfe, 0xc0,
+       0x02, 0x62, 0xa0, 0x48, 0x02, 0x8a, 0x00, 0x72,
+       0xa0, 0x49, 0x11, 0xf0, 0x13, 0xc1, 0x20, 0x62,
+       0x2e, 0x21, 0x2f, 0x25, 0x00, 0x71, 0x9f, 0x24,
+       0x0a, 0x40, 0x09, 0xf0, 0x00, 0x71, 0x18, 0x48,
+       0xa0, 0x49, 0x03, 0xf1, 0x9f, 0x48, 0x02, 0xe0,
+       0x1f, 0x48, 0x00, 0x99, 0x02, 0xc2, 0x00, 0xba,
+       0xac, 0x0c, 0x08, 0xe9, 0x36, 0xc0, 0x00, 0x61,
+       0x9c, 0x20, 0x9c, 0x24, 0x33, 0xc0, 0x07, 0x11,
+       0x05, 0xf1, 0x00, 0x61, 0x17, 0x48, 0x00, 0x89,
+       0x0d, 0xe0, 0x04, 0x11, 0x0b, 0xf1, 0x00, 0x61,
+       0x97, 0x49, 0x08, 0xf0, 0x97, 0x48, 0x00, 0x89,
+       0x23, 0xc0, 0x0e, 0xe8, 0x12, 0x48, 0x81, 0x1b,
+       0x15, 0xe8, 0x1f, 0xc0, 0x00, 0x61, 0x67, 0x11,
+       0x04, 0xf0, 0x02, 0xc0, 0x00, 0xb8, 0x42, 0x09,
+       0x02, 0xc0, 0x00, 0xb8, 0x90, 0x08, 0x13, 0xc4,
+       0x84, 0x98, 0x00, 0x1b, 0x86, 0x8b, 0x86, 0x73,
+       0xbf, 0x49, 0xfe, 0xf1, 0x80, 0x71, 0x82, 0x72,
+       0x80, 0xff, 0x09, 0xc4, 0x84, 0x98, 0x80, 0x99,
+       0x82, 0x9a, 0x86, 0x8b, 0x86, 0x73, 0xbf, 0x49,
+       0xfe, 0xf1, 0x80, 0xff, 0x08, 0xea, 0x30, 0xd4,
+       0x50, 0xe8, 0x8a, 0xd3 };
+
+static u16 r8153_pla_patch_d_bp[] = {
+       0xfc26, 0x8000, 0xfc28, 0x0852, 0xfc2a, 0x0c92, 0xfc2c, 0x088c,
+       0xfc2e, 0x0000, 0xfc30, 0x0000, 0xfc32, 0x0000, 0xfc34, 0x0000,
+       0xfc36, 0x0000, 0xfc38, 0x0007 };
 
 static void rtl_clear_bp(struct r8152 *tp)
 {
@@ -956,10 +963,19 @@ void r8153_firmware(struct r8152 *tp)
 
                ocp_write_word(tp, MCU_TYPE_PLA, 0xd388, 0x08ca);
 
+               ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS,
+                              U3P3_CHECK_EN | 4);
+
                ocp_data = ocp_read_word(tp, MCU_TYPE_USB, 0xcfca);
                ocp_data |= 0x4000;
                ocp_write_word(tp, MCU_TYPE_USB, 0xcfca, ocp_data);
+
+               ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_USB2PHY);
+               ocp_data |= USB2PHY_L1 | USB2PHY_SUSPEND;
+               ocp_write_byte(tp, MCU_TYPE_USB, USB_USB2PHY, ocp_data);
        } else if (tp->version == RTL_VER_06) {
+               u32 ocp_data;
+
                r8153_pre_ram_code(tp, 0x7002);
 
                for (i = 0; i < ARRAY_SIZE(r8153_ram_code_d); i += 2)
@@ -979,5 +995,22 @@ void r8153_firmware(struct r8152 *tp)
                        ocp_write_word(tp, MCU_TYPE_USB,
                                       r8153_usb_patch_d_bp[i],
                                       r8153_usb_patch_d_bp[i+1]);
+
+               ocp_write_word(tp, MCU_TYPE_PLA, PLA_BP_EN, 0x0000);
+               generic_ocp_write(tp, 0xf800, 0xff, sizeof(pla_patch_d),
+                                 pla_patch_d, MCU_TYPE_PLA);
+
+               for (i = 0; i < ARRAY_SIZE(r8153_pla_patch_d_bp); i += 2)
+                       ocp_write_word(tp, MCU_TYPE_PLA,
+                                      r8153_pla_patch_d_bp[i],
+                                      r8153_pla_patch_d_bp[i + 1]);
+
+               ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_USB2PHY);
+               ocp_data |= USB2PHY_L1 | USB2PHY_SUSPEND;
+               ocp_write_byte(tp, MCU_TYPE_USB, USB_USB2PHY, ocp_data);
+
+               ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1);
+               ocp_data |= FW_IP_RESET_EN;
+               ocp_write_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1, ocp_data);
        }
 }

diff --git a/env/Kconfig b/env/Kconfig
index ca7fef682b72c233c6deb4cd53dc87d25041740a..38e7fadbb93a6aaedd05d6561909fdf78070ddfb 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -562,7 +562,7 @@ config ENV_UBI_VID_OFFSET
          UBI VID offset for environment. If 0, no custom VID offset is used.
 
 config SYS_RELOC_GD_ENV_ADDR
-       bool "Relocate gd->en_addr"
+       bool "Relocate gd->env_addr"
        help
          Relocate the early env_addr pointer so we know it is not inside
          the binary. Some systems need this and for the rest, it doesn't hurt.

diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index 8e8cd2cc1a555ef124c21b6778020e1c32ebd19b..e148eaa880477f0fc73794ad5ee26cdb477f6d4c 100644 (file)
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -4,6 +4,7 @@
  *-------------------------------------------------------------------
  *
  * Copyright 2007-2008,2010-2011 Freescale Semiconductor, Inc
+ * Copyright 2020 NXP
  */
 
 #ifndef  __FSL_ESDHC_H__
@@ -98,6 +99,7 @@
 #define PROCTL_DTW_4           0x00000002
 #define PROCTL_DTW_8           0x00000004
 #define PROCTL_D3CD            0x00000008
+#define PROCTL_VOLT_SEL                0x00000400
 
 #define CMDARG                 0x0002e008
 

diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index e59b5766e7283f8f6c17a114576cead82ef8a710..457d4cca8a0ad597f21314db1df3dacc581c1328 100644 (file)
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -156,8 +156,9 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob)
        /* optee inserts its memory regions as reserved-memory nodes */
        nodeoffset = fdt_subnode_offset(old_blob, 0, "reserved-memory");
        if (nodeoffset >= 0) {
-               subnode = fdt_first_subnode(old_blob, nodeoffset);
-               while (subnode >= 0) {
+               for (subnode = fdt_first_subnode(old_blob, nodeoffset);
+                    subnode >= 0;
+                    subnode = fdt_next_subnode(old_blob, subnode)) {
                        const char *name = fdt_get_name(old_blob,
                                                        subnode, NULL);
                        if (!name)
@@ -197,8 +198,6 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob)
                                if (ret < 0)
                                        return ret;
                        }
-
-                       subnode = fdt_next_subnode(old_blob, subnode);
                }
        }
 

diff --git a/lib/strto.c b/lib/strto.c
index 3d77115d4d813af05713380dafdccbc14aaf1804..c00bb5895df42b8a113e818c3e99290f4e142c20 100644 (file)
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -22,25 +22,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
                                *base = 16;
                        else
                                *base = 8;
-               } else {
-                       int i = 0;
-                       char var;
-
+               } else
                        *base = 10;
-
-                       do {
-                               var = tolower(s[i++]);
-                               if (var >= 'a' && var <= 'f') {
-                                       *base = 16;
-                                       break;
-                               }
-
-                               if (!(var >= '0' && var <= '9'))
-                                       break;
-                       } while (var);
-               }
        }
-
        if (*base == 16 && s[0] == '0' && tolower(s[1]) == 'x')
                s += 2;
        return s;