diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2012-06-14 15:21:00 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-30 22:37:41 +0200 |
commit | a264890e50b2241be4c45f0752c64341305f8ae5 (patch) | |
tree | 86fe6a7f3a30a3f0430dca245e6321d3307cdefb /arch | |
parent | 0ee26030733a9e748753dbf639d8d3992bda77ad (diff) | |
download | barebox-a264890e50b2241be4c45f0752c64341305f8ae5.tar.gz barebox-a264890e50b2241be4c45f0752c64341305f8ae5.tar.xz |
arm: mxs: refactor access to power domain
usbphy initializaion needs to access the power supply and has this
embedded. Refactor to a seperate power.c, since we need other accesses
in the future.
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/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-mxs/include/mach/power.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-mxs/power.c | 46 | ||||
-rw-r--r-- | arch/arm/mach-mxs/usb.c | 30 |
4 files changed, 55 insertions, 29 deletions
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index 172d928128..37b5b8a037 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile @@ -1,4 +1,4 @@ -obj-y += imx.o iomux-imx.o reset-imx.o +obj-y += imx.o iomux-imx.o reset-imx.o power.o obj-$(CONFIG_DRIVER_VIDEO_STM) += imx_lcd_clk.o obj-$(CONFIG_ARCH_IMX23) += speed-imx23.o clocksource-imx23.o usb.o obj-$(CONFIG_ARCH_IMX28) += speed-imx28.o clocksource-imx28.o diff --git a/arch/arm/mach-mxs/include/mach/power.h b/arch/arm/mach-mxs/include/mach/power.h new file mode 100644 index 0000000000..859a717f77 --- /dev/null +++ b/arch/arm/mach-mxs/include/mach/power.h @@ -0,0 +1,6 @@ +#ifndef __MACH_POWER_H +#define __MACH_POWER_H + +void imx_power_prepare_usbphy(void); + +#endif /* __MACH_POWER_H */ diff --git a/arch/arm/mach-mxs/power.c b/arch/arm/mach-mxs/power.c new file mode 100644 index 0000000000..4645f52f88 --- /dev/null +++ b/arch/arm/mach-mxs/power.c @@ -0,0 +1,46 @@ +/* + * i.MX28 power related functions + * + * Copyright 2011 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> + * Copyright (C) 2012 Wolfram Sang, Pengutronix <w.sang@pengutronix.de> + * + * 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. + */ +#include <common.h> +#include <io.h> +#include <mach/imx-regs.h> + +#define POWER_CTRL (IMX_POWER_BASE + 0x0) +#define POWER_CTRL_CLKGATE 0x40000000 + +#define POWER_STS (IMX_POWER_BASE + 0xc0) +#define POWER_STS_VBUSVALID 0x00000002 +#define POWER_STS_BVALID 0x00000004 +#define POWER_STS_AVALID 0x00000008 + +#define POWER_DEBUG (IMX_POWER_BASE + 0x110) +#define POWER_DEBUG_BVALIDPIOLOCK 0x00000002 +#define POWER_DEBUG_AVALIDPIOLOCK 0x00000004 +#define POWER_DEBUG_VBUSVALIDPIOLOCK 0x00000008 + +void imx_power_prepare_usbphy(void) +{ + u32 reg; + + /* + * Set these bits so that we can force the OTG bits high + * so the ARC core operates properly + */ + writel(POWER_CTRL_CLKGATE, POWER_CTRL + BIT_CLR); + + writel(POWER_DEBUG_VBUSVALIDPIOLOCK | + POWER_DEBUG_AVALIDPIOLOCK | + POWER_DEBUG_BVALIDPIOLOCK, POWER_DEBUG + BIT_SET); + + reg = readl(POWER_STS); + reg |= POWER_STS_BVALID | POWER_STS_AVALID | POWER_STS_VBUSVALID; + writel(reg, POWER_STS); +} diff --git a/arch/arm/mach-mxs/usb.c b/arch/arm/mach-mxs/usb.c index b7a93769b7..aca0e7d654 100644 --- a/arch/arm/mach-mxs/usb.c +++ b/arch/arm/mach-mxs/usb.c @@ -20,19 +20,7 @@ #include <common.h> #include <io.h> #include <mach/imx-regs.h> - -#define POWER_CTRL (IMX_POWER_BASE + 0x0) -#define POWER_CTRL_CLKGATE 0x40000000 - -#define POWER_STS (IMX_POWER_BASE + 0xc0) -#define POWER_STS_VBUSVALID 0x00000002 -#define POWER_STS_BVALID 0x00000004 -#define POWER_STS_AVALID 0x00000008 - -#define POWER_DEBUG (IMX_POWER_BASE + 0x110) -#define POWER_DEBUG_BVALIDPIOLOCK 0x00000002 -#define POWER_DEBUG_AVALIDPIOLOCK 0x00000004 -#define POWER_DEBUG_VBUSVALIDPIOLOCK 0x00000008 +#include <mach/power.h> #define USBPHY_PWD (IMX_USBPHY_BASE + 0x0) @@ -51,21 +39,7 @@ int imx_usb_phy_enable(void) { - u32 reg; - - /* - * Set these bits so that we can force the OTG bits high - * so the ARC core operates properly - */ - writel(POWER_CTRL_CLKGATE, POWER_CTRL + CLR); - - writel(POWER_DEBUG_VBUSVALIDPIOLOCK | - POWER_DEBUG_AVALIDPIOLOCK | - POWER_DEBUG_BVALIDPIOLOCK, POWER_DEBUG + SET); - - reg = readl(POWER_STS); - reg |= POWER_STS_BVALID | POWER_STS_AVALID | POWER_STS_VBUSVALID; - writel(reg, POWER_STS); + imx_power_prepare_usbphy(); /* Reset USBPHY module */ writel(USBPHY_CTRL_SFTRST, USBPHY_CTRL + SET); |