aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-07-02 08:55:28 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-09 15:56:29 -0400
commit73d1a2c467ba4fb7420b499b6a7c66edf9626679 (patch)
treee23bdd92e50ec78a6cbc9701fc5a30448b0e6216
parent918dbcba4ee3f0ad7d617b3969d5016481b9ceff (diff)
[ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
is handled in board code Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/net/irda/pxaficp_ir.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index a19c00ad8b24..f76b0b6c277d 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -25,7 +25,6 @@
25#include <asm/dma.h> 25#include <asm/dma.h>
26#include <asm/arch/irda.h> 26#include <asm/arch/irda.h>
27#include <asm/arch/pxa-regs.h> 27#include <asm/arch/pxa-regs.h>
28#include <asm/arch/pxa2xx-gpio.h>
29 28
30#define IrSR_RXPL_NEG_IS_ZERO (1<<4) 29#define IrSR_RXPL_NEG_IS_ZERO (1<<4)
31#define IrSR_RXPL_POS_IS_ZERO 0x0 30#define IrSR_RXPL_POS_IS_ZERO 0x0
@@ -148,10 +147,6 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
148 /* set board transceiver to SIR mode */ 147 /* set board transceiver to SIR mode */
149 si->pdata->transceiver_mode(si->dev, IR_SIRMODE); 148 si->pdata->transceiver_mode(si->dev, IR_SIRMODE);
150 149
151 /* configure GPIO46/47 */
152 pxa_gpio_mode(GPIO46_STRXD_MD);
153 pxa_gpio_mode(GPIO47_STTXD_MD);
154
155 /* enable the STUART clock */ 150 /* enable the STUART clock */
156 pxa_irda_enable_sirclk(si); 151 pxa_irda_enable_sirclk(si);
157 } 152 }
@@ -186,10 +181,6 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
186 /* set board transceiver to FIR mode */ 181 /* set board transceiver to FIR mode */
187 si->pdata->transceiver_mode(si->dev, IR_FIRMODE); 182 si->pdata->transceiver_mode(si->dev, IR_FIRMODE);
188 183
189 /* configure GPIO46/47 */
190 pxa_gpio_mode(GPIO46_ICPRXD_MD);
191 pxa_gpio_mode(GPIO47_ICPTXD_MD);
192
193 /* enable the FICP clock */ 184 /* enable the FICP clock */
194 pxa_irda_enable_firclk(si); 185 pxa_irda_enable_firclk(si);
195 186