diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2012-04-10 23:44:16 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-11 09:51:01 +0200 |
| commit | 6c727af2c27d84f26a04a8075890f575ebf91814 (patch) | |
| tree | e99be7e11faf5939c933c7d9f3903376d68dadb0 /arch/arm/boards/pcm038/pcm038.c | |
| parent | e400e0b5925f14538f826ceeb5f0f0608c88d330 (diff) | |
| download | barebox-6c727af2c27d84f26a04a8075890f575ebf91814.tar.gz barebox-6c727af2c27d84f26a04a8075890f575ebf91814.tar.xz | |
Final switch to use combined driver mc13xxx
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/pcm038/pcm038.c')
| -rw-r--r-- | arch/arm/boards/pcm038/pcm038.c | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index 01129bb291..d481bdc576 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/arch/arm/boards/pcm038/pcm038.c @@ -28,7 +28,6 @@ #include <mach/gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> -#include <mach/pmic.h> #include <partition.h> #include <fs.h> #include <fcntl.h> @@ -45,6 +44,7 @@ #include <mach/spi.h> #include <mach/iomux-mx27.h> #include <mach/devices-imx27.h> +#include <mfd/mc13xxx.h> #include "pll.h" @@ -62,7 +62,7 @@ static struct spi_imx_master pcm038_spi_0_data = { static struct spi_board_info pcm038_spi_board_info[] = { { - .name = "mc13783", + .name = "mc13xxx-spi", .max_speed_hz = 3000000, .bus_num = 0, .chip_select = 0, @@ -306,6 +306,35 @@ static int pcm038_console_init(void) console_initcall(pcm038_console_init); +#ifdef CONFIG_MFD_MC13XXX +static int pmic_power(void) +{ + struct mc13xxx *mc13xxx; + + mc13xxx = mc13xxx_get(); + if (!mc13xxx) + return -ENODEV; + + mc13xxx_reg_write(mc13xxx, MC13783_REG_SWITCHERS(0), + MC13783_SWX_VOLTAGE(MC13783_SWX_VOLTAGE_1_450) | + MC13783_SWX_VOLTAGE_DVS(MC13783_SWX_VOLTAGE_1_450) | + MC13783_SWX_VOLTAGE_STANDBY(MC13783_SWX_VOLTAGE_1_450)); + + mc13xxx_reg_write(mc13xxx, MC13783_REG_SWITCHERS(4), + MC13783_SW1A_MODE(MC13783_SWX_MODE_NO_PULSE_SKIP) | + MC13783_SW1A_MODE_STANDBY(MC13783_SWX_MODE_NO_PULSE_SKIP) | + MC13783_SW1A_SOFTSTART | + MC13783_SW1B_MODE(MC13783_SWX_MODE_NO_PULSE_SKIP) | + MC13783_SW1B_MODE_STANDBY(MC13783_SWX_MODE_NO_PULSE_SKIP) | + MC13783_SW1B_SOFTSTART | + MC13783_SW_PLL_FACTOR(32)); + + return 0; +} +#else +# define pmic_power() (1) +#endif + /** * The spctl0 register is a beast: Seems you can read it * only one times without writing it again. @@ -326,15 +355,13 @@ static inline uint32_t get_pll_spctl10(void) static int pcm038_power_init(void) { uint32_t spctl0; - int ret; spctl0 = get_pll_spctl10(); /* PLL registers already set to their final values? */ if (spctl0 == SPCTL0_VAL && MPCTL0 == MPCTL0_VAL) { console_flush(); - ret = pmic_power(); - if (ret == 0) { + if (!pmic_power()) { /* wait for required power level to run the CPU at 400 MHz */ udelay(100000); CSCR = CSCR_VAL_FINAL; |