[ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 2d49de5..fea17ce 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -149,19 +149,12 @@
GPIO81_SSP2_CLK_OUT,
GPIO82_SSP2_FRM_OUT,
GPIO83_SSP2_TXD,
-};
-static unsigned long tosa_pin_irda_off[] = {
- GPIO46_STUART_RXD,
- GPIO47_GPIO | MFP_LPM_DRIVE_LOW,
+ /* IrDA is managed in other way */
+ GPIO46_GPIO,
+ GPIO47_GPIO,
};
-static unsigned long tosa_pin_irda_on[] = {
- GPIO46_STUART_RXD,
- GPIO47_STUART_TXD,
-};
-
-
/*
* SCOOP Device
*/
@@ -360,10 +353,10 @@
{
if (mode & IR_OFF) {
gpio_set_value(TOSA_GPIO_IR_POWERDWN, 0);
- pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_irda_off));
+ pxa2xx_transceiver_mode(dev, mode);
gpio_direction_output(TOSA_GPIO_IRDA_TX, 0);
} else {
- pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_irda_on));
+ pxa2xx_transceiver_mode(dev, mode);
gpio_set_value(TOSA_GPIO_IR_POWERDWN, 1);
}
}
@@ -775,7 +768,6 @@
int dummy;
pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_config));
- pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_irda_off));
gpio_set_wake(MFP_PIN_GPIO1, 1);
/* We can't pass to gpio-keys since it will drop the Reset altfunc */