Merge tag 'spi-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

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

diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index bdbcf46595f98c117ff9293436d71ef8e695c1ca..3fd1119c14d5c7a198b9e0f29f6a92f234ca0c3f 100644 (file)
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -426,7 +426,7 @@ static struct gpiod_lookup_table can_regulator_gpiod_table = {
        .dev_id = "reg-fixed-voltage.0",
        .table = {
                GPIO_LOOKUP("gpio-pxa", ZEUS_CAN_SHDN_GPIO,
-                           NULL, GPIO_ACTIVE_HIGH),
+                           NULL, GPIO_ACTIVE_LOW),
                { },
        },
 };
@@ -547,7 +547,6 @@ 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 */
-       .enable_high            = 1,
        .startup_delay          = 0,
        .init_data              = &zeus_ohci_regulator_data,
 };