Commit baa64151 authored by Dong Aisheng's avatar Dong Aisheng Committed by Samuel Ortiz

regulator: anatop-regulator: Convert to use syscon to access anatop register

Using syscon to access anatop register.
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarDong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent df37e0c0
...@@ -378,8 +378,8 @@ ccm@020c4000 { ...@@ -378,8 +378,8 @@ ccm@020c4000 {
interrupts = <0 87 0x04 0 88 0x04>; interrupts = <0 87 0x04 0 88 0x04>;
}; };
anatop@020c8000 { anatop: anatop@020c8000 {
compatible = "fsl,imx6q-anatop"; compatible = "fsl,imx6q-anatop", "syscon", "simple-bus";
reg = <0x020c8000 0x1000>; reg = <0x020c8000 0x1000>;
interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>; interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>;
......
...@@ -839,7 +839,7 @@ config SOC_IMX6Q ...@@ -839,7 +839,7 @@ config SOC_IMX6Q
select HAVE_IMX_MMDC select HAVE_IMX_MMDC
select HAVE_IMX_SRC select HAVE_IMX_SRC
select HAVE_SMP select HAVE_SMP
select MFD_ANATOP select MFD_SYSCON
select PINCTRL select PINCTRL
select PINCTRL_IMX6Q select PINCTRL_IMX6Q
......
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/pinctrl/machine.h> #include <linux/pinctrl/machine.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/regmap.h>
#include <linux/micrel_phy.h> #include <linux/micrel_phy.h>
#include <linux/mfd/anatop.h> #include <linux/mfd/syscon.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
#include <asm/smp_twd.h> #include <asm/smp_twd.h>
#include <asm/hardware/cache-l2x0.h> #include <asm/hardware/cache-l2x0.h>
...@@ -120,20 +121,7 @@ static void __init imx6q_sabrelite_init(void) ...@@ -120,20 +121,7 @@ static void __init imx6q_sabrelite_init(void)
static void __init imx6q_usb_init(void) static void __init imx6q_usb_init(void)
{ {
struct device_node *np; struct regmap *anatop;
struct platform_device *pdev = NULL;
struct anatop *adata = NULL;
np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop");
if (np)
pdev = of_find_device_by_node(np);
if (pdev)
adata = platform_get_drvdata(pdev);
if (!adata) {
if (np)
of_node_put(np);
return;
}
#define HW_ANADIG_USB1_CHRG_DETECT 0x000001b0 #define HW_ANADIG_USB1_CHRG_DETECT 0x000001b0
#define HW_ANADIG_USB2_CHRG_DETECT 0x00000210 #define HW_ANADIG_USB2_CHRG_DETECT 0x00000210
...@@ -141,20 +129,21 @@ static void __init imx6q_usb_init(void) ...@@ -141,20 +129,21 @@ static void __init imx6q_usb_init(void)
#define BM_ANADIG_USB_CHRG_DETECT_EN_B 0x00100000 #define BM_ANADIG_USB_CHRG_DETECT_EN_B 0x00100000
#define BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B 0x00080000 #define BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B 0x00080000
anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");
if (!IS_ERR(anatop)) {
/* /*
* The external charger detector needs to be disabled, * The external charger detector needs to be disabled,
* or the signal at DP will be poor * or the signal at DP will be poor
*/ */
anatop_write_reg(adata, HW_ANADIG_USB1_CHRG_DETECT, regmap_write(anatop, HW_ANADIG_USB1_CHRG_DETECT,
BM_ANADIG_USB_CHRG_DETECT_EN_B BM_ANADIG_USB_CHRG_DETECT_EN_B
| BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B, | BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B);
~0); regmap_write(anatop, HW_ANADIG_USB2_CHRG_DETECT,
anatop_write_reg(adata, HW_ANADIG_USB2_CHRG_DETECT,
BM_ANADIG_USB_CHRG_DETECT_EN_B | BM_ANADIG_USB_CHRG_DETECT_EN_B |
BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B, BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B);
~0); } else {
pr_warn("failed to find fsl,imx6q-anatop regmap\n");
of_node_put(np); }
} }
static void __init imx6q_init_machine(void) static void __init imx6q_init_machine(void)
......
...@@ -112,7 +112,7 @@ config REGULATOR_DA9052 ...@@ -112,7 +112,7 @@ config REGULATOR_DA9052
config REGULATOR_ANATOP config REGULATOR_ANATOP
tristate "Freescale i.MX on-chip ANATOP LDO regulators" tristate "Freescale i.MX on-chip ANATOP LDO regulators"
depends on MFD_ANATOP depends on MFD_SYSCON
help help
Say y here to support Freescale i.MX on-chip ANATOP LDOs Say y here to support Freescale i.MX on-chip ANATOP LDOs
regulators. It is recommended that this option be regulators. It is recommended that this option be
......
...@@ -21,19 +21,20 @@ ...@@ -21,19 +21,20 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mfd/syscon.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/mfd/anatop.h> #include <linux/regmap.h>
#include <linux/regulator/driver.h> #include <linux/regulator/driver.h>
#include <linux/regulator/of_regulator.h> #include <linux/regulator/of_regulator.h>
struct anatop_regulator { struct anatop_regulator {
const char *name; const char *name;
u32 control_reg; u32 control_reg;
struct anatop *mfd; struct regmap *anatop;
int vol_bit_shift; int vol_bit_shift;
int vol_bit_width; int vol_bit_width;
int min_bit_val; int min_bit_val;
...@@ -43,7 +44,8 @@ struct anatop_regulator { ...@@ -43,7 +44,8 @@ struct anatop_regulator {
struct regulator_init_data *initdata; struct regulator_init_data *initdata;
}; };
static int anatop_set_voltage_sel(struct regulator_dev *reg, unsigned selector) static int anatop_regmap_set_voltage_sel(struct regulator_dev *reg,
unsigned selector)
{ {
struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
u32 val, mask; u32 val, mask;
...@@ -56,12 +58,13 @@ static int anatop_set_voltage_sel(struct regulator_dev *reg, unsigned selector) ...@@ -56,12 +58,13 @@ static int anatop_set_voltage_sel(struct regulator_dev *reg, unsigned selector)
mask = ((1 << anatop_reg->vol_bit_width) - 1) << mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
anatop_reg->vol_bit_shift; anatop_reg->vol_bit_shift;
val <<= anatop_reg->vol_bit_shift; val <<= anatop_reg->vol_bit_shift;
anatop_write_reg(anatop_reg->mfd, anatop_reg->control_reg, val, mask); regmap_update_bits(anatop_reg->anatop, anatop_reg->control_reg,
mask, val);
return 0; return 0;
} }
static int anatop_get_voltage_sel(struct regulator_dev *reg) static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)
{ {
struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
u32 val; u32 val;
...@@ -69,7 +72,7 @@ static int anatop_get_voltage_sel(struct regulator_dev *reg) ...@@ -69,7 +72,7 @@ static int anatop_get_voltage_sel(struct regulator_dev *reg)
if (!anatop_reg->control_reg) if (!anatop_reg->control_reg)
return -ENOTSUPP; return -ENOTSUPP;
val = anatop_read_reg(anatop_reg->mfd, anatop_reg->control_reg); regmap_read(anatop_reg->anatop, anatop_reg->control_reg, &val);
val = (val & ((1 << anatop_reg->vol_bit_width) - 1)) >> val = (val & ((1 << anatop_reg->vol_bit_width) - 1)) >>
anatop_reg->vol_bit_shift; anatop_reg->vol_bit_shift;
...@@ -77,8 +80,8 @@ static int anatop_get_voltage_sel(struct regulator_dev *reg) ...@@ -77,8 +80,8 @@ static int anatop_get_voltage_sel(struct regulator_dev *reg)
} }
static struct regulator_ops anatop_rops = { static struct regulator_ops anatop_rops = {
.set_voltage_sel = anatop_set_voltage_sel, .set_voltage_sel = anatop_regmap_set_voltage_sel,
.get_voltage_sel = anatop_get_voltage_sel, .get_voltage_sel = anatop_regmap_get_voltage_sel,
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear, .map_voltage = regulator_map_voltage_linear,
}; };
...@@ -87,11 +90,11 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev) ...@@ -87,11 +90,11 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct device_node *anatop_np;
struct regulator_desc *rdesc; struct regulator_desc *rdesc;
struct regulator_dev *rdev; struct regulator_dev *rdev;
struct anatop_regulator *sreg; struct anatop_regulator *sreg;
struct regulator_init_data *initdata; struct regulator_init_data *initdata;
struct anatop *anatopmfd = dev_get_drvdata(pdev->dev.parent);
struct regulator_config config = { }; struct regulator_config config = { };
int ret = 0; int ret = 0;
...@@ -108,7 +111,15 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev) ...@@ -108,7 +111,15 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev)
rdesc->ops = &anatop_rops; rdesc->ops = &anatop_rops;
rdesc->type = REGULATOR_VOLTAGE; rdesc->type = REGULATOR_VOLTAGE;
rdesc->owner = THIS_MODULE; rdesc->owner = THIS_MODULE;
sreg->mfd = anatopmfd;
anatop_np = of_get_parent(np);
if (!anatop_np)
return -ENODEV;
sreg->anatop = syscon_node_to_regmap(anatop_np);
of_node_put(anatop_np);
if (IS_ERR(sreg->anatop))
return PTR_ERR(sreg->anatop);
ret = of_property_read_u32(np, "anatop-reg-offset", ret = of_property_read_u32(np, "anatop-reg-offset",
&sreg->control_reg); &sreg->control_reg);
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment