From e1faf299fe5aa4e93e20890d63ad15081a9819b3 Mon Sep 17 00:00:00 2001 From: singhome_lee Date: Mon, 1 Apr 2013 15:37:42 +0800 Subject: [PATCH] power: remove unused regulator definition from board file. Remove "8921_usb_otg", "8921_hdmi_mvs" and "ext_5v" regulator to save about 15mA suspend averagecurrent. Change-Id: I8c0a1ce02ba15c9723be1614d18984af91e46cc1 Signed-off-by: singhome_lee Signed-off-by: Iliyan Malchev --- .../arm/mach-msm/asustek/flo/board-flo-pmic.c | 2 -- .../asustek/flo/board-flo-regulator.c | 21 ------------------- arch/arm/mach-msm/asustek/flo/board-flo.c | 10 --------- 3 files changed, 33 deletions(-) diff --git a/arch/arm/mach-msm/asustek/flo/board-flo-pmic.c b/arch/arm/mach-msm/asustek/flo/board-flo-pmic.c index dfd7b749446..b96d7507e68 100755 --- a/arch/arm/mach-msm/asustek/flo/board-flo-pmic.c +++ b/arch/arm/mach-msm/asustek/flo/board-flo-pmic.c @@ -199,8 +199,6 @@ static struct pm8xxx_gpio_init pm8921_mpq_gpios[] __initdata = { /* Initial PM8XXX MPP configurations */ static struct pm8xxx_mpp_init pm8xxx_mpps[] __initdata = { PM8921_MPP_INIT(3, D_OUTPUT, PM8921_MPP_DIG_LEVEL_VPH, DOUT_CTRL_LOW), - /* External 5V regulator enable; shared by HDMI and USB_OTG switches. */ - PM8921_MPP_INIT(7, D_OUTPUT, PM8921_MPP_DIG_LEVEL_VPH, DOUT_CTRL_LOW), PM8921_MPP_INIT(8, D_OUTPUT, PM8921_MPP_DIG_LEVEL_S4, DOUT_CTRL_LOW), /*MPP9 is used to detect docking station connection/removal on Liquid*/ PM8921_MPP_INIT(9, D_INPUT, PM8921_MPP_DIG_LEVEL_S4, DIN_TO_INT), diff --git a/arch/arm/mach-msm/asustek/flo/board-flo-regulator.c b/arch/arm/mach-msm/asustek/flo/board-flo-regulator.c index ead37c4fe6f..ce0972ef946 100644 --- a/arch/arm/mach-msm/asustek/flo/board-flo-regulator.c +++ b/arch/arm/mach-msm/asustek/flo/board-flo-regulator.c @@ -227,10 +227,6 @@ VREG_CONSUMERS(LVS7) = { REGULATOR_SUPPLY("dsi1_vddio", "mipi_dsi.1"), REGULATOR_SUPPLY("hdmi_vdda", "hdmi_msm.0"), }; -VREG_CONSUMERS(USB_OTG) = { - REGULATOR_SUPPLY("8921_usb_otg", NULL), - REGULATOR_SUPPLY("vbus_otg", "msm_otg"), -}; VREG_CONSUMERS(8821_S0) = { REGULATOR_SUPPLY("8821_s0", NULL), REGULATOR_SUPPLY("krait2", "acpuclk-8064"), @@ -280,18 +276,9 @@ VREG_CONSUMERS(LVS2) = { REGULATOR_SUPPLY("8921_lvs2", NULL), REGULATOR_SUPPLY("iris_vdddig", "wcnss_wlan.0"), }; -VREG_CONSUMERS(HDMI_MVS) = { - REGULATOR_SUPPLY("8921_hdmi_mvs", NULL), - REGULATOR_SUPPLY("hdmi_mvs", "hdmi_msm.0"), -}; VREG_CONSUMERS(NCP) = { REGULATOR_SUPPLY("8921_ncp", NULL), }; -VREG_CONSUMERS(EXT_5V) = { - REGULATOR_SUPPLY("ext_5v", NULL), - REGULATOR_SUPPLY("vbus", "msm_ehci_host.0"), -}; - /* Regulators that are only present when using PM8917 */ VREG_CONSUMERS(8917_S1) = { REGULATOR_SUPPLY("8921_s1", NULL), @@ -554,7 +541,6 @@ VREG_CONSUMERS(BOOST) = { struct gpio_regulator_platform_data apq8064_gpio_regulator_pdata[] __devinitdata = { /* ID vreg_name gpio_label gpio supply */ - GPIO_VREG(EXT_5V, "ext_5v", "ext_5v_en", PM8921_MPP_PM_TO_SYS(7), NULL), /* GPIO_VREG(EXT_3P3V, "ext_3p3v", "ext_3p3v_en", APQ8064_EXT_3P3V_REG_EN_GPIO, NULL), GPIO_VREG(EXT_TS_SW, "ext_ts_sw", "ext_ts_sw_en", @@ -596,10 +582,6 @@ msm8064_pm8921_regulator_pdata[] __devinitdata = { */ PM8XXX_NLDO1200(L26, "8921_l26", 0, 1, 375000, 1050000, 200, "8921_s7", 0, 1), - - /* ID name always_on pd en_t supply reg_ID */ - PM8XXX_VS300(USB_OTG, "8921_usb_otg", 0, 0, 0, "ext_5v", 2), - PM8XXX_VS300(HDMI_MVS, "8921_hdmi_mvs", 0, 1, 0, "ext_5v", 3), }; /* PM8917 regulator constraints */ @@ -630,9 +612,6 @@ msm8064_pm8917_regulator_pdata[] __devinitdata = { * ID name always_on min_uV max_uV en_t supply reg_ID */ PM8XXX_BOOST(BOOST, "8917_boost", 0, 5000000, 5000000, 500, NULL, 9), - - /* ID name always_on pd en_t supply reg_ID */ - PM8XXX_VS300(USB_OTG, "8921_usb_otg", 0, 1, 0, "8917_boost", 10), }; static struct rpm_regulator_init_data diff --git a/arch/arm/mach-msm/asustek/flo/board-flo.c b/arch/arm/mach-msm/asustek/flo/board-flo.c index 4f58e2ce43d..8233c3b83e3 100644 --- a/arch/arm/mach-msm/asustek/flo/board-flo.c +++ b/arch/arm/mach-msm/asustek/flo/board-flo.c @@ -2373,15 +2373,6 @@ static void __init mpq8064_pcie_init(void) } } -static struct platform_device apq8064_device_ext_5v_vreg __devinitdata = { - .name = GPIO_REGULATOR_DEV_NAME, - .id = PM8921_MPP_PM_TO_SYS(7), - .dev = { - .platform_data - = &apq8064_gpio_regulator_pdata[GPIO_VREG_ID_EXT_5V], - }, -}; - static struct platform_device apq8064_device_ext_mpp8_vreg __devinitdata = { .name = GPIO_REGULATOR_DEV_NAME, .id = PM8921_MPP_PM_TO_SYS(8), @@ -2451,7 +2442,6 @@ static struct platform_device *early_common_devices[] __initdata = { }; static struct platform_device *pm8921_common_devices[] __initdata = { - &apq8064_device_ext_5v_vreg, &apq8064_device_ext_mpp8_vreg, //&apq8064_device_ext_3p3v_vreg, &apq8064_device_ssbi_pmic1,