From: Petr Cvek Date: Mon, 28 Sep 2015 21:34:18 +0000 (+0200) Subject: ARM: pxa: magician: Fix redundant GPIO request for pxaficp_ir X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0f073e3e0c156eca99ce021529b2f914d1d465ff;p=linux-beck.git 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 Signed-off-by: Robert Jarzmik --- diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 835c7f8fdbf8..c24eaa3652d1 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)