mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
798bd59ce9
Commit 3d55c29 "ARM: tegra: harmony: add regulator supply name and its
input supply" was supposed to fix all the problems with regulators on
Harmony. However, it appears that I only tested it when booting using
board files, not when booting using device tree. This change fixes two
problems with regulators when booting using device tree:
1) That patch only created the vdd_sys regulator when booting using a
board file. Since this is the root of the whole regulator tree, this
caused no regulators to successfully initialize when booting using
device tree. The registration of vdd_sys is moved to fix this.
2) When booting use DT, the regulator core sets has_full_constraints,
which in turn causes the core to turn off any regulators not marked
as always on. Some of the affected regulators are required for basic
system operation. To solve this, add always on constraints to all
relevant regulators. This doesn't affect booting using a board file
since nothing sets has_full_constraints in that case.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
149 lines
4.4 KiB
C
149 lines
4.4 KiB
C
/*
|
|
* Copyright (C) 2010 NVIDIA, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
* 02111-1307, USA
|
|
*/
|
|
#include <linux/i2c.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/regulator/fixed.h>
|
|
#include <linux/mfd/tps6586x.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_i2c.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
|
|
#include <mach/irqs.h>
|
|
|
|
#include "board-harmony.h"
|
|
|
|
static struct regulator_consumer_supply tps658621_ldo0_supply[] = {
|
|
REGULATOR_SUPPLY("pex_clk", NULL),
|
|
};
|
|
|
|
static struct regulator_init_data ldo0_data = {
|
|
.supply_regulator = "vdd_sm2",
|
|
.constraints = {
|
|
.name = "vdd_ldo0",
|
|
.min_uV = 3300 * 1000,
|
|
.max_uV = 3300 * 1000,
|
|
.valid_modes_mask = (REGULATOR_MODE_NORMAL |
|
|
REGULATOR_MODE_STANDBY),
|
|
.valid_ops_mask = (REGULATOR_CHANGE_MODE |
|
|
REGULATOR_CHANGE_STATUS |
|
|
REGULATOR_CHANGE_VOLTAGE),
|
|
.apply_uV = 1,
|
|
},
|
|
.num_consumer_supplies = ARRAY_SIZE(tps658621_ldo0_supply),
|
|
.consumer_supplies = tps658621_ldo0_supply,
|
|
};
|
|
|
|
#define HARMONY_REGULATOR_INIT(_id, _name, _supply, _minmv, _maxmv, _on)\
|
|
static struct regulator_init_data _id##_data = { \
|
|
.supply_regulator = _supply, \
|
|
.constraints = { \
|
|
.name = _name, \
|
|
.min_uV = (_minmv)*1000, \
|
|
.max_uV = (_maxmv)*1000, \
|
|
.valid_modes_mask = (REGULATOR_MODE_NORMAL | \
|
|
REGULATOR_MODE_STANDBY), \
|
|
.valid_ops_mask = (REGULATOR_CHANGE_MODE | \
|
|
REGULATOR_CHANGE_STATUS | \
|
|
REGULATOR_CHANGE_VOLTAGE), \
|
|
.always_on = _on, \
|
|
}, \
|
|
}
|
|
|
|
HARMONY_REGULATOR_INIT(sm0, "vdd_sm0", "vdd_sys", 725, 1500, 1);
|
|
HARMONY_REGULATOR_INIT(sm1, "vdd_sm1", "vdd_sys", 725, 1500, 1);
|
|
HARMONY_REGULATOR_INIT(sm2, "vdd_sm2", "vdd_sys", 3000, 4550, 1);
|
|
HARMONY_REGULATOR_INIT(ldo1, "vdd_ldo1", "vdd_sm2", 725, 1500, 1);
|
|
HARMONY_REGULATOR_INIT(ldo2, "vdd_ldo2", "vdd_sm2", 725, 1500, 0);
|
|
HARMONY_REGULATOR_INIT(ldo3, "vdd_ldo3", "vdd_sm2", 1250, 3300, 1);
|
|
HARMONY_REGULATOR_INIT(ldo4, "vdd_ldo4", "vdd_sm2", 1700, 2475, 1);
|
|
HARMONY_REGULATOR_INIT(ldo5, "vdd_ldo5", NULL, 1250, 3300, 1);
|
|
HARMONY_REGULATOR_INIT(ldo6, "vdd_ldo6", "vdd_sm2", 1250, 3300, 0);
|
|
HARMONY_REGULATOR_INIT(ldo7, "vdd_ldo7", "vdd_sm2", 1250, 3300, 0);
|
|
HARMONY_REGULATOR_INIT(ldo8, "vdd_ldo8", "vdd_sm2", 1250, 3300, 0);
|
|
HARMONY_REGULATOR_INIT(ldo9, "vdd_ldo9", "vdd_sm2", 1250, 3300, 1);
|
|
|
|
#define TPS_REG(_id, _data) \
|
|
{ \
|
|
.id = TPS6586X_ID_##_id, \
|
|
.name = "tps6586x-regulator", \
|
|
.platform_data = _data, \
|
|
}
|
|
|
|
static struct tps6586x_subdev_info tps_devs[] = {
|
|
TPS_REG(SM_0, &sm0_data),
|
|
TPS_REG(SM_1, &sm1_data),
|
|
TPS_REG(SM_2, &sm2_data),
|
|
TPS_REG(LDO_0, &ldo0_data),
|
|
TPS_REG(LDO_1, &ldo1_data),
|
|
TPS_REG(LDO_2, &ldo2_data),
|
|
TPS_REG(LDO_3, &ldo3_data),
|
|
TPS_REG(LDO_4, &ldo4_data),
|
|
TPS_REG(LDO_5, &ldo5_data),
|
|
TPS_REG(LDO_6, &ldo6_data),
|
|
TPS_REG(LDO_7, &ldo7_data),
|
|
TPS_REG(LDO_8, &ldo8_data),
|
|
TPS_REG(LDO_9, &ldo9_data),
|
|
};
|
|
|
|
static struct tps6586x_platform_data tps_platform = {
|
|
.irq_base = TEGRA_NR_IRQS,
|
|
.num_subdevs = ARRAY_SIZE(tps_devs),
|
|
.subdevs = tps_devs,
|
|
.gpio_base = HARMONY_GPIO_TPS6586X(0),
|
|
};
|
|
|
|
static struct i2c_board_info __initdata harmony_regulators[] = {
|
|
{
|
|
I2C_BOARD_INFO("tps6586x", 0x34),
|
|
.irq = INT_EXTERNAL_PMU,
|
|
.platform_data = &tps_platform,
|
|
},
|
|
};
|
|
|
|
int __init harmony_regulator_init(void)
|
|
{
|
|
regulator_register_always_on(0, "vdd_sys",
|
|
NULL, 0, 5000000);
|
|
|
|
if (machine_is_harmony()) {
|
|
i2c_register_board_info(3, harmony_regulators, 1);
|
|
} else { /* Harmony, booted using device tree */
|
|
struct device_node *np;
|
|
struct i2c_adapter *adapter;
|
|
|
|
np = of_find_node_by_path("/i2c@7000d000");
|
|
if (np == NULL) {
|
|
pr_err("Could not find device_node for DVC I2C\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
adapter = of_find_i2c_adapter_by_node(np);
|
|
if (!adapter) {
|
|
pr_err("Could not find i2c_adapter for DVC I2C\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
i2c_new_device(adapter, harmony_regulators);
|
|
}
|
|
|
|
return 0;
|
|
}
|