diff options
author | Robin Gong <b38343@freescale.com> | 2012-11-22 13:31:05 +0800 |
---|---|---|
committer | Jason Liu <r64343@freescale.com> | 2012-11-28 16:57:02 +0800 |
commit | f7cad7007e37d27ae76aaae4a624afc4a3cd96e6 (patch) | |
tree | 90f9a21dab6ba52166d843ad6440102ba5e56265 /arch/arm/mach-mx6/board-mx6q_sabreauto.c | |
parent | d372bcc67c15e3056ead11588714a910d5c668ec (diff) |
ENGR00234411-1 Sabreauto: fix error print COULD NOT SET GP VOLTAGE.
Didn't take more care about non-pfuze board, and there is two place in BSP will
call "mx6_cpu_regulator_init". It means regulator_get will be called twice on
every vddcore/vddsoc regulator. Then one value need set twice ,because from
regulator core view, there is two regulators share the same regulator. The non-
validate one will return error and print "COULD NOT SET GP VOLTAGE!!!!." on
Sabreauto board. The same as Sabrelite and ARM2 board.
Meanwhile, Sabreauto need be configured LDO bypass default.
Signed-off-by: Robin Gong <b38343@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_sabreauto.c')
-rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index 95b9e0a95af3..e191e1de38b6 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -1285,9 +1285,8 @@ static struct mxc_mlb_platform_data mx6_sabreauto_mlb150_data = { }; static struct mxc_dvfs_platform_data sabreauto_dvfscore_data = { - .reg_id = "cpu_vddgp", - .soc_id = "cpu_vddsoc", - .pu_id = "cpu_vddvpu", + .reg_id = "VDDCORE", + .soc_id = "VDDSOC", .clk1_id = "cpu_clk", .clk2_id = "gpc_dvfs_clk", .gpc_cntr_offset = MXC_GPC_CNTR_OFFSET, @@ -1525,7 +1524,6 @@ static void __init mx6_board_init(void) gp_reg_id = sabreauto_dvfscore_data.reg_id; soc_reg_id = sabreauto_dvfscore_data.soc_id; - pu_reg_id = sabreauto_dvfscore_data.pu_id; mx6q_sabreauto_init_uart(); imx6q_add_mipi_csi2(&mipi_csi2_pdata); if (cpu_is_mx6dl()) { @@ -1603,7 +1601,6 @@ static void __init mx6_board_init(void) imx6q_add_vpu(); imx6q_init_audio(); platform_device_register(&sabreauto_vmmc_reg_devices); - mx6_cpu_regulator_init(); imx_asrc_data.asrc_core_clk = clk_get(NULL, "asrc_clk"); imx_asrc_data.asrc_audio_clk = clk_get(NULL, "asrc_serial_clk"); imx6q_add_asrc(&imx_asrc_data); |