Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot into p-ti-u-boot-2016.05

* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
  Revert "power: regulator: pbias: Add pbias regulator support"
  Revert "ARM: dts: dra7xx: Fix broken pbias device creation"
  Revert "mmc: power off the IO regulator during power cycle"
  Revert "drivers: mmc: omap_hsmmc: use regulator APIs to program pbias"
  Revert "configs: enable misc and pbias options on configs for dra7 based boards"
  Revert "mmc: disable the mmc clock during power off"

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

10 files changed, 2 insertions, 269 deletions

diff --git a/arch/arm/dts/dra7.dtsi b/arch/arm/dts/dra7.dtsi
index 5d91eb5865..ec8de7a116 100644
--- a/arch/arm/dts/dra7.dtsi
+++ b/arch/arm/dts/dra7.dtsi
@@ -117,7 +117,7 @@
                                 ranges = <0 0x2000 0x2000>;
 
                                 scm_conf: scm_conf@0 {
-                                        compatible = "syscon", "simple-bus";
+                                        compatible = "syscon";
                                         reg = <0x0 0x1400>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 0872b993b7..9ee8312790 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -56,13 +56,11 @@ CONFIG_DRA7_IVA_OPP_HIGH=y
 CONFIG_DRA7_GPU_OPP_HIGH=y
 CONFIG_DISK=y
 CONFIG_DWC_AHCI=y
-CONFIG_MISC=y
 CONFIG_DM_ETH=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_PALMAS=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PALMAS=y
-CONFIG_DM_REGULATOR_PBIAS=y
 CONFIG_CMD_TIME=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index cd824d1b3c..8376f30da6 100644
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -61,14 +61,12 @@ CONFIG_DRA7_IVA_OPP_HIGH=y
 CONFIG_DRA7_GPU_OPP_HIGH=y
 CONFIG_DISK=y
 CONFIG_DWC_AHCI=y
-CONFIG_MISC=y
 CONFIG_DM_ETH=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_PALMAS=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_REGULATOR_PALMAS=y
-CONFIG_DM_REGULATOR_PBIAS=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 44c148d97b..28f0339790 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -55,7 +55,6 @@ CONFIG_PMIC_PALMAS=y
 CONFIG_PMIC_LP873X=y
 CONFIG_DISK=y
 CONFIG_DWC_AHCI=y
-CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
@@ -75,4 +74,3 @@ CONFIG_LATE_ATTACH_GPT_PART=n
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_REGULATOR_PALMAS=y
 CONFIG_DM_REGULATOR_LP873X=y
-CONFIG_DM_REGULATOR_PBIAS=y
diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
index a62dfcf416..d5b8e30b3b 100644
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -61,7 +61,6 @@ CONFIG_PMIC_PALMAS=y
 CONFIG_PMIC_LP873X=y
 CONFIG_DISK=y
 CONFIG_DWC_AHCI=y
-CONFIG_MISC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
 CONFIG_G_DNL_VENDOR_NUM=0x0451
@@ -80,6 +79,5 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_REGULATOR_PALMAS=y
 CONFIG_DM_REGULATOR_LP873X=y
-CONFIG_DM_REGULATOR_PBIAS=y
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 84515a7183..1255abcf78 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -2056,9 +2056,7 @@ static void mmc_power_up(struct mmc *mmc)
 
 static void mmc_power_off(struct mmc *mmc)
 {
-        mmc_set_signal_voltage(mmc, 0);
         mmc_set_vdd(mmc, false);
-        mmc_set_clock(mmc, 1, true);
 }
 
 static void mmc_power_cycle(struct mmc *mmc)
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index ecd51e08cb..e3c64bb05b 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -93,7 +93,6 @@ struct omap_hsmmc_data {
         char *version;
         struct udevice *vmmc_supply;
         struct udevice *vmmc_aux_supply;
-        struct udevice *pbias_supply;
         ushort last_cmd;
         uint signal_voltage;
 #ifdef CONFIG_IODELAY_RECALIBRATION
@@ -438,30 +437,18 @@ static int omap_hsmmc_set_io_regulator(struct mmc *mmc, int uV)
         if (!priv->vmmc_aux_supply)
                 return 0;
 
-        ret = regulator_set_enable(priv->pbias_supply, false);
-        if (ret && ret != -ENOSYS)
-                return ret;
-
         ret = regulator_set_enable(priv->vmmc_aux_supply, false);
         if (ret && ret != -ENOSYS)
                 return ret;
 
         ret = regulator_set_value(priv->vmmc_aux_supply, uV);
-        if (ret && ret != -ENOSYS)
-                return ret;
-
-        ret = regulator_set_value(priv->pbias_supply, uV);
-        if (ret && ret != -ENOSYS)
+        if (ret)
                 return ret;
 
         ret = regulator_set_enable(priv->vmmc_aux_supply, true);
         if (ret && ret != -ENOSYS)
                 return ret;
 
-        ret = regulator_set_enable(priv->pbias_supply, true);
-        if (ret && ret != -ENOSYS)
-                return ret;
-
         return 0;
 }
 #endif
@@ -469,9 +456,6 @@ static int omap_hsmmc_set_io_regulator(struct mmc *mmc, int uV)
 static int omap_hsmmc_set_signal_voltage(struct mmc *mmc)
 {
         u32 val;
-#ifdef CONFIG_DM_REGULATOR
-        int ret;
-#endif
         struct hsmmc *mmc_base;
         struct omap_hsmmc_data *priv = (struct omap_hsmmc_data *)mmc->priv;
 
@@ -514,16 +498,6 @@ static int omap_hsmmc_set_signal_voltage(struct mmc *mmc)
                 vmmc_pbias_config(LDO_VOLT_1V8);
 #endif
 #endif
-#ifdef CONFIG_DM_REGULATOR
-        } else if (mmc->signal_voltage == 0) {
-                ret = regulator_set_enable(priv->pbias_supply, false);
-                if (ret && ret != -ENOSYS)
-                        return ret;
-
-                ret = regulator_set_enable(priv->vmmc_aux_supply, false);
-                if (ret && ret != -ENOSYS)
-                        return ret;
-#endif
         } else {
                 return -EOPNOTSUPP;
         }
@@ -1825,13 +1799,11 @@ static int omap_hsmmc_probe(struct udevice *dev)
                 return -1;
 
         omap_hsmmc_platform_fixup(mmc);
-        priv->signal_voltage = -EINVAL;
 
 #ifdef CONFIG_DM_REGULATOR
         device_get_supply_regulator(dev, "vmmc-supply", &priv->vmmc_supply);
         device_get_supply_regulator(dev, "vmmc_aux-supply",
                                     &priv->vmmc_aux_supply);
-        device_get_supply_regulator(dev, "pbias-supply", &priv->pbias_supply);
 #endif
 #ifdef OMAP_HSMMC_USE_GPIO
         gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN);
diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig
index 235543c0f9..35af579cba 100644
--- a/drivers/power/regulator/Kconfig
+++ b/drivers/power/regulator/Kconfig
@@ -139,11 +139,3 @@ config DM_REGULATOR_LP873X
         This enables implementation of driver-model regulator uclass
         features for REGULATOR LP873X and the family of LP873X PMICs.
         The driver implements get/set api for: value and enable.
-
-config DM_REGULATOR_PBIAS
-        bool "Enable driver for PBIAS regulator"
-        depends on MISC
-        ---help---
-        This enables implementation of driver-model regulator uclass
-        features for REGULATOR PBIAS.
-        The driver implements regulator API for set voltage and enable.
diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile
index 8a9c0fe392..2d350cb2fe 100644
--- a/drivers/power/regulator/Makefile
+++ b/drivers/power/regulator/Makefile
@@ -17,4 +17,3 @@ obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o
 obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_PALMAS) += palmas_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_LP873X) += lp873x_regulator.o
-obj-$(CONFIG_$(SPL_)DM_REGULATOR_PBIAS) += pbias_regulator.o
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
deleted file mode 100644
index 9ca8acd49d..0000000000
--- a/drivers/power/regulator/pbias_regulator.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * PBIAS regulator driver
- *
- * Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * SPDX-License-Identifier:     GPL-2.0
- */
-
-#include <config.h>
-#include <asm/io.h>
-#include <common.h>
-#include <dm.h>
-#include <dm/lists.h>
-#include <power/regulator.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-struct pbias_reg_info {
-        u32 enable;
-        u32 enable_mask;
-        u32 disable_val;
-        u32 vmode;
-        unsigned int enable_time;
-        char *name;
-};
-
-struct pbias_regulator_data {
-        void *base;
-        struct pbias_reg_info *reg_info;
-};
-
-struct of_regulator_match {
-        const char *name;
-        void *driver_data;
-};
-
-static const struct pbias_reg_info pbias_mmc_omap2430 = {
-        .enable = BIT(1),
-        .enable_mask = BIT(1),
-        .vmode = BIT(0),
-        .disable_val = 0,
-        .enable_time = 100,
-        .name = "pbias_mmc_omap2430"
-};
-
-static const struct pbias_reg_info pbias_sim_omap3 = {
-        .enable = BIT(9),
-        .enable_mask = BIT(9),
-        .vmode = BIT(8),
-        .enable_time = 100,
-        .name = "pbias_sim_omap3"
-};
-
-static const struct pbias_reg_info pbias_mmc_omap4 = {
-        .enable = BIT(26) | BIT(22),
-        .enable_mask = BIT(26) | BIT(25) | BIT(22),
-        .disable_val = BIT(25),
-        .vmode = BIT(21),
-        .enable_time = 100,
-        .name = "pbias_mmc_omap4"
-};
-
-static const struct pbias_reg_info pbias_mmc_omap5 = {
-        .enable = BIT(27) | BIT(26),
-        .enable_mask = BIT(27) | BIT(25) | BIT(26),
-        .disable_val = BIT(25),
-        .vmode = BIT(21),
-        .enable_time = 100,
-        .name = "pbias_mmc_omap5"
-};
-
-static struct of_regulator_match pbias_matches[] = {
-        {
-                .name = "pbias_mmc_omap2430",
-                .driver_data = (void *)&pbias_mmc_omap2430
-        },
-        {
-                .name = "pbias_sim_omap3",
-                .driver_data = (void *)&pbias_sim_omap3
-        },
-        {
-                .name = "pbias_mmc_omap4",
-                .driver_data = (void *)&pbias_mmc_omap4
-        },
-        {
-                .name = "pbias_mmc_omap5",
-                .driver_data = (void *)&pbias_mmc_omap5
-        },
-};
-
-static int pbias_regulator_ofdata_to_platdata(struct udevice *dev)
-{
-        struct pbias_regulator_data *priv = dev_get_priv(dev);
-
-        priv->base = map_physmem(dev_get_addr(dev->parent), 0x4, MAP_NOCACHE);
-        if (!priv->base)
-                return -ENOMEM;
-
-        return 0;
-}
-
-static int pbias_regulator_probe(struct udevice *dev)
-{
-        int i;
-        struct dm_regulator_uclass_platdata *uc_pdata;
-        int num_matches = ARRAY_SIZE(pbias_matches);
-        struct pbias_regulator_data *priv = dev_get_priv(dev);
-
-        uc_pdata = dev_get_uclass_platdata(dev);
-
-        for (i = 0; i < num_matches; i++) {
-                struct of_regulator_match *match = &pbias_matches[i];
-                if (strcmp(match->name, uc_pdata->name))
-                        continue;
-
-                priv->reg_info = match->driver_data;
-        }
-
-        return 0;
-}
-
-static int pbias_regulator_set_value(struct udevice *dev, int uV)
-{
-        u32 value = 0;
-        struct pbias_regulator_data *priv = dev_get_priv(dev);
-        struct pbias_reg_info *reg_info = priv->reg_info;
-
-        value = readl(priv->base);
-        if (uV >= 3000000)
-                value |= reg_info->vmode;
-        else
-                value &= ~reg_info->vmode;
-        writel(value, priv->base);
-
-        return 0;
-}
-
-static int pbias_regulator_set_enable(struct udevice *dev, bool enable)
-{
-        u32 value = 0;
-        struct pbias_regulator_data *priv = dev_get_priv(dev);
-        struct pbias_reg_info *reg_info = priv->reg_info;
-
-        value = readl(priv->base);
-        value &= ~reg_info->enable_mask;
-        if (enable)
-                value |= reg_info->enable;
-        else
-                value |= reg_info->disable_val;
-        writel(value, priv->base);
-        udelay(150);
-
-        return 0;
-}
-
-static const struct dm_regulator_ops pbias_regulator_ops = {
-        .set_value  = pbias_regulator_set_value,
-        .set_enable = pbias_regulator_set_enable,
-};
-
-static const struct udevice_id pbias_regulator_ids[] = {
-        { .compatible = "ti,pbias-omap" },
-        { }
-};
-
-U_BOOT_DRIVER(pbias_regulator) = {
-        .name   = "pbias-regulator",
-        .id     = UCLASS_REGULATOR,
-        .ops    = &pbias_regulator_ops,
-        .of_match = pbias_regulator_ids,
-        .probe  = pbias_regulator_probe,
-        .ofdata_to_platdata = pbias_regulator_ofdata_to_platdata,
-        .priv_auto_alloc_size = sizeof(struct pbias_regulator_data),
-};
-
-static int pbias_bind(struct udevice *parent)
-{
-        int ret;
-        int node;
-        const void *fdt = gd->fdt_blob;
-        const char *name;
-        struct udevice *dev;
-
-        node = fdt_first_subnode(fdt, parent->of_offset);
-        if (node < 0) {
-                error("pbias regulator not found\n");
-                return -ENODEV;
-        }
-
-        name = fdt_get_name(fdt, node, NULL);
-        ret = device_bind_driver_to_node(parent, "pbias-regulator", name, node,
-                                         &dev);
-        if (ret) {
-                error("pbias regulator not bound to driver\n");
-                return ret;
-        }
-
-        return 0;
-}
-
-static const struct udevice_id pbias_ids[] = {
-        { .compatible = "ti,pbias-omap" },
-        { }
-};
-
-U_BOOT_DRIVER(pbias) = {
-        .name   = "pbias",
-        .id     = UCLASS_MISC,
-        .of_match = pbias_ids,
-        .bind   = pbias_bind,
-};