diff options
| author | Mahesh Mahadevan <r9aadq@freescale.com> | 2011-11-11 08:39:16 -0600 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 21:06:13 +0800 |
| commit | da7e5127af69c075bce2047228a03d209c0022c2 (patch) | |
| tree | 404f84504869d0abd17d6322df03acfcb2ccbd98 | |
| parent | 7eb3cf821b7a250dbfb4f7b3e04c0ec837f941d0 (diff) | |
ENGR00162048 Align the MX6 Sabrelite set_cpu_voltage() with ARM2
Align the implementation, eventually this should go to a common place
across MX6 platforms
Signed-off-by: Mahesh Mahadevan <r9aadq@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index 8fef605b8929..aa7be0b3d2a6 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -16,7 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #include <linux/types.h> #include <linux/sched.h> #include <linux/delay.h> @@ -30,6 +29,7 @@ #include <linux/platform_device.h> #include <linux/fsl_devices.h> #include <linux/spi/spi.h> +#include <linux/spi/flash.h> #include <linux/i2c.h> #include <linux/i2c/pca953x.h> #include <linux/ata.h> @@ -46,9 +46,10 @@ #include <linux/memblock.h> #include <linux/gpio.h> #include <linux/etherdevice.h> +#include <linux/regulator/anatop-regulator.h> +#include <linux/regulator/consumer.h> #include <linux/regulator/machine.h> #include <linux/regulator/fixed.h> -#include <linux/spi/flash.h> #include <mach/common.h> #include <mach/hardware.h> @@ -90,6 +91,8 @@ extern struct regulator *(*get_cpu_regulator)(void); extern void (*put_cpu_regulator)(void); extern int (*set_cpu_voltage)(u32 volt); extern int mx6_set_cpu_voltage(u32 cpu_volt); +static struct regulator *cpu_regulator; +static char *gp_reg_id; static iomux_v3_cfg_t mx6q_sabrelite_pads[] = { /* AUDMUX */ @@ -464,7 +467,7 @@ static struct spi_board_info imx6_sabrelite_spi_nor_device[] __initdata = { #if defined(CONFIG_MTD_M25P80) { .modalias = "m25p80", - .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ + .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ .bus_num = 0, .chip_select = 0, .platform_data = &imx6_sabrelite__spi_flash_data, @@ -826,7 +829,15 @@ static struct mxc_dvfs_platform_data sabrelite_dvfscore_data = { static int mx6_sabre_set_cpu_voltage(u32 cpu_volt) { - return mx6_set_cpu_voltage(cpu_volt); + int ret = -EINVAL; + + if (cpu_regulator == NULL) + cpu_regulator = regulator_get(NULL, gp_reg_id); + + if (!IS_ERR(cpu_regulator)) + ret = regulator_set_voltage(cpu_regulator, + cpu_volt, cpu_volt); + return ret; } static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags, |