From d43b41881470e26f06a6c884632d523b358a7fce Mon Sep 17 00:00:00 2001 From: Robin Gong Date: Tue, 13 Nov 2012 15:06:16 +0800 Subject: ENGR00233366-2 mx6q_sabresd mx6sl_arm2 mx6sl_evk: config in LDO bypass U-boot will not care about ldo bypass, move these code from u-boot to kernel. Move the workaround for PFUZE1.0 to kernel too. Signed-off-by: Robin Gong --- arch/arm/mach-mx6/board-mx6q_sabresd.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'arch/arm/mach-mx6/board-mx6q_sabresd.c') diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index 86f1091cdcf1..69afc3576522 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -1586,14 +1586,8 @@ static struct platform_pwm_backlight_data mx6_sabresd_pwm_backlight_data = { }; static struct mxc_dvfs_platform_data sabresd_dvfscore_data = { -#ifdef CONFIG_MX6_INTER_LDO_BYPASS .reg_id = "VDDCORE", .soc_id = "VDDSOC", -#else - .reg_id = "cpu_vddgp", - .soc_id = "cpu_vddsoc", - .pu_id = "cpu_vddvpu", -#endif .clk1_id = "cpu_clk", .clk2_id = "gpc_dvfs_clk", .gpc_cntr_offset = MXC_GPC_CNTR_OFFSET, @@ -1691,7 +1685,6 @@ static void __init mx6_sabresd_board_init(void) gp_reg_id = sabresd_dvfscore_data.reg_id; soc_reg_id = sabresd_dvfscore_data.soc_id; - pu_reg_id = sabresd_dvfscore_data.pu_id; mx6q_sabresd_init_uart(); /* @@ -1815,9 +1808,6 @@ static void __init mx6_sabresd_board_init(void) imx6q_add_dma(); imx6q_add_dvfs_core(&sabresd_dvfscore_data); -#ifndef CONFIG_MX6_INTER_LDO_BYPASS - mx6_cpu_regulator_init(); -#endif imx6q_add_device_buttons(); /* enable sensor 3v3 and 1v8 */ -- cgit v1.2.3