From: Greg Meiste Date: Fri, 27 Aug 2010 21:38:09 +0000 (-0500) Subject: [ARM] tegra: stingray: Disable SW5 on newer hardware X-Git-Tag: firefly_0821_release~9834^2~611 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f515b956e1a388df5f677417b407e8a64732491;p=firefly-linux-kernel-4.4.55.git [ARM] tegra: stingray: Disable SW5 on newer hardware SW5 is no longer connected on newer hardware. Turn it off. Change-Id: I56442e70adf4fdf7357bf8fc0b634f8b6d4f18cd Signed-off-by: Greg Meiste --- diff --git a/arch/arm/mach-tegra/board-stingray-power.c b/arch/arm/mach-tegra/board-stingray-power.c index fb5c1c6b14c8..a9af95583f36 100644 --- a/arch/arm/mach-tegra/board-stingray-power.c +++ b/arch/arm/mach-tegra/board-stingray-power.c @@ -317,7 +317,7 @@ struct cpcap_spi_init_data stingray_cpcap_spi_init[] = { unsigned short cpcap_regulator_mode_values[CPCAP_NUM_REGULATORS] = { [CPCAP_SW2] = 0x0800, [CPCAP_SW4] = 0x0800, - [CPCAP_SW5] = 0x0022, + [CPCAP_SW5] = 0x0000, [CPCAP_VCAM] = 0x0003, [CPCAP_VCSI] = 0x0003, [CPCAP_VDAC] = 0x0003, @@ -443,7 +443,7 @@ static struct regulator_init_data cpcap_regulator[CPCAP_NUM_REGULATORS] = { .min_uV = 5050000, .max_uV = 5050000, .valid_ops_mask = REGULATOR_CHANGE_STATUS, - .apply_uV = 1, + .boot_on = 1, }, .num_consumer_supplies = ARRAY_SIZE(cpcap_sw5_consumers), .consumer_supplies = cpcap_sw5_consumers, @@ -722,7 +722,7 @@ int __init stingray_power_init(void) writel(pmc_cntrl_0, IO_ADDRESS(TEGRA_PMC_BASE)); if (stingray_revision() <= STINGRAY_REVISION_M1) { - cpcap_regulator[CPCAP_SW5].constraints.boot_on = 1; + cpcap_regulator_mode_values[CPCAP_SW5] = 0x0022; stingray_display_led.led_regulator = "sw5"; stingray_display_led.cpcap_register = CPCAP_REG_KLC,