ARM: pxa: remove irda leftover

irda support was removed a long time ago, so stop
registering the devices from the pxa machine.

Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index a7b92dd..72adaac 100644 (file)
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -15,7 +15,6 @@
 #include <linux/platform_data/usb-pxa3xx-ulpi.h>
 #include <linux/platform_data/video-pxafb.h>
 #include <linux/platform_data/mmc-pxamci.h>
-#include <linux/platform_data/irda-pxaficp.h>
 #include "irqs.h"
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <linux/platform_data/keypad-pxa27x.h>
@@ -378,47 +377,6 @@ struct platform_device pxa_device_asoc_platform = {
        .id             = -1,
 };
 
-static u64 pxaficp_dmamask = ~(u32)0;
-
-static struct resource pxa_ir_resources[] = {
-       [0] = {
-               .start  = IRQ_STUART,
-               .end    = IRQ_STUART,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [1] = {
-               .start  = IRQ_ICP,
-               .end    = IRQ_ICP,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [3] = {
-               .start  = 0x40800000,
-               .end    = 0x4080001b,
-               .flags  = IORESOURCE_MEM,
-       },
-       [4] = {
-               .start  = 0x40700000,
-               .end    = 0x40700023,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-struct platform_device pxa_device_ficp = {
-       .name           = "pxa2xx-ir",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(pxa_ir_resources),
-       .resource       = pxa_ir_resources,
-       .dev            = {
-               .dma_mask = &pxaficp_dmamask,
-               .coherent_dma_mask = 0xffffffff,
-       },
-};
-
-void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)
-{
-       pxa_register_device(&pxa_device_ficp, info);
-}
-
 static struct resource pxa_rtc_resources[] = {
        [0] = {
                .start  = 0x40900000,

diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index 498b07b..2828bea 100644 (file)
--- a/arch/arm/mach-pxa/devices.h
+++ b/arch/arm/mach-pxa/devices.h
@@ -17,7 +17,6 @@ extern struct platform_device pxa_device_stuart;
 extern struct platform_device pxa_device_hwuart;
 extern struct platform_device pxa_device_i2c;
 extern struct platform_device pxa_device_i2s;
-extern struct platform_device pxa_device_ficp;
 extern struct platform_device sa1100_device_rtc;
 extern struct platform_device pxa_device_rtc;
 extern struct platform_device pxa_device_ac97;

diff --git a/arch/arm/mach-pxa/pxa2xx.c b/arch/arm/mach-pxa/pxa2xx.c
index 4aafd69..35c23a5 100644 (file)
--- a/arch/arm/mach-pxa/pxa2xx.c
+++ b/arch/arm/mach-pxa/pxa2xx.c
@@ -18,7 +18,6 @@
 #include "reset.h"
 #include "smemc.h"
 #include <linux/soc/pxa/smemc.h>
-#include <linux/platform_data/irda-pxaficp.h>
 
 void pxa2xx_clear_reset_status(unsigned int mask)
 {
@@ -26,34 +25,6 @@ void pxa2xx_clear_reset_status(unsigned int mask)
        RCSR = mask;
 }
 
-static unsigned long pxa2xx_mfp_fir[] = {
-       GPIO46_FICP_RXD,
-       GPIO47_FICP_TXD,
-};
-
-static unsigned long pxa2xx_mfp_sir[] = {
-       GPIO46_STUART_RXD,
-       GPIO47_STUART_TXD,
-};
-
-static unsigned long pxa2xx_mfp_off[] = {
-       GPIO46_GPIO | MFP_LPM_DRIVE_LOW,
-       GPIO47_GPIO | MFP_LPM_DRIVE_LOW,
-};
-
-void pxa2xx_transceiver_mode(struct device *dev, int mode)
-{
-       if (mode & IR_OFF) {
-               pxa2xx_mfp_config(pxa2xx_mfp_off, ARRAY_SIZE(pxa2xx_mfp_off));
-       } else if (mode & IR_SIRMODE) {
-               pxa2xx_mfp_config(pxa2xx_mfp_sir, ARRAY_SIZE(pxa2xx_mfp_sir));
-       } else if (mode & IR_FIRMODE) {
-               pxa2xx_mfp_config(pxa2xx_mfp_fir, ARRAY_SIZE(pxa2xx_mfp_fir));
-       } else
-               BUG();
-}
-EXPORT_SYMBOL_GPL(pxa2xx_transceiver_mode);
-
 #define MDCNFG_DRAC2(mdcnfg)   (((mdcnfg) >> 21) & 0x3)
 #define MDCNFG_DRAC0(mdcnfg)   (((mdcnfg) >> 5) & 0x3)
 

diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 9964729..26f0ebc 100644 (file)
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -40,7 +40,6 @@
 #include "pxa27x.h"
 #include "pxa27x-udc.h"
 #include "reset.h"
-#include <linux/platform_data/irda-pxaficp.h>
 #include <linux/platform_data/mmc-pxamci.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <linux/platform_data/video-pxafb.h>
@@ -688,27 +687,6 @@ static inline void spitz_uhc_init(void) {}
 #endif
 
 /******************************************************************************
- * IrDA
- ******************************************************************************/
-#if defined(CONFIG_PXA_FICP) || defined(CONFIG_PXA_FICP_MODULE)
-static struct pxaficp_platform_data spitz_ficp_platform_data = {
-       .transceiver_cap        = IR_SIRMODE | IR_OFF,
-};
-
-static void __init spitz_irda_init(void)
-{
-       if (machine_is_akita())
-               spitz_ficp_platform_data.gpio_pwdown = AKITA_GPIO_IR_ON;
-       else
-               spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
-
-       pxa_set_ficp_info(&spitz_ficp_platform_data);
-}
-#else
-static inline void spitz_irda_init(void) {}
-#endif
-
-/******************************************************************************
  * Framebuffer
  ******************************************************************************/
 #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
@@ -1042,7 +1020,6 @@ static void __init spitz_init(void)
        spitz_leds_init();
        spitz_mmc_init();
        spitz_pcmcia_init();
-       spitz_irda_init();
        spitz_uhc_init();
        spitz_lcd_init();
        spitz_nor_init();

diff --git a/include/linux/platform_data/irda-pxaficp.h b/include/linux/platform_data/irda-pxaficp.h
deleted file mode 100644 (file)
index bd35ddc..0000000
--- a/include/linux/platform_data/irda-pxaficp.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef ASMARM_ARCH_IRDA_H
-#define ASMARM_ARCH_IRDA_H
-
-/* board specific transceiver capabilities */
-
-#define IR_OFF         1
-#define IR_SIRMODE     2
-#define IR_FIRMODE     4
-
-struct pxaficp_platform_data {
-       int transceiver_cap;
-       void (*transceiver_mode)(struct device *dev, int mode);
-       int (*startup)(struct device *dev);
-       void (*shutdown)(struct device *dev);
-       int gpio_pwdown;                /* powerdown GPIO for the IrDA chip */
-       bool gpio_pwdown_inverted;      /* gpio_pwdown is inverted */
-};
-
-extern void pxa_set_ficp_info(struct pxaficp_platform_data *info);
-
-#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
-void pxa2xx_transceiver_mode(struct device *dev, int mode);
-#endif
-
-#endif