Merge branch 'regulator-5.1' into regulator-next

2019-03-04 15:32:43 +00:00
parent c364098fe8 e5680c4de3
commit 88f268a5bc
89 changed files with 2338 additions and 1380 deletions
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -330,7 +330,6 @@ static struct fixed_voltage_config pandora_vwlan = {
 	.supply_name		= "vwlan",
 	.microvolts		= 1800000, /* 1.8V */
 	.startup_delay		= 50000, /* 50ms */
-	.enable_high		= 1,
 	.init_data		= &pandora_vmmc3,
 };