Merge git://git.denx.de/u-boot-sh
diff --git a/MAINTAINERS b/MAINTAINERS
index 9f653a0..60d4adf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -307,7 +307,7 @@
F: drivers/mtd/jedec_flash.c
COLDFIRE
-M: Huan Wang <alison.wang@freescale.com>
+M: Huan Wang <alison.wang@nxp.com>
M: Angelo Dureghello <angelo@sysam.it>
S: Maintained
T: git git://git.denx.de/u-boot-coldfire.git
diff --git a/board/freescale/bsc9131rdb/MAINTAINERS b/board/freescale/bsc9131rdb/MAINTAINERS
index 7cd8134..272d4ad 100644
--- a/board/freescale/bsc9131rdb/MAINTAINERS
+++ b/board/freescale/bsc9131rdb/MAINTAINERS
@@ -1,5 +1,5 @@
BSC9131RDB BOARD
-M: Poonam Aggrwal <poonam.aggrwal@freescale.com>
+M: Poonam Aggrwal <poonam.aggrwal@nxp.com>
S: Maintained
F: board/freescale/bsc9131rdb/
F: include/configs/BSC9131RDB.h
diff --git a/board/freescale/bsc9132qds/MAINTAINERS b/board/freescale/bsc9132qds/MAINTAINERS
index c58fc50..95abe3d 100644
--- a/board/freescale/bsc9132qds/MAINTAINERS
+++ b/board/freescale/bsc9132qds/MAINTAINERS
@@ -1,5 +1,5 @@
BSC9132QDS BOARD
-M: Naveen Burmi <NaveenBurmi@freescale.com>
+M: Naveen Burmi <naveen.burmi@nxp.com>
S: Maintained
F: board/freescale/bsc9132qds/
F: include/configs/BSC9132QDS.h
diff --git a/board/freescale/c29xpcie/MAINTAINERS b/board/freescale/c29xpcie/MAINTAINERS
index 3308839..44af12c 100644
--- a/board/freescale/c29xpcie/MAINTAINERS
+++ b/board/freescale/c29xpcie/MAINTAINERS
@@ -1,5 +1,5 @@
C29XPCIE BOARD
-M: Po Liu <po.liu@freescale.com>
+M: Po Liu <po.liu@nxp.com>
S: Maintained
F: board/freescale/c29xpcie/
F: include/configs/C29XPCIE.h
diff --git a/board/freescale/ls1021aqds/MAINTAINERS b/board/freescale/ls1021aqds/MAINTAINERS
index c37ab99..913d251 100644
--- a/board/freescale/ls1021aqds/MAINTAINERS
+++ b/board/freescale/ls1021aqds/MAINTAINERS
@@ -1,5 +1,5 @@
LS1021AQDS BOARD
-M: Alison Wang <alison.wang@freescale.com>
+M: Alison Wang <alison.wang@nxp.com>
S: Maintained
F: board/freescale/ls1021aqds/
F: include/configs/ls1021aqds.h
diff --git a/board/freescale/ls1021atwr/MAINTAINERS b/board/freescale/ls1021atwr/MAINTAINERS
index 06d888f..c8b93c6 100644
--- a/board/freescale/ls1021atwr/MAINTAINERS
+++ b/board/freescale/ls1021atwr/MAINTAINERS
@@ -1,5 +1,5 @@
LS1021ATWR BOARD
-M: Alison Wang <alison.wang@freescale.com>
+M: Alison Wang <alison.wang@nxp.com>
S: Maintained
F: board/freescale/ls1021atwr/
F: include/configs/ls1021atwr.h
diff --git a/board/freescale/ls1043aqds/MAINTAINERS b/board/freescale/ls1043aqds/MAINTAINERS
index 992c54c..3c8e8c2 100644
--- a/board/freescale/ls1043aqds/MAINTAINERS
+++ b/board/freescale/ls1043aqds/MAINTAINERS
@@ -1,5 +1,5 @@
LS1043AQDS BOARD
-M: Mingkai Hu <Mingkai.Hu@freescale.com>
+M: Mingkai Hu <mingkai.hu@nxp.com>
S: Maintained
F: board/freescale/ls1043aqds/
F: include/configs/ls1043aqds.h
diff --git a/board/freescale/ls1043ardb/MAINTAINERS b/board/freescale/ls1043ardb/MAINTAINERS
index 87aa006..88fe42e 100644
--- a/board/freescale/ls1043ardb/MAINTAINERS
+++ b/board/freescale/ls1043ardb/MAINTAINERS
@@ -1,5 +1,5 @@
LS1043A BOARD
-M: Mingkai Hu <Mingkai.hu@freescale.com>
+M: Mingkai Hu <mingkai.hu@nxp.com>
S: Maintained
F: board/freescale/ls1043ardb/
F: board/freescale/ls1043ardb/ls1043ardb.c
diff --git a/board/freescale/m52277evb/MAINTAINERS b/board/freescale/m52277evb/MAINTAINERS
index 390f041..a2a2176 100644
--- a/board/freescale/m52277evb/MAINTAINERS
+++ b/board/freescale/m52277evb/MAINTAINERS
@@ -1,5 +1,5 @@
M52277EVB BOARD
-M: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
S: Maintained
F: board/freescale/m52277evb/
F: include/configs/M52277EVB.h
diff --git a/board/freescale/m5235evb/MAINTAINERS b/board/freescale/m5235evb/MAINTAINERS
index f44422e..b15ac5f 100644
--- a/board/freescale/m5235evb/MAINTAINERS
+++ b/board/freescale/m5235evb/MAINTAINERS
@@ -1,5 +1,5 @@
M5235EVB BOARD
-M: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
S: Maintained
F: board/freescale/m5235evb/
F: include/configs/M5235EVB.h
diff --git a/board/freescale/m5253demo/MAINTAINERS b/board/freescale/m5253demo/MAINTAINERS
index abe065e..9b27f43 100644
--- a/board/freescale/m5253demo/MAINTAINERS
+++ b/board/freescale/m5253demo/MAINTAINERS
@@ -1,5 +1,5 @@
M5253DEMO BOARD
-M: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
S: Maintained
F: board/freescale/m5253demo/
F: include/configs/M5253DEMO.h
diff --git a/board/freescale/m53017evb/MAINTAINERS b/board/freescale/m53017evb/MAINTAINERS
index 700b6f7..ad5f0ce 100644
--- a/board/freescale/m53017evb/MAINTAINERS
+++ b/board/freescale/m53017evb/MAINTAINERS
@@ -1,5 +1,5 @@
M53017EVB BOARD
-M: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
S: Maintained
F: board/freescale/m53017evb/
F: include/configs/M53017EVB.h
diff --git a/board/freescale/m5329evb/MAINTAINERS b/board/freescale/m5329evb/MAINTAINERS
index f4f103a..2f7dd2d 100644
--- a/board/freescale/m5329evb/MAINTAINERS
+++ b/board/freescale/m5329evb/MAINTAINERS
@@ -1,5 +1,5 @@
M5329EVB BOARD
-M: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
S: Maintained
F: board/freescale/m5329evb/
F: include/configs/M5329EVB.h
diff --git a/board/freescale/m5373evb/MAINTAINERS b/board/freescale/m5373evb/MAINTAINERS
index 5db0b34..acb7a43 100644
--- a/board/freescale/m5373evb/MAINTAINERS
+++ b/board/freescale/m5373evb/MAINTAINERS
@@ -1,5 +1,5 @@
M5373EVB BOARD
-M: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
S: Maintained
F: board/freescale/m5373evb/
F: include/configs/M5373EVB.h
diff --git a/board/freescale/m54455evb/MAINTAINERS b/board/freescale/m54455evb/MAINTAINERS
index 3788f5f..27ced3c 100644
--- a/board/freescale/m54455evb/MAINTAINERS
+++ b/board/freescale/m54455evb/MAINTAINERS
@@ -1,5 +1,5 @@
M54455EVB BOARD
-M: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
S: Maintained
F: board/freescale/m54455evb/
F: include/configs/M54455EVB.h
diff --git a/board/freescale/m547xevb/MAINTAINERS b/board/freescale/m547xevb/MAINTAINERS
index 9a8408d..0d821eb 100644
--- a/board/freescale/m547xevb/MAINTAINERS
+++ b/board/freescale/m547xevb/MAINTAINERS
@@ -1,5 +1,5 @@
M547XEVB BOARD
-M: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
S: Maintained
F: board/freescale/m547xevb/
F: include/configs/M5475EVB.h
diff --git a/board/freescale/m548xevb/MAINTAINERS b/board/freescale/m548xevb/MAINTAINERS
index 82ad9fd..4e642e6 100644
--- a/board/freescale/m548xevb/MAINTAINERS
+++ b/board/freescale/m548xevb/MAINTAINERS
@@ -1,5 +1,5 @@
M548XEVB BOARD
-M: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
S: Maintained
F: board/freescale/m548xevb/
F: include/configs/M5485EVB.h
diff --git a/board/freescale/mx53evk/MAINTAINERS b/board/freescale/mx53evk/MAINTAINERS
index 5c5f747..d511046 100644
--- a/board/freescale/mx53evk/MAINTAINERS
+++ b/board/freescale/mx53evk/MAINTAINERS
@@ -1,5 +1,5 @@
MX53EVK BOARD
-M: Jason Liu <r64343@freescale.com>
+M: Jason Liu <jason.hui.liu@nxp.com>
S: Maintained
F: board/freescale/mx53evk/
F: include/configs/mx53evk.h
diff --git a/board/freescale/mx53loco/MAINTAINERS b/board/freescale/mx53loco/MAINTAINERS
index 73b113e..b4bd1a1 100644
--- a/board/freescale/mx53loco/MAINTAINERS
+++ b/board/freescale/mx53loco/MAINTAINERS
@@ -1,5 +1,5 @@
MX53LOCO BOARD
-M: Jason Liu <r64343@freescale.com>
+M: Jason Liu <jason.hui.liu@nxp.com>
S: Maintained
F: board/freescale/mx53loco/
F: include/configs/mx53loco.h
diff --git a/board/freescale/t1040qds/MAINTAINERS b/board/freescale/t1040qds/MAINTAINERS
index fb3565a..1e276e3 100644
--- a/board/freescale/t1040qds/MAINTAINERS
+++ b/board/freescale/t1040qds/MAINTAINERS
@@ -1,5 +1,5 @@
T1040QDS BOARD
-M: Poonam Aggrwal <poonam.aggrwal@freescale.com>
+M: Poonam Aggrwal <poonam.aggrwal@nxp.com>
S: Maintained
F: board/freescale/t1040qds/
F: include/configs/T1040QDS.h
diff --git a/board/freescale/vf610twr/MAINTAINERS b/board/freescale/vf610twr/MAINTAINERS
index f2997f0..b2eef8e 100644
--- a/board/freescale/vf610twr/MAINTAINERS
+++ b/board/freescale/vf610twr/MAINTAINERS
@@ -1,5 +1,5 @@
VF610TWR BOARD
-M: Alison Wang <b18965@freescale.com>
+M: Alison Wang <alison.wang@nxp.com>
S: Maintained
F: board/freescale/vf610twr/
F: include/configs/vf610twr.h
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index a4eb351..862644b 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -93,6 +93,9 @@
struct udevice *dev;
int ret;
+#ifdef CONFIG_PMIC_S2MPS11
+ ret = pmic_get("s2mps11_pmic", &dev);
+#else
ret = pmic_get("max77686", &dev);
if (!ret) {
/* TODO(sjg@chromium.org): Move into the clock/pmic API */
@@ -112,6 +115,7 @@
s5m8767_enable_32khz_cp(dev);
#endif
}
+#endif /* CONFIG_PMIC_S2MPS11 */
if (ret == -ENODEV)
return 0;
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index f72b80c..fe7c0b3 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1689,7 +1689,7 @@
#if CONFIG_IS_ENABLED(MMC_WRITE)
err = sd_read_ssr(mmc);
- if (!err)
+ if (err)
pr_warn("unable to read ssr\n");
#endif
if (!err)
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index d31793a..1e5e8a6 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -462,7 +462,8 @@
else
ctrl &= ~SDHCI_CTRL_HISPD;
- if (host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)
+ if ((host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||
+ (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE))
ctrl &= ~SDHCI_CTRL_HISPD;
sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
@@ -602,6 +603,11 @@
cfg->host_caps &= ~MMC_MODE_8BIT;
}
+ if (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE) {
+ cfg->host_caps &= ~MMC_MODE_HS;
+ cfg->host_caps &= ~MMC_MODE_HS_52MHz;
+ }
+
if (host->host_caps)
cfg->host_caps |= host->host_caps;
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 9463a06..76fe97f 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -54,7 +54,7 @@
SDHCI_QUIRK_BROKEN_R1B;
#ifdef CONFIG_ZYNQ_HISPD_BROKEN
- host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT;
+ host->quirks |= SDHCI_QUIRK_BROKEN_HISPD_MODE;
#endif
host->max_clk = clock;
diff --git a/drivers/power/mfd/fg_max77693.c b/drivers/power/mfd/fg_max77693.c
index df15508..a140731 100644
--- a/drivers/power/mfd/fg_max77693.c
+++ b/drivers/power/mfd/fg_max77693.c
@@ -60,8 +60,6 @@
return ret;
max77693_get_vcell(&pb->bat->voltage_uV);
- if (ret)
- return ret;
return 0;
}
diff --git a/include/sdhci.h b/include/sdhci.h
index 7e84012..ed35f04 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -213,6 +213,12 @@
#define SDHCI_QUIRK_BROKEN_R1B (1 << 2)
#define SDHCI_QUIRK_NO_HISPD_BIT (1 << 3)
#define SDHCI_QUIRK_BROKEN_VOLTAGE (1 << 4)
+/*
+ * SDHCI_QUIRK_BROKEN_HISPD_MODE
+ * the hardware cannot operate correctly in high-speed mode,
+ * this quirk forces the sdhci host-controller to non high-speed mode
+ */
+#define SDHCI_QUIRK_BROKEN_HISPD_MODE BIT(5)
#define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6)
#define SDHCI_QUIRK_USE_WIDE8 (1 << 8)