regulator: gpio: Revert

regulator: fixed/gpio: Revert GPIO descriptor changes due to platform breakage

Commit 6059577cb28 "regulator: fixed: Convert to use GPIO descriptor
only" broke at least the ams-delta platform since the lookup tables
added to the board files use the function name "enable" while the driver
uses NULL causing the regulator to not acquire and control the enable
GPIOs.  Revert that and a couple of other commits that are caught up
with it to fix the issue:

2b6c00c157c5bf80 "ARM: pxa, regulator: fix building ezx e680"
6059577cb28d8b15 "regulator: fixed: Convert to use GPIO descriptor only"
37bed97f00734ce3 "regulator: gpio: Get enable GPIO using GPIO descriptor"

Reported-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

24 files changed, 79 insertions, 219 deletions

diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c
index 5d3b6b4fe6db..5e366824814f 100644
--- a/arch/arm/mach-imx/mach-mx21ads.c
+++ b/arch/arm/mach-imx/mach-mx21ads.c
@@ -18,7 +18,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
 #include <linux/gpio/driver.h>
-#include <linux/gpio/machine.h>
 #include <linux/gpio.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
@@ -176,7 +175,6 @@ static struct resource mx21ads_mmgpio_resource =
         DEFINE_RES_MEM_NAMED(MX21ADS_IO_REG, SZ_2, "dat");
 
 static struct bgpio_pdata mx21ads_mmgpio_pdata = {
-        .label  = "mx21ads-mmgpio",
         .base   = MX21ADS_MMGPIO_BASE,
         .ngpio  = 16,
 };
@@ -205,6 +203,7 @@ static struct regulator_init_data mx21ads_lcd_regulator_init_data = {
 static struct fixed_voltage_config mx21ads_lcd_regulator_pdata = {
         .supply_name    = "LCD",
         .microvolts     = 3300000,
+        .gpio           = MX21ADS_IO_LCDON,
         .enable_high    = 1,
         .init_data      = &mx21ads_lcd_regulator_init_data,
 };
@@ -217,15 +216,6 @@ static struct platform_device mx21ads_lcd_regulator = {
         },
 };
 
-static struct gpiod_lookup_table mx21ads_lcd_regulator_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.0", /* Let's hope ID 0 is what we get */
-        .table = {
-                GPIO_LOOKUP("mx21ads-mmgpio", 9,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 /*
  * Connected is a portrait Sharp-QVGA display
  * of type: LQ035Q7DB02
@@ -321,7 +311,6 @@ static void __init mx21ads_late_init(void)
 {
         imx21_add_mxc_mmc(0, &mx21ads_sdhc_pdata);
 
-        gpiod_add_lookup_table(&mx21ads_lcd_regulator_gpiod_table);
         platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
 
         mx21ads_cs8900_resources[1].start =
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c
index 0fdb88db0cbd..a04bb094ded1 100644
--- a/arch/arm/mach-imx/mach-mx27ads.c
+++ b/arch/arm/mach-imx/mach-mx27ads.c
@@ -16,7 +16,6 @@
 #include <linux/gpio/driver.h>
 /* Needed for gpio_to_irq() */
 #include <linux/gpio.h>
-#include <linux/gpio/machine.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
@@ -231,17 +230,10 @@ static struct regulator_init_data mx27ads_lcd_regulator_init_data = {
 static struct fixed_voltage_config mx27ads_lcd_regulator_pdata = {
         .supply_name    = "LCD",
         .microvolts     = 3300000,
+        .gpio           = MX27ADS_LCD_GPIO,
         .init_data      = &mx27ads_lcd_regulator_init_data,
 };
 
-static struct gpiod_lookup_table mx27ads_lcd_regulator_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.0", /* Let's hope ID 0 is what we get */
-        .table = {
-                GPIO_LOOKUP("LCD", 0, "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 static void __init mx27ads_regulator_init(void)
 {
         struct gpio_chip *vchip;
@@ -255,8 +247,6 @@ static void __init mx27ads_regulator_init(void)
         vchip->set              = vgpio_set;
         gpiochip_add_data(vchip, NULL);
 
-        gpiod_add_lookup_table(&mx27ads_lcd_regulator_gpiod_table);
-
         platform_device_register_data(NULL, "reg-fixed-voltage",
                                       PLATFORM_DEVID_AUTO,
                                       &mx27ads_lcd_regulator_pdata,
diff --git a/arch/arm/mach-mmp/brownstone.c b/arch/arm/mach-mmp/brownstone.c
index 563b5a278d65..d1613b954926 100644
--- a/arch/arm/mach-mmp/brownstone.c
+++ b/arch/arm/mach-mmp/brownstone.c
@@ -15,7 +15,6 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/gpio-pxa.h>
-#include <linux/gpio/machine.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/max8649.h>
 #include <linux/regulator/fixed.h>
@@ -149,6 +148,7 @@ static struct regulator_init_data brownstone_v_5vp_data = {
 static struct fixed_voltage_config brownstone_v_5vp = {
         .supply_name            = "v_5vp",
         .microvolts             = 5000000,
+        .gpio                   = GPIO_5V_ENABLE,
         .enable_high            = 1,
         .enabled_at_boot        = 1,
         .init_data              = &brownstone_v_5vp_data,
@@ -162,15 +162,6 @@ static struct platform_device brownstone_v_5vp_device = {
         },
 };
 
-static struct gpiod_lookup_table brownstone_v_5vp_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.1", /* .id set to 1 above */
-        .table = {
-                GPIO_LOOKUP("gpio-pxa", GPIO_5V_ENABLE,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 static struct max8925_platform_data brownstone_max8925_info = {
         .irq_base               = MMP_NR_IRQS,
 };
@@ -226,7 +217,6 @@ static void __init brownstone_init(void)
         mmp2_add_isram(&mmp2_isram_platdata);
 
         /* enable 5v regulator */
-        gpiod_add_lookup_table(&brownstone_v_5vp_gpiod_table);
         platform_device_register(&brownstone_v_5vp_device);
 }
 
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 759fa18f6ab4..52e8e53ca154 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -12,7 +12,6 @@
  * published by the Free Software Foundation.
  */
 #include <linux/gpio/driver.h>
-#include <linux/gpio/machine.h>
 #include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -204,7 +203,6 @@ static struct resource latch2_resources[] = {
 };
 
 static struct bgpio_pdata latch2_pdata = {
-        .label  = "ams-delta-latch2",
         .base   = AMS_DELTA_LATCH2_GPIO_BASE,
         .ngpio  = AMS_DELTA_LATCH2_NGPIO,
 };
@@ -274,6 +272,7 @@ static struct regulator_init_data modem_nreset_data = {
 static struct fixed_voltage_config modem_nreset_config = {
         .supply_name            = "modem_nreset",
         .microvolts             = 3300000,
+        .gpio                   = AMS_DELTA_GPIO_PIN_MODEM_NRESET,
         .startup_delay          = 25000,
         .enable_high            = 1,
         .enabled_at_boot        = 1,
@@ -288,16 +287,6 @@ static struct platform_device modem_nreset_device = {
         },
 };
 
-static struct gpiod_lookup_table modem_nreset_gpiod_table = {
-        .dev_id = "reg-fixed-voltage",
-        .table = {
-                /* The AMS_DELTA_GPIO_PIN_MODEM_NRESET is at offset 12 */
-                GPIO_LOOKUP("ams-delta-latch2", 12,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 struct modem_private_data {
         struct regulator *regulator;
 };
@@ -581,7 +570,6 @@ static int __init late_init(void)
 
         platform_add_devices(late_devices, ARRAY_SIZE(late_devices));
 
-        gpiod_add_lookup_table(&modem_nreset_gpiod_table);
         err = platform_device_register(&modem_nreset_device);
         if (err) {
                 pr_err("Couldn't register the modem regulator device\n");
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 7d1447204fb8..6459816c2879 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -10,7 +10,6 @@
 #include <linux/clk.h>
 #include <linux/davinci_emac.h>
 #include <linux/gpio.h>
-#include <linux/gpio/machine.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
@@ -331,6 +330,7 @@ static struct regulator_init_data pandora_vmmc3 = {
 static struct fixed_voltage_config pandora_vwlan = {
         .supply_name            = "vwlan",
         .microvolts             = 1800000, /* 1.8V */
+        .gpio                   = PANDORA_WIFI_NRESET_GPIO,
         .startup_delay          = 50000, /* 50ms */
         .enable_high            = 1,
         .init_data              = &pandora_vmmc3,
@@ -344,19 +344,6 @@ static struct platform_device pandora_vwlan_device = {
         },
 };
 
-static struct gpiod_lookup_table pandora_vwlan_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.1",
-        .table = {
-                /*
-                 * As this is a low GPIO number it should be at the first
-                 * GPIO bank.
-                 */
-                GPIO_LOOKUP("gpio-0-31", PANDORA_WIFI_NRESET_GPIO,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 static void pandora_wl1251_init_card(struct mmc_card *card)
 {
         /*
@@ -418,7 +405,6 @@ fail:
 static void __init omap3_pandora_legacy_init(void)
 {
         platform_device_register(&pandora_backlight);
-        gpiod_add_lookup_table(&pandora_vwlan_gpiod_table);
         platform_device_register(&pandora_vwlan_device);
         omap_hsmmc_init(pandora_mmc3);
         omap_hsmmc_late_init(pandora_mmc3);
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 6d7d93981098..49022ad338e9 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -987,6 +987,7 @@ static struct fixed_voltage_config camera_dummy_config = {
         .supply_name            = "camera_vdd",
         .input_supply           = "vcc cam",
         .microvolts             = 2800000,
+        .gpio                   = -1,
         .enable_high            = 0,
         .init_data              = &camera_dummy_initdata,
 };
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c
index 4f33eea73f9a..2c90b58f347d 100644
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@ -21,7 +21,6 @@
 #include <linux/regulator/fixed.h>
 #include <linux/input.h>
 #include <linux/gpio.h>
-#include <linux/gpio/machine.h>
 #include <linux/gpio_keys.h>
 #include <linux/leds-lp3944.h>
 #include <linux/platform_data/i2c-pxa.h>
@@ -699,39 +698,31 @@ static struct pxa27x_keypad_platform_data e2_keypad_platform_data = {
 
 #if defined(CONFIG_MACH_EZX_A780) || defined(CONFIG_MACH_EZX_A910)
 /* camera */
-static struct regulator_consumer_supply camera_regulator_supplies[] = {
+static struct regulator_consumer_supply camera_dummy_supplies[] = {
         REGULATOR_SUPPLY("vdd", "0-005d"),
 };
 
-static struct regulator_init_data camera_regulator_initdata = {
-        .consumer_supplies = camera_regulator_supplies,
-        .num_consumer_supplies = ARRAY_SIZE(camera_regulator_supplies),
+static struct regulator_init_data camera_dummy_initdata = {
+        .consumer_supplies = camera_dummy_supplies,
+        .num_consumer_supplies = ARRAY_SIZE(camera_dummy_supplies),
         .constraints = {
                 .valid_ops_mask = REGULATOR_CHANGE_STATUS,
         },
 };
 
-static struct fixed_voltage_config camera_regulator_config = {
+static struct fixed_voltage_config camera_dummy_config = {
         .supply_name            = "camera_vdd",
         .microvolts             = 2800000,
+        .gpio                   = GPIO50_nCAM_EN,
         .enable_high            = 0,
-        .init_data              = &camera_regulator_initdata,
+        .init_data              = &camera_dummy_initdata,
 };
 
-static struct platform_device camera_supply_regulator_device = {
+static struct platform_device camera_supply_dummy_device = {
         .name   = "reg-fixed-voltage",
         .id     = 1,
         .dev    = {
-                .platform_data = &camera_regulator_config,
-        },
-};
-
-static struct gpiod_lookup_table camera_supply_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.1",
-        .table = {
-                GPIO_LOOKUP("gpio-pxa", GPIO50_nCAM_EN,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
+                .platform_data = &camera_dummy_config,
         },
 };
 #endif
@@ -809,7 +800,7 @@ static struct i2c_board_info a780_i2c_board_info[] = {
 
 static struct platform_device *a780_devices[] __initdata = {
         &a780_gpio_keys,
-        &camera_supply_regulator_device,
+        &camera_supply_dummy_device,
 };
 
 static void __init a780_init(void)
@@ -832,7 +823,6 @@ static void __init a780_init(void)
         if (a780_camera_init() == 0)
                 pxa_set_camera_info(&a780_pxacamera_platform_data);
 
-        gpiod_add_lookup_table(&camera_supply_gpiod_table);
         pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup));
         platform_add_devices(ARRAY_AND_SIZE(ezx_devices));
         platform_add_devices(ARRAY_AND_SIZE(a780_devices));
@@ -1108,7 +1098,7 @@ static struct i2c_board_info __initdata a910_i2c_board_info[] = {
 
 static struct platform_device *a910_devices[] __initdata = {
         &a910_gpio_keys,
-        &camera_supply_regulator_device,
+        &camera_supply_dummy_device,
 };
 
 static void __init a910_init(void)
@@ -1131,7 +1121,6 @@ static void __init a910_init(void)
         if (a910_camera_init() == 0)
                 pxa_set_camera_info(&a910_pxacamera_platform_data);
 
-        gpiod_add_lookup_table(&camera_supply_gpiod_table);
         pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup));
         platform_add_devices(ARRAY_AND_SIZE(ezx_devices));
         platform_add_devices(ARRAY_AND_SIZE(a910_devices));
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 6717a10180eb..e2e7f247a645 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -20,7 +20,6 @@
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/gpio.h>
-#include <linux/gpio/machine.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/input/navpoint.h>
@@ -712,6 +711,7 @@ static struct gpio_regulator_state bq24022_states[] = {
 static struct gpio_regulator_config bq24022_info = {
         .supply_name = "bq24022",
 
+        .enable_gpio = GPIO72_HX4700_BQ24022_nCHARGE_EN,
         .enable_high = 0,
         .enabled_at_boot = 0,
 
@@ -733,15 +733,6 @@ static struct platform_device bq24022 = {
         },
 };
 
-static struct gpiod_lookup_table bq24022_gpiod_table = {
-        .dev_id = "gpio-regulator",
-        .table = {
-                GPIO_LOOKUP("gpio-pxa", GPIO72_HX4700_BQ24022_nCHARGE_EN,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 /*
  * StrataFlash
  */
@@ -884,7 +875,6 @@ static void __init hx4700_init(void)
         pxa_set_btuart_info(NULL);
         pxa_set_stuart_info(NULL);
 
-        gpiod_add_lookup_table(&bq24022_gpiod_table);
         platform_add_devices(devices, ARRAY_SIZE(devices));
         pwm_add_table(hx4700_pwm_lookup, ARRAY_SIZE(hx4700_pwm_lookup));
 
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 9a5bda3ea194..c5325d1ae77b 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -18,7 +18,6 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
-#include <linux/gpio/machine.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/mfd/htc-pasic3.h>
@@ -657,6 +656,7 @@ static struct gpio_regulator_state bq24022_states[] = {
 static struct gpio_regulator_config bq24022_info = {
         .supply_name            = "bq24022",
 
+        .enable_gpio            = GPIO30_MAGICIAN_BQ24022_nCHARGE_EN,
         .enable_high            = 0,
         .enabled_at_boot        = 1,
 
@@ -678,15 +678,6 @@ static struct platform_device bq24022 = {
         },
 };
 
-static struct gpiod_lookup_table bq24022_gpiod_table = {
-        .dev_id = "gpio-regulator",
-        .table = {
-                GPIO_LOOKUP("gpio-pxa", GPIO30_MAGICIAN_BQ24022_nCHARGE_EN,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 /*
  * fixed regulator for ads7846
  */
@@ -705,6 +696,7 @@ static struct regulator_init_data vads7846_regulator = {
 static struct fixed_voltage_config vads7846 = {
         .supply_name    = "vads7846",
         .microvolts     = 3300000, /* probably */
+        .gpio           = -EINVAL,
         .startup_delay  = 0,
         .init_data      = &vads7846_regulator,
 };
@@ -1015,7 +1007,6 @@ static void __init magician_init(void)
         regulator_register_always_on(0, "power", pwm_backlight_supply,
                 ARRAY_SIZE(pwm_backlight_supply), 5000000);
 
-        gpiod_add_lookup_table(&bq24022_gpiod_table);
         platform_add_devices(ARRAY_AND_SIZE(devices));
 }
 
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index ee766e4ebddc..034345546f84 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -886,6 +886,7 @@ static struct regulator_init_data audio_va_initdata = {
 static struct fixed_voltage_config audio_va_config = {
         .supply_name            = "audio_va",
         .microvolts             = 5000000,
+        .gpio                   = GPIO_AUDIO_VA_ENABLE,
         .enable_high            = 1,
         .enabled_at_boot        = 0,
         .init_data              = &audio_va_initdata,
@@ -899,15 +900,6 @@ static struct platform_device audio_va_device = {
         },
 };
 
-static struct gpiod_lookup_table audio_va_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.0",
-        .table = {
-                GPIO_LOOKUP("gpio-pxa", GPIO_AUDIO_VA_ENABLE,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 /* Dummy supplies for Codec's VD/VLC */
 
 static struct regulator_consumer_supply audio_dummy_supplies[] = {
@@ -926,6 +918,7 @@ static struct regulator_init_data audio_dummy_initdata = {
 static struct fixed_voltage_config audio_dummy_config = {
         .supply_name            = "audio_vd",
         .microvolts             = 3300000,
+        .gpio                   = -1,
         .init_data              = &audio_dummy_initdata,
 };
 
@@ -1040,7 +1033,6 @@ static void __init raumfeld_audio_init(void)
         else
                 gpio_direction_output(GPIO_MCLK_RESET, 1);
 
-        gpiod_add_lookup_table(&audio_va_gpiod_table);
         platform_add_devices(ARRAY_AND_SIZE(audio_regulator_devices));
 }
 
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index 58e05afcece0..e3851795d6d7 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -17,7 +17,6 @@
 #include <linux/irq.h>
 #include <linux/pm.h>
 #include <linux/gpio.h>
-#include <linux/gpio/machine.h>
 #include <linux/serial_8250.h>
 #include <linux/dm9000.h>
 #include <linux/mmc/host.h>
@@ -411,6 +410,7 @@ static struct regulator_init_data can_regulator_init_data = {
 static struct fixed_voltage_config can_regulator_pdata = {
         .supply_name    = "CAN_SHDN",
         .microvolts     = 3300000,
+        .gpio           = ZEUS_CAN_SHDN_GPIO,
         .init_data      = &can_regulator_init_data,
 };
 
@@ -422,15 +422,6 @@ static struct platform_device can_regulator_device = {
         },
 };
 
-static struct gpiod_lookup_table can_regulator_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.0",
-        .table = {
-                GPIO_LOOKUP("gpio-pxa", ZEUS_CAN_SHDN_GPIO,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 static struct mcp251x_platform_data zeus_mcp2515_pdata = {
         .oscillator_frequency   = 16*1000*1000,
 };
@@ -547,6 +538,7 @@ static struct regulator_init_data zeus_ohci_regulator_data = {
 static struct fixed_voltage_config zeus_ohci_regulator_config = {
         .supply_name            = "vbus2",
         .microvolts             = 5000000, /* 5.0V */
+        .gpio                   = ZEUS_USB2_PWREN_GPIO,
         .enable_high            = 1,
         .startup_delay          = 0,
         .init_data              = &zeus_ohci_regulator_data,
@@ -560,15 +552,6 @@ static struct platform_device zeus_ohci_regulator_device = {
         },
 };
 
-static struct gpiod_lookup_table zeus_ohci_regulator_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.0",
-        .table = {
-                GPIO_LOOKUP("gpio-pxa", ZEUS_USB2_PWREN_GPIO,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 static struct pxaohci_platform_data zeus_ohci_platform_data = {
         .port_mode      = PMM_NPS_MODE,
         /* Clear Power Control Polarity Low and set Power Sense
@@ -872,8 +855,6 @@ static void __init zeus_init(void)
 
         pxa2xx_mfp_config(ARRAY_AND_SIZE(zeus_pin_config));
 
-        gpiod_add_lookup_table(&can_regulator_gpiod_table);
-        gpiod_add_lookup_table(&zeus_ohci_regulator_gpiod_table);
         platform_add_devices(zeus_devices, ARRAY_SIZE(zeus_devices));
 
         zeus_register_ohci();
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 379424d72ae7..f04650297487 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -352,6 +352,7 @@ static struct fixed_voltage_config wallvdd_pdata = {
         .supply_name = "WALLVDD",
         .microvolts = 5000000,
         .init_data = &wallvdd_data,
+        .gpio = -EINVAL,
 };
 
 static struct platform_device wallvdd_device = {
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 908e5aa831c8..c46fa5dfd2e0 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -222,6 +222,7 @@ static struct fixed_voltage_config smdk6410_b_pwr_5v_pdata = {
         .supply_name = "B_PWR_5V",
         .microvolts = 5000000,
         .init_data = &smdk6410_b_pwr_5v_data,
+        .gpio = -EINVAL,
 };
 
 static struct platform_device smdk6410_b_pwr_5v = {
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index dbb53c520165..575ec085cffa 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -101,7 +101,7 @@ static int __init assabet_init_gpio(void __iomem *reg, u32 def_val)
 
         assabet_bcr_gc = gc;
 
-        return 0;
+        return gc->base;
 }
 
 /*
@@ -471,14 +471,6 @@ static struct fixed_voltage_config assabet_cf_vcc_pdata __initdata = {
         .enable_high = 1,
 };
 
-static struct gpiod_lookup_table assabet_cf_vcc_gpio_table = {
-        .dev_id = "reg-fixed-voltage.0",
-        .table = {
-                GPIO_LOOKUP("assabet", 0, "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 static void __init assabet_init(void)
 {
         /*
@@ -525,11 +517,9 @@ static void __init assabet_init(void)
                         neponset_resources, ARRAY_SIZE(neponset_resources));
 #endif
         } else {
-                gpiod_add_lookup_table(&assabet_cf_vcc_gpio_table);
                 sa11x0_register_fixed_regulator(0, &assabet_cf_vcc_pdata,
-                                        assabet_cf_vcc_consumers,
-                                        ARRAY_SIZE(assabet_cf_vcc_consumers),
-                                        true);
+                                         assabet_cf_vcc_consumers,
+                                         ARRAY_SIZE(assabet_cf_vcc_consumers));
 
         }
 
@@ -812,6 +802,7 @@ fs_initcall(assabet_leds_init);
 
 void __init assabet_init_irq(void)
 {
+        unsigned int assabet_gpio_base;
         u32 def_val;
 
         sa1100_init_irq();
@@ -826,7 +817,9 @@ void __init assabet_init_irq(void)
          *
          * This must precede any driver calls to BCR_set() or BCR_clear().
          */
-        assabet_init_gpio((void *)&ASSABET_BCR, def_val);
+        assabet_gpio_base = assabet_init_gpio((void *)&ASSABET_BCR, def_val);
+
+        assabet_cf_vcc_pdata.gpio = assabet_gpio_base + 0;
 }
 
 MACHINE_START(ASSABET, "Intel-Assabet")
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 800321c6cbd8..7167ddf84a0e 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -348,8 +348,7 @@ void __init sa11x0_init_late(void)
 
 int __init sa11x0_register_fixed_regulator(int n,
         struct fixed_voltage_config *cfg,
-        struct regulator_consumer_supply *supplies, unsigned num_supplies,
-        bool uses_gpio)
+        struct regulator_consumer_supply *supplies, unsigned num_supplies)
 {
         struct regulator_init_data *id;
 
@@ -357,7 +356,7 @@ int __init sa11x0_register_fixed_regulator(int n,
         if (!cfg->init_data)
                 return -ENOMEM;
 
-        if (!uses_gpio)
+        if (cfg->gpio < 0)
                 id->constraints.always_on = 1;
         id->constraints.name = cfg->supply_name;
         id->constraints.min_uV = cfg->microvolts;
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h
index 158a4fd5ca24..5f3cb52fa6ab 100644
--- a/arch/arm/mach-sa1100/generic.h
+++ b/arch/arm/mach-sa1100/generic.h
@@ -54,5 +54,4 @@ void sa11x0_register_pcmcia(int socket, struct gpiod_lookup_table *);
 struct fixed_voltage_config;
 struct regulator_consumer_supply;
 int sa11x0_register_fixed_regulator(int n, struct fixed_voltage_config *cfg,
-        struct regulator_consumer_supply *supplies, unsigned num_supplies,
-        bool uses_gpio);
+        struct regulator_consumer_supply *supplies, unsigned num_supplies);
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index 5bc82e2671c6..22f7fe0b809f 100644
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -102,14 +102,14 @@ static struct fixed_voltage_config shannon_cf_vcc_pdata __initdata = {
         .supply_name = "cf-power",
         .microvolts = 3300000,
         .enabled_at_boot = 1,
+        .gpio = -EINVAL,
 };
 
 static void __init shannon_init(void)
 {
         sa11x0_register_fixed_regulator(0, &shannon_cf_vcc_pdata,
                                         shannon_cf_vcc_consumers,
-                                        ARRAY_SIZE(shannon_cf_vcc_consumers),
-                                        false);
+                                        ARRAY_SIZE(shannon_cf_vcc_consumers));
         sa11x0_register_pcmcia(0, &shannon_pcmcia0_gpio_table);
         sa11x0_register_pcmcia(1, &shannon_pcmcia1_gpio_table);
         sa11x0_ppc_configure_mcp();
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index c296b5c399b7..adc61d14172c 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -633,6 +633,7 @@ static struct regulator_init_data cn12_power_init_data = {
 static struct fixed_voltage_config cn12_power_info = {
         .supply_name = "CN12 SD/MMC Vdd",
         .microvolts = 3300000,
+        .gpio = GPIO_PTB7,
         .enable_high = 1,
         .init_data = &cn12_power_init_data,
 };
@@ -645,16 +646,6 @@ static struct platform_device cn12_power = {
         },
 };
 
-static struct gpiod_lookup_table cn12_power_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.0",
-        .table = {
-                /* Offset 7 on port B */
-                GPIO_LOOKUP("sh7724_pfc", GPIO_PTB7,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 #if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
 /* SDHI0 */
 static struct regulator_consumer_supply sdhi0_power_consumers[] =
@@ -674,6 +665,7 @@ static struct regulator_init_data sdhi0_power_init_data = {
 static struct fixed_voltage_config sdhi0_power_info = {
         .supply_name = "CN11 SD/MMC Vdd",
         .microvolts = 3300000,
+        .gpio = GPIO_PTB6,
         .enable_high = 1,
         .init_data = &sdhi0_power_init_data,
 };
@@ -686,16 +678,6 @@ static struct platform_device sdhi0_power = {
         },
 };
 
-static struct gpiod_lookup_table sdhi0_power_gpiod_table = {
-        .dev_id = "reg-fixed-voltage.1",
-        .table = {
-                /* Offset 6 on port B */
-                GPIO_LOOKUP("sh7724_pfc", GPIO_PTB6,
-                            "enable", GPIO_ACTIVE_HIGH),
-                { },
-        },
-};
-
 static struct tmio_mmc_data sdhi0_info = {
         .chan_priv_tx   = (void *)SHDMA_SLAVE_SDHI0_TX,
         .chan_priv_rx   = (void *)SHDMA_SLAVE_SDHI0_RX,
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c b/arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c
index fc77d69e51d7..4392c15ed9e0 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c
@@ -10,7 +10,7 @@
  * of the License.
  */
 
-#include <linux/gpio/machine.h>
+#include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/fixed.h>
@@ -43,6 +43,7 @@ static struct fixed_voltage_config bcm43xx_vmmc = {
          * real voltage and signaling are still 1.8V.
          */
         .microvolts             = 2000000,              /* 1.8V */
+        .gpio                   = -EINVAL,
         .startup_delay          = 250 * 1000,           /* 250ms */
         .enable_high            = 1,                    /* active high */
         .enabled_at_boot        = 0,                    /* disabled at boot */
@@ -57,23 +58,11 @@ static struct platform_device bcm43xx_vmmc_regulator = {
         },
 };
 
-static struct gpiod_lookup_table bcm43xx_vmmc_gpio_table = {
-        .dev_id = "reg-fixed-voltage.0",
-        .table  = {
-                GPIO_LOOKUP("0000:00:0c.0", -1, "enable", GPIO_ACTIVE_LOW),
-                {}
-        },
-};
-
 static int __init bcm43xx_regulator_register(void)
 {
-        struct gpiod_lookup_table *table = &bcm43xx_vmmc_gpio_table;
-        struct gpiod_lookup *lookup = table->table;
         int ret;
 
-        lookup[0].chip_hwnum = get_gpio_by_name(WLAN_SFI_GPIO_ENABLE_NAME);
-        gpiod_add_lookup_table(table);
-
+        bcm43xx_vmmc.gpio = get_gpio_by_name(WLAN_SFI_GPIO_ENABLE_NAME);
         ret = platform_device_register(&bcm43xx_vmmc_regulator);
         if (ret) {
                 pr_err("%s: vmmc regulator register failed\n", __func__);
diff --git a/drivers/regulator/fixed-helper.c b/drivers/regulator/fixed-helper.c
index 2c6098e6f4bc..777fac6fb4cb 100644
--- a/drivers/regulator/fixed-helper.c
+++ b/drivers/regulator/fixed-helper.c
@@ -43,6 +43,7 @@ struct platform_device *regulator_register_always_on(int id, const char *name,
         }
 
         data->cfg.microvolts = uv;
+        data->cfg.gpio = -EINVAL;
         data->cfg.enabled_at_boot = 1;
         data->cfg.init_data = &data->init_data;
 
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 1142f195529b..988a7472c2ab 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -24,9 +24,10 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/fixed.h>
-#include <linux/gpio/consumer.h>
+#include <linux/gpio.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/regulator/of_regulator.h>
 #include <linux/regulator/machine.h>
 
@@ -77,6 +78,10 @@ of_get_fixed_voltage_config(struct device *dev,
         if (init_data->constraints.boot_on)
                 config->enabled_at_boot = true;
 
+        config->gpio = of_get_named_gpio(np, "gpio", 0);
+        if ((config->gpio < 0) && (config->gpio != -ENOENT))
+                return ERR_PTR(config->gpio);
+
         of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
 
         config->enable_high = of_property_read_bool(np, "enable-active-high");
@@ -97,7 +102,6 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
         struct fixed_voltage_config *config;
         struct fixed_voltage_data *drvdata;
         struct regulator_config cfg = { };
-        enum gpiod_flags gflags;
         int ret;
 
         drvdata = devm_kzalloc(&pdev->dev, sizeof(struct fixed_voltage_data),
@@ -146,28 +150,25 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
 
         drvdata->desc.fixed_uV = config->microvolts;
 
+        if (gpio_is_valid(config->gpio)) {
+                cfg.ena_gpio = config->gpio;
+                if (pdev->dev.of_node)
+                        cfg.ena_gpio_initialized = true;
+        }
         cfg.ena_gpio_invert = !config->enable_high;
         if (config->enabled_at_boot) {
                 if (config->enable_high)
-                        gflags = GPIOD_OUT_HIGH;
+                        cfg.ena_gpio_flags |= GPIOF_OUT_INIT_HIGH;
                 else
-                        gflags = GPIOD_OUT_LOW;
+                        cfg.ena_gpio_flags |= GPIOF_OUT_INIT_LOW;
         } else {
                 if (config->enable_high)
-                        gflags = GPIOD_OUT_LOW;
+                        cfg.ena_gpio_flags |= GPIOF_OUT_INIT_LOW;
                 else
-                        gflags = GPIOD_OUT_HIGH;
+                        cfg.ena_gpio_flags |= GPIOF_OUT_INIT_HIGH;
         }
-        if (config->gpio_is_open_drain) {
-                if (gflags == GPIOD_OUT_HIGH)
-                        gflags = GPIOD_OUT_HIGH_OPEN_DRAIN;
-                else
-                        gflags = GPIOD_OUT_LOW_OPEN_DRAIN;
-        }
-
-        cfg.ena_gpiod = devm_gpiod_get_optional(&pdev->dev, NULL, gflags);
-        if (IS_ERR(cfg.ena_gpiod))
-                return PTR_ERR(cfg.ena_gpiod);
+        if (config->gpio_is_open_drain)
+                cfg.ena_gpio_flags |= GPIOF_OPEN_DRAIN;
 
         cfg.dev = &pdev->dev;
         cfg.init_data = config->init_data;
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 9d6094c4d71c..a86b8997bb54 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -31,7 +31,6 @@
 #include <linux/regulator/of_regulator.h>
 #include <linux/regulator/gpio-regulator.h>
 #include <linux/gpio.h>
-#include <linux/gpio/consumer.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
@@ -162,6 +161,10 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np,
 
         of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
 
+        config->enable_gpio = of_get_named_gpio(np, "enable-gpio", 0);
+        if (config->enable_gpio < 0 && config->enable_gpio != -ENOENT)
+                return ERR_PTR(config->enable_gpio);
+
         /* Fetch GPIOs. - optional property*/
         ret = of_gpio_count(np);
         if ((ret < 0) && (ret != -ENOENT))
@@ -252,7 +255,6 @@ static int gpio_regulator_probe(struct platform_device *pdev)
         struct device_node *np = pdev->dev.of_node;
         struct gpio_regulator_data *drvdata;
         struct regulator_config cfg = { };
-        enum gpiod_flags gflags;
         int ptr, ret, state;
 
         drvdata = devm_kzalloc(&pdev->dev, sizeof(struct gpio_regulator_data),
@@ -338,22 +340,21 @@ static int gpio_regulator_probe(struct platform_device *pdev)
         cfg.driver_data = drvdata;
         cfg.of_node = np;
 
+        if (gpio_is_valid(config->enable_gpio)) {
+                cfg.ena_gpio = config->enable_gpio;
+                cfg.ena_gpio_initialized = true;
+        }
         cfg.ena_gpio_invert = !config->enable_high;
         if (config->enabled_at_boot) {
                 if (config->enable_high)
-                        gflags = GPIOD_OUT_HIGH;
+                        cfg.ena_gpio_flags |= GPIOF_OUT_INIT_HIGH;
                 else
-                        gflags = GPIOD_OUT_LOW;
+                        cfg.ena_gpio_flags |= GPIOF_OUT_INIT_LOW;
         } else {
                 if (config->enable_high)
-                        gflags = GPIOD_OUT_LOW;
+                        cfg.ena_gpio_flags |= GPIOF_OUT_INIT_LOW;
                 else
-                        gflags = GPIOD_OUT_HIGH;
-        }
-        cfg.ena_gpiod = devm_gpiod_get_optional(&pdev->dev, "enable", gflags);
-        if (IS_ERR(cfg.ena_gpiod)) {
-                ret = PTR_ERR(cfg.ena_gpiod);
-                goto err_stategpio;
+                        cfg.ena_gpio_flags |= GPIOF_OUT_INIT_HIGH;
         }
 
         drvdata->dev = regulator_register(&drvdata->desc, &cfg);
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h
index 1a4340ed8e2b..48918be649d4 100644
--- a/include/linux/regulator/fixed.h
+++ b/include/linux/regulator/fixed.h
@@ -24,6 +24,8 @@ struct regulator_init_data;
  * @supply_name:        Name of the regulator supply
  * @input_supply:       Name of the input regulator supply
  * @microvolts:         Output voltage of regulator
+ * @gpio:               GPIO to use for enable control
+ *                      set to -EINVAL if not used
  * @startup_delay:      Start-up time in microseconds
  * @gpio_is_open_drain: Gpio pin is open drain or normal type.
  *                      If it is open drain type then HIGH will be set
@@ -47,6 +49,7 @@ struct fixed_voltage_config {
         const char *supply_name;
         const char *input_supply;
         int microvolts;
+        int gpio;
         unsigned startup_delay;
         unsigned gpio_is_open_drain:1;
         unsigned enable_high:1;
diff --git a/include/linux/regulator/gpio-regulator.h b/include/linux/regulator/gpio-regulator.h
index 536cab86f2d5..19fbd267406d 100644
--- a/include/linux/regulator/gpio-regulator.h
+++ b/include/linux/regulator/gpio-regulator.h
@@ -44,6 +44,8 @@ struct gpio_regulator_state {
 /**
  * struct gpio_regulator_config - config structure
  * @supply_name:        Name of the regulator supply
+ * @enable_gpio:        GPIO to use for enable control
+ *                      set to -EINVAL if not used
  * @enable_high:        Polarity of enable GPIO
  *                      1 = Active high, 0 = Active low
  * @enabled_at_boot:    Whether regulator has been enabled at
@@ -67,6 +69,7 @@ struct gpio_regulator_state {
 struct gpio_regulator_config {
         const char *supply_name;
 
+        int enable_gpio;
         unsigned enable_high:1;
         unsigned enabled_at_boot:1;
         unsigned startup_delay;