From 1e1f790584fcf0785378c5e4e456039be905a74f Mon Sep 17 00:00:00 2001 From: sirmordred Date: Sun, 12 Jul 2015 21:40:52 +0300 Subject: [PATCH] part 6 --- arch/arm/mach-msm/board-ancora.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-msm/board-ancora.c b/arch/arm/mach-msm/board-ancora.c index 7eb139e0c64..59edb87e60c 100644 --- a/arch/arm/mach-msm/board-ancora.c +++ b/arch/arm/mach-msm/board-ancora.c @@ -261,7 +261,6 @@ struct pm8xxx_gpio_init_info { extern int board_hw_revision; int on_call_flag; int on_fmradio_flag; -extern int charging_boot; #ifdef CONFIG_SAMSUNG_JACK #ifdef GET_JACK_ADC @@ -5098,7 +5097,7 @@ static struct msm_gpio sdc2_cfg_data[] = { static struct msm_gpio sdc3_cfg_data[] = { {GPIO_CFG(110, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_16MA), "sdc3_clk"}, {GPIO_CFG(111, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc3_cmd"}, - {GPIO_CFG(116, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc3_dat_3"}, +/* {GPIO_CFG(116, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc3_dat_3"},*/ {GPIO_CFG(117, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc3_dat_2"}, {GPIO_CFG(118, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc3_dat_1"}, {GPIO_CFG(119, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc3_dat_0"}, @@ -5109,8 +5108,8 @@ static struct msm_gpio sdc3_sleep_cfg_data[] = { "sdc3_clk"}, {GPIO_CFG(111, 0, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA), "sdc3_cmd"}, - {GPIO_CFG(116, 0, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA), - "sdc3_dat_3"}, +/* {GPIO_CFG(116, 0, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA), + "sdc3_dat_3"},*/ {GPIO_CFG(117, 0, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA), "sdc3_dat_2"}, {GPIO_CFG(118, 0, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA), @@ -5121,11 +5120,11 @@ static struct msm_gpio sdc3_sleep_cfg_data[] = { static struct msm_gpio sdc4_cfg_data[] = { {GPIO_CFG(58, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_16MA), "sdc4_clk"}, - {GPIO_CFG(59, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc4_cmd"}, - {GPIO_CFG(60, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc4_dat_3"}, - {GPIO_CFG(61, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc4_dat_2"}, - {GPIO_CFG(62, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc4_dat_1"}, - {GPIO_CFG(63, 1, GPIO_CFG_OUTPUT, GPIO_CFG_PULL_UP, GPIO_CFG_8MA), "sdc4_dat_0"}, + {GPIO_CFG(59, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_8MA), "sdc4_cmd"}, + {GPIO_CFG(60, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_8MA), "sdc4_dat_3"}, + {GPIO_CFG(61, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_8MA), "sdc4_dat_2"}, + {GPIO_CFG(62, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_8MA), "sdc4_dat_1"}, + {GPIO_CFG(63, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_8MA), "sdc4_dat_0"}, }; static struct sdcc_gpio sdcc_cfg_data[] = { @@ -5864,11 +5863,10 @@ static void __init msm7x30_init_mmc(void) out3: #endif #ifdef CONFIG_MMC_MSM_SDC4_SUPPORT - if (mmc_regulator_init(4, "mmc", 2850000)) + if (mmc_regulator_init(4, "gp10", 2850000)) return; - if (!charging_boot) - msm_add_sdcc(4, &msm7x30_sdc4_data); + msm_add_sdcc(4, &msm7x30_sdc4_data); #endif }