Merge tag 'usb-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / raumfeld.c

diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index 034345546f84a575a823cdb25b4953bf1e9f141b..bd3c23ad6ce60cb5be94d9548830b2e931eb86a3 100644 (file)
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -886,7 +886,6 @@ 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,
@@ -900,6 +899,15 @@ 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,
+                           NULL, GPIO_ACTIVE_HIGH),
+               { },
+       },
+};
+
 /* Dummy supplies for Codec's VD/VLC */
 
 static struct regulator_consumer_supply audio_dummy_supplies[] = {
@@ -918,7 +926,6 @@ 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,
 };
 
@@ -1033,6 +1040,7 @@ 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));
 }