linaro-dev March 2012

linaro-dev@lists.linaro.org

152 participants
126 discussions

[PATCH 1/3] thermal: fix a Kconfig help section

by Mircea Gherzan

Signed-off-by: Mircea Gherzan <mgherzan(a)gmail.com> --- drivers/thermal/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index cea6ad0..55f057d 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -18,6 +18,7 @@ config THERMAL_HWMON depends on THERMAL depends on HWMON=y || HWMON=THERMAL default y + help This pseudo-driver takes information from the thermal sensor and uses it to adapt the CPU frequency to a rate which prevents overheating. -- 1.7.9.1

12 years, 2 months

[PATCH tilt-3.2] syslink: add a missing header to fix a build error

by Mircea Gherzan

drivers/dsp/syslink/multicore_ipc/heap.c:36:2: error: implicit declaration of function 'BUILD_BUG_ON' Signed-off-by: Mircea Gherzan <mgherzan(a)gmail.com> --- drivers/dsp/syslink/multicore_ipc/heap.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/dsp/syslink/multicore_ipc/heap.c b/drivers/dsp/syslink/multicore_ipc/heap.c index 479174d..9deb6df 100644 --- a/drivers/dsp/syslink/multicore_ipc/heap.c +++ b/drivers/dsp/syslink/multicore_ipc/heap.c @@ -15,9 +15,8 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * PURPOSE. */ +#include <linux/kernel.h> #include <linux/types.h> -#include <linux/bug.h> - #include <heap.h> -- 1.7.9.1

12 years, 2 months

[PATCH] OMAP: remove merge artifacts from the PandaBoard file

by Mircea Gherzan

Signed-off-by: Mircea Gherzan <mgherzan(a)gmail.com> --- arch/arm/mach-omap2/board-omap4panda.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 084e0a6..77ab174 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -63,10 +63,6 @@ #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */ #define HDMI_GPIO_HPD 63 /* Hotplug detect */ -<<<<<<< current -/* wl127x BT, FM, GPS connectivity chip */ -static int wl1271_gpios[] = {46, -1, -1}; -======= #define FIXED_REG_VWLAN_ID 0 #define FIXED_REG_V2V1_ID 1 #define FIXED_REG_V1V8_ID 2 @@ -74,7 +70,6 @@ static int wl1271_gpios[] = {46, -1, -1}; /* wl127x BT, FM, GPS connectivity chip */ static int wl1271_gpios[] = {46, -1, -1}; ->>>>>>> patched static struct platform_device wl1271_device = { .name = "kim", .id = -1, -- 1.7.9.1

12 years, 2 months

[PATCH 3/3] OMAP: fix a typo in the Makefile

by Mircea Gherzan

Signed-off-by: Mircea Gherzan <mgherzan(a)gmail.com> --- arch/arm/mach-omap2/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 0b7014d..e9991c9 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -104,7 +104,7 @@ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ cm44xx.o prcm_mpu44xx.o \ prminst44xx.o vc44xx_data.o \ vp44xx_data.o prm44xx.o dvfs.o \ - abb44xx_data.o scrm444xx.o \ + abb44xx_data.o scrm44xx.o \ omap-sar.o obj-$(CONFIG_ARCH_OMAP5) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ cm44xx.o prcm_mpu44xx.o \ -- 1.7.9.1

12 years, 2 months

[PATCH 2/3] ARM: fix compilation of timer & watchdog

by Mircea Gherzan

Signed-off-by: Mircea Gherzan <mgherzan(a)gmail.com> --- arch/arm/kernel/smp_twd.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 4464b87..b93e3ad 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -216,6 +216,10 @@ static struct clk *twd_get_clock(void) return clk; } +extern void smp_timer_broadcast(const struct cpumask *mask); + +static struct clock_event_device __percpu **twd_evt; + /* * Setup the local clock events for a CPU. */ @@ -248,7 +252,6 @@ static void __cpuinit twd_timer_setup(struct clock_event_device *clk) twd_timer_rate = clk_get_rate(twd_clk); else twd_calibrate_rate(); - extern void smp_timer_broadcast(const struct cpumask *mask); __raw_writel(0, twd_base + TWD_TIMER_CONTROL); -- 1.7.9.1

12 years, 2 months

[PATCH-WIP 00/13] xen/arm: receive Xen events and initialize xenbus

by Stefano Stabellini

Hi all, this patch series is part of the work in progress support for Xen on ARMv7 with virtualization extensions in Linux. It is obviously NOT ready to be accepted upstream but implements enough support to allow Linux Dom0 to receive event channel notifications and initialize xenbus. With this series applied and the corresponding Xen patch series (http://marc.info/?l=xen-devel&m=133001696312879) is possible to boot Linux as Dom0 on Xen on a Versatile Express Cortex A15 emulator and issue basic xl commands, like "xl list" and "xl uptime". "xl create" is still not working though but it is the next on the list :) Working on this series it became obvious that passing the hypercall number as IMM parameter to HVC is not flexible enough because we don't always know the hypercall number at compile time. As a result I changed the hypercall.h header file to use r12 to pass the hypercall number instead. r12 was chosen because it is defined as "intra-procedure call scratch register" so it seems the most appropriate. I have CC'ed the KVM list on the first patch because following previous discussions hypercall.h might become a common header file to issue hypercalls on different hypervisors on ARM. I haven't disentangled the Xen specific bits from the generic ones yet, however it should be straightforward. I am looking forward to hearing your opinions, especially on the hypercall calling convention. The patch series is available here: git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git xenarmv7-1 It is based on the vexpress-dt branch of git://xenbits.xen.org/people/dvrabel/linux.git, that we are currently using as development tree for Linux on Xen on Cortex A15. See http://wiki.xen.org/wiki/Xen_ARMv7_with_Virtualization_Extensions. The list of patches with diffstat follows: Stefano Stabellini (13): xen/arm: use r12 to pass the hypercall number to the hypervisor xen/arm: introduce privcmp, physdev_op and memory_op hypercalls. xen/arm: mmu.h and page.h related definitions xen/arm: sync_bitops xen/arm: empty implementation of grant_table arch specific functions xen/arm: missing includes xen/arm: receive xen events on arm xen/arm: fix arm xen guest handle definitions xen/arm: shared_info and start_info xen/arm: empty implementation of xen_remap_domain_mfn_range xen/arm: Introduce xen_pfn_t for pfn and mfn types xen/arm: compile and run xenbus xen/arm: compile grant-table features events and xenbus, do not compile pci arch/arm/Kconfig | 4 + arch/arm/include/asm/sync_bitops.h | 17 ++++ arch/arm/include/asm/xen/events.h | 9 ++ arch/arm/include/asm/xen/grant_table.h | 2 + arch/arm/include/asm/xen/hypercall.h | 111 ++++++++++++++++++---------- arch/arm/include/asm/xen/interface.h | 12 +-- arch/arm/include/asm/xen/mmu.h | 61 +++++++++++++++ arch/arm/include/asm/xen/page.h | 14 +++- arch/arm/xen/Makefile | 2 +- arch/arm/xen/enlighten.c | 71 ++++++++++++++++-- arch/arm/xen/grant-table.c | 47 ++++++++++++ arch/ia64/include/asm/xen/interface.h | 3 +- arch/x86/include/asm/xen/interface.h | 3 + drivers/xen/Makefile | 7 +- drivers/xen/events.c | 36 +++++++++- drivers/xen/grant-table.c | 2 + drivers/xen/xenbus/xenbus_client.c | 1 + drivers/xen/xenbus/xenbus_comms.c | 2 +- drivers/xen/xenbus/xenbus_probe.c | 26 ++++--- drivers/xen/xenbus/xenbus_probe_frontend.c | 1 + drivers/xen/xenbus/xenbus_xs.c | 3 +- drivers/xen/xenfs/xenstored.c | 1 + include/xen/interface/grant_table.h | 4 +- include/xen/interface/memory.h | 6 +- include/xen/interface/platform.h | 4 +- include/xen/interface/xen.h | 6 +- include/xen/privcmd.h | 3 +- include/xen/xen.h | 2 +- 28 files changed, 371 insertions(+), 89 deletions(-) Cheers, Stefano

12 years, 2 months

[PATCH v2 0/4] omap hsmmc device tree support

by Rajendra Nayak

This series adds device tree support for OMAP hsmmc driver. The series is dependent on a couple other series, to add TWL regulator DT support[1] and another to clean the pdev->id usage within the hsmmc driver[2] all patches including the dependent series can be found here git://gitorious.org/omap-pm/linux.git for-dt/regulator The series is tested on omap4sdp (both external and emmc), omap4panda amd omap3beagle boards. Things to do: -1- Card detect isn't functional and needs twl4030 gpio to be DT converted. -2- pbias cell programming is missing and needs an OMAP control module driver. [1] http://marc.info/?l=linux-omap&m=132999699905180&w=2 [2] http://marc.info/?l=linux-omap&m=132999646604985&w=2 Rajendra Nayak (4): mmc: omap_hsmmc: Convert hsmmc driver to use device tree mmc: omap_hsmmc: Avoid a regulator voltage change with dt arm/dts: OMAP4: Add mmc controller nodes and board data arm/dts: OMAP3: Add mmc controller nodes and board data .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 31 +++++++ arch/arm/boot/dts/omap3-beagle.dts | 6 ++ arch/arm/boot/dts/omap3.dtsi | 26 ++++++ arch/arm/boot/dts/omap4-panda.dts | 10 +++ arch/arm/boot/dts/omap4-sdp.dts | 16 ++++ arch/arm/boot/dts/omap4.dtsi | 31 +++++++ drivers/mmc/host/omap_hsmmc.c | 83 +++++++++++++++++++- 7 files changed, 202 insertions(+), 1 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

12 years, 2 months

Help: Is my Beagle C4 dead?

by Zygmunt Krynicki

Hi Today morning I've noticed that my beagle C4 is not working well. This is the output a seen on serial: (Also here: https://pastebin.linaro.org/424/) 40W U-Boot SPL 2011.12 (Feb 16 2012 - 21:43:13) Texas Instruments Revision detection unimplemented OMAP SD/MMC: 0 mmc_send_cmd: timedout waiting for cmddis! ** Can't read from device 0 ** spl: fat register err - -1 ### ERROR ### Please RESET the board ### The SD card is connected via uSD -> SD adapter and works fine in other boards. I've tried re-attaching everything a dozen times. Thanks ZK

12 years, 2 months

[PATCH v11] Regulator: Add Anatop regulator driver

by Ying-Chun Liu (PaulLiu)

From: "Ying-Chun Liu (PaulLiu)" <paul.liu(a)linaro.org> Anatop is an integrated regulator inside i.MX6 SoC. There are 3 digital regulators which controls PU, CORE (ARM), and SOC. And 3 analog regulators which controls 1P1, 2P5, 3P0 (USB). This patch adds the Anatop regulator driver. Signed-off-by: Nancy Chen <Nancy.Chen(a)freescale.com> Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org> Acked-by: Shawn Guo <shawn.guo(a)linaro.org> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg(a)ti.com> Cc: Samuel Ortiz <sameo(a)linux.intel.com> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> Cc: Axel Lin <axel.lin(a)gmail.com> --- drivers/regulator/Kconfig | 8 + drivers/regulator/Makefile | 1 + drivers/regulator/anatop-regulator.c | 238 ++++++++++++++++++++++++++++++++++ 3 files changed, 247 insertions(+), 0 deletions(-) create mode 100644 drivers/regulator/anatop-regulator.c diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index c733df5..a229de9 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -102,6 +102,14 @@ config REGULATOR_DA9052 This driver supports the voltage regulators of DA9052-BC and DA9053-AA/Bx PMIC. +config REGULATOR_ANATOP + tristate "Freescale i.MX on-chip ANATOP LDO regulators" + depends on MFD_ANATOP + help + Say y here to support Freescale i.MX on-chip ANATOP LDOs + regulators. It is recommended that this option be + enabled on i.MX6 platform. + config REGULATOR_MC13XXX_CORE tristate diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 2b09c81..b5042c8 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o obj-$(CONFIG_REGULATOR_AB8500) += ab8500.o obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o +obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o obj-$(CONFIG_REGULATOR_DA903X) += da903x.o obj-$(CONFIG_REGULATOR_DA9052) += da9052-regulator.o diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c new file mode 100644 index 0000000..53a2d87 --- /dev/null +++ b/drivers/regulator/anatop-regulator.c @@ -0,0 +1,238 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + */ + +/* + * 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. + + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <linux/slab.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/mfd/anatop.h> +#include <linux/regulator/driver.h> +#include <linux/regulator/of_regulator.h> + +struct anatop_regulator { + const char *name; + u32 control_reg; + struct anatop *mfd; + int vol_bit_shift; + int vol_bit_width; + int min_bit_val; + int min_voltage; + int max_voltage; + struct regulator_desc rdesc; + struct regulator_init_data *initdata; +}; + +static int anatop_set_voltage(struct regulator_dev *reg, int min_uV, + int max_uV, unsigned *selector) +{ + struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); + u32 val, sel; + int uv; + + uv = min_uV; + dev_dbg(&reg->dev, "%s: uv %d, min %d, max %d\n", __func__, + uv, anatop_reg->min_voltage, + anatop_reg->max_voltage); + + if (uv < anatop_reg->min_voltage) { + if (max_uV > anatop_reg->min_voltage) + uv = anatop_reg->min_voltage; + else + return -EINVAL; + } + + if (!anatop_reg->control_reg) + return -ENOTSUPP; + + sel = DIV_ROUND_UP(uv - anatop_reg->min_voltage, 25000); + if (sel * 25000 + anatop_reg->min_voltage > anatop_reg->max_voltage) + return -EINVAL; + val = anatop_reg->min_bit_val + sel; + *selector = sel; + dev_dbg(&reg->dev, "%s: calculated val %d\n", __func__, val); + anatop_set_bits(anatop_reg->mfd, + anatop_reg->control_reg, + anatop_reg->vol_bit_shift, + anatop_reg->vol_bit_width, + val); + + return 0; +} + +static int anatop_get_voltage_sel(struct regulator_dev *reg) +{ + struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); + u32 val; + + if (!anatop_reg->control_reg) + return -ENOTSUPP; + + val = anatop_get_bits(anatop_reg->mfd, + anatop_reg->control_reg, + anatop_reg->vol_bit_shift, + anatop_reg->vol_bit_width); + + return val - anatop_reg->min_bit_val; +} + +static int anatop_list_voltage(struct regulator_dev *reg, unsigned selector) +{ + struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); + int uv; + + uv = anatop_reg->min_voltage + selector * 25000; + dev_dbg(&reg->dev, "vddio = %d, selector = %u\n", uv, selector); + + return uv; +} + +static struct regulator_ops anatop_rops = { + .set_voltage = anatop_set_voltage, + .get_voltage_sel = anatop_get_voltage_sel, + .list_voltage = anatop_list_voltage, +}; + +static int __devinit anatop_regulator_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct regulator_desc *rdesc; + struct regulator_dev *rdev; + struct anatop_regulator *sreg; + struct regulator_init_data *initdata; + struct anatop *anatopmfd = dev_get_drvdata(pdev->dev.parent); + int ret = 0; + + initdata = of_get_regulator_init_data(dev, np); + sreg = devm_kzalloc(dev, sizeof(*sreg), GFP_KERNEL); + if (!sreg) + return -ENOMEM; + sreg->initdata = initdata; + sreg->name = kstrdup(of_get_property(np, "regulator-name", NULL), + GFP_KERNEL); + rdesc = &sreg->rdesc; + memset(rdesc, 0, sizeof(*rdesc)); + rdesc->name = sreg->name; + rdesc->ops = &anatop_rops; + rdesc->type = REGULATOR_VOLTAGE; + rdesc->owner = THIS_MODULE; + sreg->mfd = anatopmfd; + ret = of_property_read_u32(np, "reg", &sreg->control_reg); + if (ret) { + dev_err(dev, "no reg property set\n"); + goto anatop_probe_end; + } + ret = of_property_read_u32(np, "anatop-vol-bit-width", + &sreg->vol_bit_width); + if (ret) { + dev_err(dev, "no anatop-vol-bit-width property set\n"); + goto anatop_probe_end; + } + ret = of_property_read_u32(np, "anatop-vol-bit-shift", + &sreg->vol_bit_shift); + if (ret) { + dev_err(dev, "no anatop-vol-bit-shift property set\n"); + goto anatop_probe_end; + } + ret = of_property_read_u32(np, "anatop-min-bit-val", + &sreg->min_bit_val); + if (ret) { + dev_err(dev, "no anatop-min-bit-val property set\n"); + goto anatop_probe_end; + } + ret = of_property_read_u32(np, "anatop-min-voltage", + &sreg->min_voltage); + if (ret) { + dev_err(dev, "no anatop-min-voltage property set\n"); + goto anatop_probe_end; + } + ret = of_property_read_u32(np, "anatop-max-voltage", + &sreg->max_voltage); + if (ret) { + dev_err(dev, "no anatop-max-voltage property set\n"); + goto anatop_probe_end; + } + + /* register regulator */ + rdev = regulator_register(rdesc, dev, + initdata, sreg, pdev->dev.of_node); + if (IS_ERR(rdev)) { + dev_err(dev, "failed to register %s\n", + rdesc->name); + ret = PTR_ERR(rdev); + goto anatop_probe_end; + } + + platform_set_drvdata(pdev, rdev); + +anatop_probe_end: + if (ret) + kfree(sreg->name); + + return ret; +} + +static int __devexit anatop_regulator_remove(struct platform_device *pdev) +{ + struct regulator_dev *rdev = platform_get_drvdata(pdev); + struct anatop_regulator *sreg = rdev_get_drvdata(rdev); + const char *name = sreg->name; + + regulator_unregister(rdev); + kfree(name); + + return 0; +} + +static struct of_device_id __devinitdata of_anatop_regulator_match_tbl[] = { + { .compatible = "fsl,anatop-regulator", }, + { /* end */ } +}; + +static struct platform_driver anatop_regulator = { + .driver = { + .name = "anatop_regulator", + .owner = THIS_MODULE, + .of_match_table = of_anatop_regulator_match_tbl, + }, + .probe = anatop_regulator_probe, + .remove = anatop_regulator_remove, +}; + +static int __init anatop_regulator_init(void) +{ + return platform_driver_register(&anatop_regulator); +} +postcore_initcall(anatop_regulator_init); + +static void __exit anatop_regulator_exit(void) +{ + platform_driver_unregister(&anatop_regulator); +} +module_exit(anatop_regulator_exit); + +MODULE_AUTHOR("Nancy Chen <Nancy.Chen(a)freescale.com>, " + "Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org>"); +MODULE_DESCRIPTION("ANATOP Regulator driver"); +MODULE_LICENSE("GPL v2"); -- 1.7.9.1

12 years, 2 months

[PATCH v10] Regulator: Add Anatop regulator driver

by Ying-Chun Liu (PaulLiu)

From: "Ying-Chun Liu (PaulLiu)" <paul.liu(a)linaro.org> Anatop is an integrated regulator inside i.MX6 SoC. There are 3 digital regulators which controls PU, CORE (ARM), and SOC. And 3 analog regulators which controls 1P1, 2P5, 3P0 (USB). This patch adds the Anatop regulator driver. Signed-off-by: Nancy Chen <Nancy.Chen(a)freescale.com> Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org> Acked-by: Shawn Guo <shawn.guo(a)linaro.org> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg(a)ti.com> Cc: Samuel Ortiz <sameo(a)linux.intel.com> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> Cc: Axel Lin <axel.lin(a)gmail.com> --- .../bindings/regulator/anatop-regulator.txt | 28 +++ drivers/regulator/Kconfig | 8 + drivers/regulator/Makefile | 1 + drivers/regulator/anatop-regulator.c | 236 ++++++++++++++++++++ 4 files changed, 273 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/regulator/anatop-regulator.txt create mode 100644 drivers/regulator/anatop-regulator.c diff --git a/Documentation/devicetree/bindings/regulator/anatop-regulator.txt b/Documentation/devicetree/bindings/regulator/anatop-regulator.txt new file mode 100644 index 0000000..73363e76 --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/anatop-regulator.txt @@ -0,0 +1,28 @@ +Anatop Voltage regulators + +Required properties: +- compatible: Must be "fsl,anatop-regulator" +- anatop-vol-bit-shift: Bit shift for the register +- anatop-vol-bit-width: Number of bits used in the register +- anatop-min-bit-val: Minimum value of this register +- anatop-min-voltage: Minimum voltage of this regulator +- anatop-max-voltage: Maximum voltage of this regulator + +Any property defined as part of the core regulator +binding, defined in regulator.txt, can also be used. + +Example: + + reg_vddpu: regulator-vddpu@140 { + compatible = "fsl,anatop-regulator"; + regulator-name = "vddpu"; + regulator-min-microvolt = <725000>; + regulator-max-microvolt = <1300000>; + regulator-always-on; + reg = <0x140>; + anatop-vol-bit-shift = <9>; + anatop-vol-bit-width = <5>; + anatop-min-bit-val = <1>; + anatop-min-voltage = <725000>; + anatop-max-voltage = <1300000>; + }; diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 7a61b17..3857209 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -213,6 +213,14 @@ config REGULATOR_PCAP This driver provides support for the voltage regulators of the PCAP2 PMIC. +config REGULATOR_ANATOP + tristate "Freescale i.MX on-chip ANATOP LDO regulators" + depends on MFD_ANATOP + help + Say y here to support Freescale i.MX on-chip ANATOP LDOs + regulators. It is recommended that this option be + enabled on i.MX6 platform. + config REGULATOR_MC13XXX_CORE tristate diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 503bac8..8440871 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -48,5 +48,6 @@ obj-$(CONFIG_REGULATOR_AB8500) += ab8500.o obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o +obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c new file mode 100644 index 0000000..133a17b --- /dev/null +++ b/drivers/regulator/anatop-regulator.c @@ -0,0 +1,236 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + */ + +/* + * 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. + + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <linux/slab.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/mfd/anatop.h> +#include <linux/regulator/driver.h> +#include <linux/regulator/of_regulator.h> + +struct anatop_regulator { + const char *name; + u32 control_reg; + struct anatop *mfd; + int vol_bit_shift; + int vol_bit_width; + int min_bit_val; + int min_voltage; + int max_voltage; + struct regulator_desc rdesc; + struct regulator_init_data *initdata; +}; + +static int anatop_set_voltage(struct regulator_dev *reg, int min_uV, + int max_uV, unsigned *selector) +{ + struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); + u32 val, sel; + int uv; + + uv = min_uV; + dev_dbg(&reg->dev, "%s: uv %d, min %d, max %d\n", __func__, + uv, anatop_reg->min_voltage, + anatop_reg->max_voltage); + + if (uv < anatop_reg->min_voltage) { + if (max_uV > anatop_reg->min_voltage) + uv = anatop_reg->min_voltage; + else + return -EINVAL; + } + + if (anatop_reg->control_reg) { + sel = (uv - anatop_reg->min_voltage) / 25000; + if (sel * 25000 + anatop_reg->min_voltage + > anatop_reg->max_voltage) + return -EINVAL; + val = anatop_reg->min_bit_val + sel; + *selector = sel; + dev_dbg(&reg->dev, "%s: calculated val %d\n", __func__, val); + anatop_set_bits(anatop_reg->mfd, + anatop_reg->control_reg, + anatop_reg->vol_bit_shift, + anatop_reg->vol_bit_width, + val); + return 0; + } else { + return -ENOTSUPP; + } +} + +static int anatop_get_voltage_sel(struct regulator_dev *reg) +{ + struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); + int selector; + + if (anatop_reg->control_reg) { + u32 val = anatop_get_bits(anatop_reg->mfd, + anatop_reg->control_reg, + anatop_reg->vol_bit_shift, + anatop_reg->vol_bit_width); + selector = val - anatop_reg->min_bit_val; + return selector; + } else { + return -ENOTSUPP; + } +} + +static int anatop_list_voltage(struct regulator_dev *reg, unsigned selector) +{ + struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); + int uv; + + uv = anatop_reg->min_voltage + selector * 25000; + dev_dbg(&reg->dev, "vddio = %d, selector = %u\n", uv, selector); + + return uv; +} + +static struct regulator_ops anatop_rops = { + .set_voltage = anatop_set_voltage, + .get_voltage_sel = anatop_get_voltage_sel, + .list_voltage = anatop_list_voltage, +}; + +static int __devinit anatop_regulator_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct regulator_desc *rdesc; + struct regulator_dev *rdev; + struct anatop_regulator *sreg; + struct regulator_init_data *initdata; + struct anatop *anatopmfd = dev_get_drvdata(pdev->dev.parent); + int ret = 0; + + initdata = of_get_regulator_init_data(dev, np); + sreg = devm_kzalloc(dev, sizeof(*sreg), GFP_KERNEL); + if (!sreg) + return -ENOMEM; + sreg->initdata = initdata; + sreg->name = kstrdup(of_get_property(np, "regulator-name", NULL), + GFP_KERNEL); + rdesc = &sreg->rdesc; + memset(rdesc, 0, sizeof(*rdesc)); + rdesc->name = sreg->name; + rdesc->ops = &anatop_rops; + rdesc->type = REGULATOR_VOLTAGE; + rdesc->owner = THIS_MODULE; + sreg->mfd = anatopmfd; + if (of_property_read_u32(np, "reg", &sreg->control_reg)) { + dev_err(&pdev->dev, "no reg property set\n"); + ret = -ENODEV; + goto anatop_probe_end; + } + if (of_property_read_u32(np, "anatop-vol-bit-width", + &sreg->vol_bit_width)) { + dev_err(&pdev->dev, "no anatop-vol-bit-width property set\n"); + ret = -ENODEV; + goto anatop_probe_end; + } + if (of_property_read_u32(np, "anatop-vol-bit-shift", + &sreg->vol_bit_shift)) { + dev_err(&pdev->dev, "no anatop-vol-bit-shift property set\n"); + ret = -ENODEV; + goto anatop_probe_end; + } + if (of_property_read_u32(np, "anatop-min-bit-val", + &sreg->min_bit_val)) { + dev_err(&pdev->dev, "no anatop-min-bit-val property set\n"); + ret = -ENODEV; + goto anatop_probe_end; + } + if (of_property_read_u32(np, "anatop-min-voltage", + &sreg->min_voltage)) { + dev_err(&pdev->dev, "no anatop-min-voltage property set\n"); + ret = -ENODEV; + goto anatop_probe_end; + } + if (of_property_read_u32(np, "anatop-max-voltage", + &sreg->max_voltage)) { + dev_err(&pdev->dev, "no anatop-max-voltage property set\n"); + ret = -ENODEV; + goto anatop_probe_end; + } + + /* register regulator */ + rdev = regulator_register(rdesc, &pdev->dev, + initdata, sreg, pdev->dev.of_node); + if (IS_ERR(rdev)) { + dev_err(&pdev->dev, "failed to register %s\n", + rdesc->name); + ret = PTR_ERR(rdev); + goto anatop_probe_end; + } + + platform_set_drvdata(pdev, rdev); + +anatop_probe_end: + if (ret != 0 && sreg->name) + kfree(sreg->name); + return ret; +} + +static int __devexit anatop_regulator_remove(struct platform_device *pdev) +{ + struct regulator_dev *rdev = platform_get_drvdata(pdev); + struct anatop_regulator *sreg = rdev_get_drvdata(rdev); + kfree(sreg->name); + regulator_unregister(rdev); + return 0; +} + +static struct of_device_id __devinitdata of_anatop_regulator_match_tbl[] = { + { .compatible = "fsl,anatop-regulator", }, + { /* end */ } +}; + +static struct platform_driver anatop_regulator = { + .driver = { + .name = "anatop_regulator", + .owner = THIS_MODULE, + .of_match_table = of_anatop_regulator_match_tbl, + }, + .probe = anatop_regulator_probe, + .remove = anatop_regulator_remove, +}; + +static int __init anatop_regulator_init(void) +{ + return platform_driver_register(&anatop_regulator); +} +postcore_initcall(anatop_regulator_init); + +static void __exit anatop_regulator_exit(void) +{ + platform_driver_unregister(&anatop_regulator); +} +module_exit(anatop_regulator_exit); + +MODULE_AUTHOR("Nancy Chen <Nancy.Chen(a)freescale.com>, " + "Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org>"); +MODULE_DESCRIPTION("ANATOP Regulator driver"); +MODULE_LICENSE("GPL v2"); -- 1.7.9.1

12 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev March 2012