diff options
| author | Petr Cvek <petr.cvek@tul.cz> | 2015-09-28 23:34:18 +0200 |
|---|---|---|
| committer | Robert Jarzmik <robert.jarzmik@free.fr> | 2015-10-14 23:06:57 +0200 |
| commit | 0f073e3e0c156eca99ce021529b2f914d1d465ff (patch) | |
| tree | bae70f303331adaef4eeb3c58a84c1010b7795c6 /arch/arm/mach-pxa/magician.c | |
| parent | 0fb58abb5d75eea47e001ef47ad8cbca545ac4ca (diff) | |
| download | op-kernel-dev-0f073e3e0c156eca99ce021529b2f914d1d465ff.zip op-kernel-dev-0f073e3e0c156eca99ce021529b2f914d1d465ff.tar.gz | |
ARM: pxa: magician: Fix redundant GPIO request for pxaficp_ir
The pxaficp_ir driver requests a power GPIO for the transceiver internally,
so a global GPIO allocation in magician_init() is redundant.
Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Diffstat (limited to 'arch/arm/mach-pxa/magician.c')
| -rw-r--r-- | arch/arm/mach-pxa/magician.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 835c7f8..c24eaa3 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -127,6 +127,7 @@ static unsigned long magician_pin_config[] __initdata = { static struct pxaficp_platform_data magician_ficp_info = { .gpio_pwdown = GPIO83_MAGICIAN_nIR_EN, .transceiver_cap = IR_SIRMODE | IR_OFF, + .gpio_pwdown_inverted = 0, }; /* @@ -776,7 +777,6 @@ static struct gpio magician_global_gpios[] = { { GPIO106_MAGICIAN_LCD_DCDC_NRESET, GPIOF_OUT_INIT_LOW, "LCD DCDC nreset" }, { GPIO104_MAGICIAN_LCD_VOFF_EN, GPIOF_OUT_INIT_LOW, "LCD VOFF enable" }, { GPIO105_MAGICIAN_LCD_VON_EN, GPIOF_OUT_INIT_LOW, "LCD VON enable" }, - { GPIO83_MAGICIAN_nIR_EN, GPIOF_OUT_INIT_HIGH, "nIR_EN" }, }; static void __init magician_init(void) |
