ec520911ec
Sincec32569e358("regulator: Use of_node_name_eq for node name comparisons") Vivien reported the mc13892-regulator complaining about not being able to find regulators. This is because prior to that commit we used of_node_cmp() to compare the regulator array passed from mc13892_regulators down to mc13xxx_parse_regulators_dt() and they are all defined in uppercase letters by the MC13892_*_DEFINE* macros, whereas they are defined as lowercase in the DTS. Fix this by using a lowercase regulator name to match the DT node name. Fixes:c32569e358("regulator: Use of_node_name_eq for node name comparisons") Reported-by: Vivien Didelot <vivien.didelot@gmail.com> Reported-by: Florian Fainelli <f.fainelli@gmail.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Rob Herring <robh@kernel.org> Tested-by: Vivien Didelot <vivien.didelot@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
113 lines
3.3 KiB
C
113 lines
3.3 KiB
C
/*
|
|
* mc13xxx.h - regulators for the Freescale mc13xxx PMIC
|
|
*
|
|
* Copyright (C) 2010 Yong Shen <yong.shen@linaro.org>
|
|
*
|
|
* 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; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#ifndef __LINUX_REGULATOR_MC13XXX_H
|
|
#define __LINUX_REGULATOR_MC13XXX_H
|
|
|
|
#include <linux/regulator/driver.h>
|
|
|
|
struct mc13xxx_regulator {
|
|
struct regulator_desc desc;
|
|
int reg;
|
|
int enable_bit;
|
|
int vsel_reg;
|
|
int vsel_shift;
|
|
int vsel_mask;
|
|
};
|
|
|
|
struct mc13xxx_regulator_priv {
|
|
struct mc13xxx *mc13xxx;
|
|
u32 powermisc_pwgt_state;
|
|
struct mc13xxx_regulator *mc13xxx_regulators;
|
|
int num_regulators;
|
|
struct regulator_dev *regulators[];
|
|
};
|
|
|
|
extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev,
|
|
int min_uV, int max_uV, unsigned *selector);
|
|
|
|
#ifdef CONFIG_OF
|
|
extern int mc13xxx_get_num_regulators_dt(struct platform_device *pdev);
|
|
extern struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(
|
|
struct platform_device *pdev, struct mc13xxx_regulator *regulators,
|
|
int num_regulators);
|
|
#else
|
|
static inline int mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
|
|
static inline struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(
|
|
struct platform_device *pdev, struct mc13xxx_regulator *regulators,
|
|
int num_regulators)
|
|
{
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
extern struct regulator_ops mc13xxx_regulator_ops;
|
|
extern struct regulator_ops mc13xxx_fixed_regulator_ops;
|
|
|
|
#define MC13xxx_DEFINE(prefix, _name, _node, _reg, _vsel_reg, _voltages, _ops) \
|
|
[prefix ## _name] = { \
|
|
.desc = { \
|
|
.name = #_node, \
|
|
.n_voltages = ARRAY_SIZE(_voltages), \
|
|
.volt_table = _voltages, \
|
|
.ops = &_ops, \
|
|
.type = REGULATOR_VOLTAGE, \
|
|
.id = prefix ## _name, \
|
|
.owner = THIS_MODULE, \
|
|
}, \
|
|
.reg = prefix ## _reg, \
|
|
.enable_bit = prefix ## _reg ## _ ## _name ## EN, \
|
|
.vsel_reg = prefix ## _vsel_reg, \
|
|
.vsel_shift = prefix ## _vsel_reg ## _ ## _name ## VSEL,\
|
|
.vsel_mask = prefix ## _vsel_reg ## _ ## _name ## VSEL_M,\
|
|
}
|
|
|
|
#define MC13xxx_FIXED_DEFINE(prefix, _name, _node, _reg, _voltages, _ops) \
|
|
[prefix ## _name] = { \
|
|
.desc = { \
|
|
.name = #_node, \
|
|
.n_voltages = ARRAY_SIZE(_voltages), \
|
|
.volt_table = _voltages, \
|
|
.ops = &_ops, \
|
|
.type = REGULATOR_VOLTAGE, \
|
|
.id = prefix ## _name, \
|
|
.owner = THIS_MODULE, \
|
|
}, \
|
|
.reg = prefix ## _reg, \
|
|
.enable_bit = prefix ## _reg ## _ ## _name ## EN, \
|
|
}
|
|
|
|
#define MC13xxx_GPO_DEFINE(prefix, _name, _node, _reg, _voltages, _ops) \
|
|
[prefix ## _name] = { \
|
|
.desc = { \
|
|
.name = #_node, \
|
|
.n_voltages = ARRAY_SIZE(_voltages), \
|
|
.volt_table = _voltages, \
|
|
.ops = &_ops, \
|
|
.type = REGULATOR_VOLTAGE, \
|
|
.id = prefix ## _name, \
|
|
.owner = THIS_MODULE, \
|
|
}, \
|
|
.reg = prefix ## _reg, \
|
|
.enable_bit = prefix ## _reg ## _ ## _name ## EN, \
|
|
}
|
|
|
|
#define MC13xxx_DEFINE_SW(_name, _node, _reg, _vsel_reg, _voltages, ops) \
|
|
MC13xxx_DEFINE(SW, _name, _node, _reg, _vsel_reg, _voltages, ops)
|
|
#define MC13xxx_DEFINE_REGU(_name, _node, _reg, _vsel_reg, _voltages, ops) \
|
|
MC13xxx_DEFINE(REGU, _name, _node, _reg, _vsel_reg, _voltages, ops)
|
|
|
|
#endif
|