summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2012-06-14 15:21:02 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-06-30 22:37:41 +0200
commit27b1a89e272688c9aee951aca942535837287778 (patch)
tree0e1d06e9fe3813467304cbcefffc2f5cdd408ef0 /arch
parenta264890e50b2241be4c45f0752c64341305f8ae5 (diff)
downloadbarebox-27b1a89e272688c9aee951aca942535837287778.tar.gz
barebox-27b1a89e272688c9aee951aca942535837287778.tar.xz
arm: mxs: add functions to get/set vddio
Needed for ocotp write. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mxs/include/mach/power.h2
-rw-r--r--arch/arm/mach-mxs/power.c38
2 files changed, 40 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/include/mach/power.h b/arch/arm/mach-mxs/include/mach/power.h
index 859a717f77..f429b3c31c 100644
--- a/arch/arm/mach-mxs/include/mach/power.h
+++ b/arch/arm/mach-mxs/include/mach/power.h
@@ -2,5 +2,7 @@
#define __MACH_POWER_H
void imx_power_prepare_usbphy(void);
+int imx_get_vddio(void);
+int imx_set_vddio(int);
#endif /* __MACH_POWER_H */
diff --git a/arch/arm/mach-mxs/power.c b/arch/arm/mach-mxs/power.c
index 4645f52f88..f4d0b9e3e6 100644
--- a/arch/arm/mach-mxs/power.c
+++ b/arch/arm/mach-mxs/power.c
@@ -11,11 +11,14 @@
*/
#include <common.h>
#include <io.h>
+#include <errno.h>
#include <mach/imx-regs.h>
#define POWER_CTRL (IMX_POWER_BASE + 0x0)
#define POWER_CTRL_CLKGATE 0x40000000
+#define POWER_VDDIOCTRL (IMX_POWER_BASE + 0x60)
+
#define POWER_STS (IMX_POWER_BASE + 0xc0)
#define POWER_STS_VBUSVALID 0x00000002
#define POWER_STS_BVALID 0x00000004
@@ -26,6 +29,41 @@
#define POWER_DEBUG_AVALIDPIOLOCK 0x00000004
#define POWER_DEBUG_VBUSVALIDPIOLOCK 0x00000008
+#define TRG_MASK 0x1f
+
+int imx_get_vddio(void)
+{
+ u32 val;
+
+ val = readl(POWER_VDDIOCTRL) & TRG_MASK;
+ if (val > 0x10)
+ val = 0x10;
+
+ return 2800000 + val * 50000;
+}
+
+int imx_set_vddio(int new_voltage_uV)
+{
+ u32 reg, val;
+
+ if (new_voltage_uV < 2800000 || new_voltage_uV > 3600000)
+ return -EINVAL;
+
+ val = (new_voltage_uV - 2800000) / 50000;
+ reg = readl(POWER_VDDIOCTRL) & ~TRG_MASK;
+ writel(reg | val, POWER_VDDIOCTRL);
+
+ /*
+ * Wait for power to become stable. We just wait, because DC_OK can
+ * only detect rising voltages for DCDC. For all other cases, bootlets
+ * also do simple waiting, although horribly nested. We just take the
+ * maximum value of all cases from the bootlets and then add some.
+ */
+ mdelay(30);
+
+ return 2800000 + val * 50000;
+}
+
void imx_power_prepare_usbphy(void)
{
u32 reg;