diff options
| author | Mark Brown | 2019-03-04 16:32:43 +0100 |
|---|---|---|
| committer | Mark Brown | 2019-03-04 16:32:43 +0100 |
| commit | 88f268a5bcc3b0683e6fbaf9973702e5329fc1e3 (patch) | |
| tree | a64bf49e575ece017359ba5ac89fbc52efd81f2a /arch/arm/mach-pxa/zeus.c | |
| parent | Merge branch 'regulator-5.0' into regulator-linus (diff) | |
| parent | regulator: mc13xxx: Constify regulator_ops variables (diff) | |
| download | kernel-qcow2-linux-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.tar.gz kernel-qcow2-linux-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.tar.xz kernel-qcow2-linux-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.zip | |
Merge branch 'regulator-5.1' into regulator-next
Diffstat (limited to 'arch/arm/mach-pxa/zeus.c')
| -rw-r--r-- | arch/arm/mach-pxa/zeus.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c index c411f79d4cb5..ebd654302387 100644 --- 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, }; |