Merge git://git.denx.de/u-boot-mmc

8 files changed, 27 insertions, 326 deletions

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 4fa8dd83bb..3f15f85efd 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -124,6 +124,14 @@ config MMC_VERBOSE
 	  Enable the output of more information about the card such as the
 	  operating mode.
 
+config MMC_TRACE
+	bool "MMC debugging"
+	default n
+	help
+	  This is an option for use by developer. Enable MMC core debugging.
+
+	  If you need to see the MMC core message, say Y.
+
 config SPL_MMC_TINY
 	bool "Tiny MMC framework in SPL"
 	help
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 1a006fa95f..4528345c67 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -982,7 +982,7 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
 #endif
 
 	/* Set the initial clock speed */
-	mmc_set_clock(mmc, 400000, false);
+	mmc_set_clock(mmc, 400000, MMC_CLK_ENABLE);
 
 	/* Disable the BRR and BWR bits in IRQSTAT */
 	esdhc_clrbits32(&regs->irqstaten, IRQSTATEN_BRR | IRQSTATEN_BWR);
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 0aea4770c5..332f1e12a5 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -252,7 +252,7 @@ static int meson_mmc_probe(struct udevice *dev)
 	mmc->priv = pdata;
 	upriv->mmc = mmc;
 
-	mmc_set_clock(mmc, cfg->f_min, false);
+	mmc_set_clock(mmc, cfg->f_min, MMC_CLK_ENABLE);
 
 	/* reset all status bits */
 	meson_write(mmc, STATUS_MASK, MESON_SD_EMMC_STATUS);
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 01a02fba63..a08c69476c 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -529,7 +529,7 @@ static int mmc_switch_voltage(struct mmc *mmc, int signal_voltage)
 	 * During a signal voltage level switch, the clock must be gated
 	 * for 5 ms according to the SD spec
 	 */
-	mmc_set_clock(mmc, mmc->clock, true);
+	mmc_set_clock(mmc, mmc->clock, MMC_CLK_DISABLE);
 
 	err = mmc_set_signal_voltage(mmc, signal_voltage);
 	if (err)
@@ -537,7 +537,7 @@ static int mmc_switch_voltage(struct mmc *mmc, int signal_voltage)
 
 	/* Keep clock gated for at least 10 ms, though spec only says 5 ms */
 	mdelay(10);
-	mmc_set_clock(mmc, mmc->clock, false);
+	mmc_set_clock(mmc, mmc->clock, MMC_CLK_ENABLE);
 
 	/*
 	 * Failure to switch is indicated by the card holding
@@ -1506,6 +1506,8 @@ int mmc_set_clock(struct mmc *mmc, uint clock, bool disable)
 	mmc->clock = clock;
 	mmc->clk_disable = disable;
 
+	debug("clock is %s (%dHz)\n", disable ? "disabled" : "enabled", clock);
+
 	return mmc_set_ios(mmc);
 }
 
@@ -1672,7 +1674,8 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
 
 				/* configure the bus mode (host) */
 				mmc_select_mode(mmc, mwt->mode);
-				mmc_set_clock(mmc, mmc->tran_speed, false);
+				mmc_set_clock(mmc, mmc->tran_speed,
+						MMC_CLK_ENABLE);
 
 #ifdef MMC_SUPPORTS_TUNING
 				/* execute tuning if needed */
@@ -1697,7 +1700,8 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
 error:
 				/* revert to a safer bus speed */
 				mmc_select_mode(mmc, SD_LEGACY);
-				mmc_set_clock(mmc, mmc->tran_speed, false);
+				mmc_set_clock(mmc, mmc->tran_speed,
+						MMC_CLK_ENABLE);
 			}
 		}
 	}
@@ -1858,7 +1862,7 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
 		return -ENOTSUPP;
 	}
 
-	mmc_set_clock(mmc, mmc->legacy_speed, false);
+	mmc_set_clock(mmc, mmc->legacy_speed, MMC_CLK_ENABLE);
 
 	for_each_mmc_mode_by_pref(card_caps, mwt) {
 		for_each_supported_width(card_caps & mwt->widths,
@@ -1901,7 +1905,7 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
 
 			/* configure the bus mode (host) */
 			mmc_select_mode(mmc, mwt->mode);
-			mmc_set_clock(mmc, mmc->tran_speed, false);
+			mmc_set_clock(mmc, mmc->tran_speed, MMC_CLK_ENABLE);
 #ifdef MMC_SUPPORTS_TUNING
 
 			/* execute tuning if needed */
@@ -2426,7 +2430,7 @@ static void mmc_set_initial_state(struct mmc *mmc)
 
 	mmc_select_mode(mmc, MMC_LEGACY);
 	mmc_set_bus_width(mmc, 1);
-	mmc_set_clock(mmc, 0, false);
+	mmc_set_clock(mmc, 0, MMC_CLK_ENABLE);
 }
 
 static int mmc_power_on(struct mmc *mmc)
@@ -2446,7 +2450,7 @@ static int mmc_power_on(struct mmc *mmc)
 
 static int mmc_power_off(struct mmc *mmc)
 {
-	mmc_set_clock(mmc, 0, true);
+	mmc_set_clock(mmc, 0, MMC_CLK_DISABLE);
 #if CONFIG_IS_ENABLED(DM_MMC) && CONFIG_IS_ENABLED(DM_REGULATOR)
 	if (mmc->vmmc_supply) {
 		int ret = regulator_set_enable(mmc->vmmc_supply, false);
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index fa0e449b21..d0a0362d7e 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -123,7 +123,7 @@ static int socfpga_dwmmc_probe(struct udevice *dev)
 	upriv->mmc = host->mmc;
 	host->mmc->dev = dev;
 
-	return 0;
+	return dwmci_probe(dev);
 }
 
 static int socfpga_dwmmc_bind(struct udevice *dev)
diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 64382b9deb..85ab176c0a 100644
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -28,7 +28,6 @@ obj-$(CONFIG_POWER_MAX77696) += pmic_max77696.o
 obj-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
 obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
 obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
-obj-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
 obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
 obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o
 obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o
diff --git a/drivers/power/pmic/pmic_max77686.c b/drivers/power/pmic/pmic_max77686.c
deleted file mode 100644
index 8b3d3f44e5..0000000000
--- a/drivers/power/pmic/pmic_max77686.c
+++ /dev/null
@@ -1,303 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *  Copyright (C) 2012 Samsung Electronics
- *  Rajeshwari Shinde <rajeshwari.s@samsung.com>
- */
-
-#include <common.h>
-#include <fdtdec.h>
-#include <i2c.h>
-#include <power/pmic.h>
-#include <power/max77686_pmic.h>
-#include <errno.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static const char max77686_buck_addr[] = {
-	0xff, 0x10, 0x12, 0x1c, 0x26, 0x30, 0x32, 0x34, 0x36, 0x38
-};
-
-static unsigned int max77686_ldo_volt2hex(int ldo, ulong uV)
-{
-	unsigned int hex = 0;
-
-	switch (ldo) {
-	case 1:
-	case 2:
-	case 6:
-	case 7:
-	case 8:
-	case 15:
-		hex = (uV - 800000) / 25000;
-		break;
-	default:
-		hex = (uV - 800000) / 50000;
-	}
-
-	if (hex >= 0 && hex <= MAX77686_LDO_VOLT_MAX_HEX)
-		return hex;
-
-	debug("%s: %ld is wrong voltage value for LDO%d\n", __func__, uV, ldo);
-	return 0;
-}
-
-static int max77686_buck_volt2hex(int buck, ulong uV)
-{
-	int hex = 0;
-
-	if (buck < 5 || buck > 9) {
-		debug("%s: buck %d is not supported\n", __func__, buck);
-		return -EINVAL;
-	}
-
-	hex = (uV - 750000) / 50000;
-
-	if (hex >= 0 && hex <= MAX77686_BUCK_VOLT_MAX_HEX)
-		return hex;
-
-	debug("%s: %ld is wrong voltage value for BUCK%d\n",
-	      __func__, uV, buck);
-	return -EINVAL;
-}
-
-int max77686_set_ldo_voltage(struct pmic *p, int ldo, ulong uV)
-{
-	unsigned int val, ret, hex, adr;
-
-	if (ldo < 1 || ldo > 26) {
-		printf("%s: %d is wrong ldo number\n", __func__, ldo);
-		return -EINVAL;
-	}
-
-	adr = MAX77686_REG_PMIC_LDO1CTRL1 + ldo - 1;
-	hex = max77686_ldo_volt2hex(ldo, uV);
-
-	if (!hex)
-		return -EINVAL;
-
-	ret = pmic_reg_read(p, adr, &val);
-	if (ret)
-		return ret;
-
-	val &= ~MAX77686_LDO_VOLT_MASK;
-	val |= hex;
-	ret |= pmic_reg_write(p, adr, val);
-
-	return ret;
-}
-
-int max77686_set_buck_voltage(struct pmic *p, int buck, ulong uV)
-{
-	unsigned int val, adr;
-	int hex, ret;
-
-	if (buck < 5 || buck > 9) {
-		printf("%s: %d is an unsupported bucket number\n",
-		       __func__, buck);
-		return -EINVAL;
-	}
-
-	adr = max77686_buck_addr[buck] + 1;
-	hex = max77686_buck_volt2hex(buck, uV);
-
-	if (hex < 0)
-		return hex;
-
-	ret = pmic_reg_read(p, adr, &val);
-	if (ret)
-		return ret;
-
-	val &= ~MAX77686_BUCK_VOLT_MASK;
-	ret |= pmic_reg_write(p, adr, val | hex);
-
-	return ret;
-}
-
-int max77686_set_ldo_mode(struct pmic *p, int ldo, char opmode)
-{
-	unsigned int val, ret, adr, mode;
-
-	if (ldo < 1 || 26 < ldo) {
-		printf("%s: %d is wrong ldo number\n", __func__, ldo);
-		return -EINVAL;
-	}
-
-	adr = MAX77686_REG_PMIC_LDO1CTRL1 + ldo - 1;
-
-	/* mode */
-	switch (opmode) {
-	case OPMODE_OFF:
-		mode = MAX77686_LDO_MODE_OFF;
-		break;
-	case OPMODE_STANDBY:
-		switch (ldo) {
-		case 2:
-		case 6:
-		case 7:
-		case 8:
-		case 10:
-		case 11:
-		case 12:
-		case 14:
-		case 15:
-		case 16:
-			mode = MAX77686_LDO_MODE_STANDBY;
-			break;
-		default:
-			mode = 0xff;
-		}
-		break;
-	case OPMODE_LPM:
-		mode = MAX77686_LDO_MODE_LPM;
-		break;
-	case OPMODE_ON:
-		mode = MAX77686_LDO_MODE_ON;
-		break;
-	default:
-		mode = 0xff;
-	}
-
-	if (mode == 0xff) {
-		printf("%s: %d is not supported on LDO%d\n",
-		       __func__, opmode, ldo);
-		return -ENOTSUPP;
-	}
-
-	ret = pmic_reg_read(p, adr, &val);
-	if (ret)
-		return ret;
-
-	val &= ~MAX77686_LDO_MODE_MASK;
-	val |= mode;
-	ret |= pmic_reg_write(p, adr, val);
-
-	return ret;
-}
-
-int max77686_set_buck_mode(struct pmic *p, int buck, char opmode)
-{
-	unsigned int val, ret, mask, adr, size, mode, mode_shift;
-
-	size = ARRAY_SIZE(max77686_buck_addr);
-	if (buck >= size) {
-		printf("%s: %d is wrong buck number\n", __func__, buck);
-		return -EINVAL;
-	}
-
-	adr = max77686_buck_addr[buck];
-
-	/* mask */
-	switch (buck) {
-	case 2:
-	case 3:
-	case 4:
-		mode_shift = MAX77686_BUCK_MODE_SHIFT_2;
-		break;
-	default:
-		mode_shift = MAX77686_BUCK_MODE_SHIFT_1;
-	}
-
-	mask = MAX77686_BUCK_MODE_MASK << mode_shift;
-
-	/* mode */
-	switch (opmode) {
-	case OPMODE_OFF:
-		mode = MAX77686_BUCK_MODE_OFF << mode_shift;
-		break;
-	case OPMODE_STANDBY:
-		switch (buck) {
-		case 1:
-		case 2:
-		case 3:
-		case 4:
-			mode = MAX77686_BUCK_MODE_STANDBY << mode_shift;
-			break;
-		default:
-			mode = 0xff;
-		}
-		break;
-	case OPMODE_LPM:
-		switch (buck) {
-		case 2:
-		case 3:
-		case 4:
-			mode = MAX77686_BUCK_MODE_LPM << mode_shift;
-			break;
-		default:
-			mode = 0xff;
-		}
-		break;
-	case OPMODE_ON:
-		mode = MAX77686_BUCK_MODE_ON << mode_shift;
-		break;
-	default:
-		mode = 0xff;
-	}
-
-	if (mode == 0xff) {
-		printf("%s: %d is not supported on BUCK%d\n",
-		       __func__, opmode, buck);
-		return -ENOTSUPP;
-	}
-
-	ret = pmic_reg_read(p, adr, &val);
-	if (ret)
-		return ret;
-
-	val &= ~mask;
-	val |= mode;
-	ret |= pmic_reg_write(p, adr, val);
-
-	return ret;
-}
-
-int pmic_init(unsigned char bus)
-{
-	static const char name[] = "MAX77686_PMIC";
-	struct pmic *p = pmic_alloc();
-#if CONFIG_IS_ENABLED(OF_CONTROL)
-	const void *blob = gd->fdt_blob;
-	int node, parent, tmp;
-#endif
-
-	if (!p) {
-		printf("%s: POWER allocation error!\n", __func__);
-		return -ENOMEM;
-	}
-
-#if CONFIG_IS_ENABLED(OF_CONTROL)
-	node = fdtdec_next_compatible(blob, 0, COMPAT_MAXIM_MAX77686_PMIC);
-	if (node < 0) {
-		debug("PMIC: No node for PMIC Chip in device tree\n");
-		debug("node = %d\n", node);
-		return -ENODEV;
-	}
-
-	parent = fdt_parent_offset(blob, node);
-	if (parent < 0) {
-		debug("%s: Cannot find node parent\n", __func__);
-		return -ENODEV;
-	}
-
-	/* tmp since p->bus is unsigned */
-	tmp = i2c_get_bus_num_fdt(parent);
-	if (tmp < 0) {
-		debug("%s: Cannot find I2C bus\n", __func__);
-		return -ENODEV;
-	}
-	p->bus = tmp;
-	p->hw.i2c.addr = fdtdec_get_int(blob, node, "reg", 9);
-#else
-	p->bus = bus;
-	p->hw.i2c.addr = MAX77686_I2C_ADDR;
-#endif
-
-	p->name = name;
-	p->interface = PMIC_I2C;
-	p->number_of_regs = MAX77686_NUM_OF_REGS;
-	p->hw.i2c.tx_num = 1;
-
-	puts("Board PMIC init\n");
-
-	return 0;
-}
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index f353c38a04..cd05c9b603 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -12,9 +12,6 @@
 #include <errno.h>
 #include <pwm.h>
 #include <power/regulator.h>
-#include <linux/libfdt.h>
-#include <fdt_support.h>
-#include <fdtdec.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -93,13 +90,10 @@ static int pwm_regulator_set_voltage(struct udevice *dev, int uvolt)
 static int pwm_regulator_ofdata_to_platdata(struct udevice *dev)
 {
 	struct pwm_regulator_info *priv = dev_get_priv(dev);
-	struct fdtdec_phandle_args args;
-	const void *blob = gd->fdt_blob;
-	int node = dev_of_offset(dev);
+	struct ofnode_phandle_args args;
 	int ret;
 
-	ret = fdtdec_parse_phandle_with_args(blob, node, "pwms", "#pwm-cells",
-					     0, 0, &args);
+	ret = dev_read_phandle_with_args(dev, "pwms", "#pwm-cells", 0, 0, &args);
 	if (ret) {
 		debug("%s: Cannot get PWM phandle: ret=%d\n", __func__, ret);
 		return ret;
@@ -108,14 +102,13 @@ static int pwm_regulator_ofdata_to_platdata(struct udevice *dev)
 	priv->period_ns = args.args[1];
 	priv->polarity = args.args[2];
 
-	priv->init_voltage = fdtdec_get_int(blob, node,
-			"regulator-init-microvolt", -1);
+	priv->init_voltage = dev_read_u32_default(dev, "regulator-init-microvolt", -1);
 	if (priv->init_voltage < 0) {
 		printf("Cannot find regulator pwm init_voltage\n");
 		return -EINVAL;
 	}
 
-	ret = uclass_get_device_by_of_offset(UCLASS_PWM, args.node, &priv->pwm);
+	ret = uclass_get_device_by_ofnode(UCLASS_PWM, args.node, &priv->pwm);
 	if (ret) {
 		debug("%s: Cannot get PWM: ret=%d\n", __func__, ret);
 		return ret;