From nobody Tue Sep 16 10:29:34 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 060F9C6379F for ; Thu, 5 Jan 2023 13:47:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233681AbjAENrP (ORCPT ); Thu, 5 Jan 2023 08:47:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231436AbjAENqw (ORCPT ); Thu, 5 Jan 2023 08:46:52 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC73B634B for ; Thu, 5 Jan 2023 05:46:50 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9D8A1B81AD7 for ; Thu, 5 Jan 2023 13:46:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB703C433F0; Thu, 5 Jan 2023 13:46:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926408; bh=dZp/PMQ0dnDJGdJBctPRLkuGVQfjRlJ837CIMplBJMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lf5LeIh5/cjC9stwe+oc7u1sgoPCrG9pnCTg3KWHueKH0FeDb2zkKZpMNB97Qiyb7 jrz1ENJkVrfQXQCb1pKLE59C1Ngwh2WYDfgP26VG92jy+KxtpiJN/wtF8Cf36Q3Bbo RmUaLgVcyZq2t4EhAagK1uINJZkMesW6vw+uNmDcoRmoBsk2QyWsaKvBl0dShamjbL 3Xy7bKmg/ikuBA3hndWVoFlecwB4J+MEMcN+AlZOYqDXM0s2PxGfPEcxgcZF0KveOV zZVsj/90czLCg02sxw3Nz2ig1+FSPoIyN9ASsobK63qZPuPQaK3uV3YeFFvH/aPKOS RzoWqAOTXZ3Xw== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 02/27] ARM: pxa: remove irda leftover Date: Thu, 5 Jan 2023 14:45:57 +0100 Message-Id: <20230105134622.254560-3-arnd@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230105134622.254560-1-arnd@kernel.org> References: <20230105134622.254560-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnd Bergmann irda support was removed a long time ago, so stop registering the devices from the pxa machine. Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/devices.c | 42 ---------------------- arch/arm/mach-pxa/devices.h | 1 - arch/arm/mach-pxa/pxa2xx.c | 29 --------------- arch/arm/mach-pxa/spitz.c | 23 ------------ include/linux/platform_data/irda-pxaficp.h | 26 -------------- 5 files changed, 121 deletions(-) delete mode 100644 include/linux/platform_data/irda-pxaficp.h diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index a7b92dd1ca9e..72adaac9f332 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -15,7 +15,6 @@ #include #include #include -#include #include "irqs.h" #include #include @@ -378,47 +377,6 @@ struct platform_device pxa_device_asoc_platform =3D { .id =3D -1, }; =20 -static u64 pxaficp_dmamask =3D ~(u32)0; - -static struct resource pxa_ir_resources[] =3D { - [0] =3D { - .start =3D IRQ_STUART, - .end =3D IRQ_STUART, - .flags =3D IORESOURCE_IRQ, - }, - [1] =3D { - .start =3D IRQ_ICP, - .end =3D IRQ_ICP, - .flags =3D IORESOURCE_IRQ, - }, - [3] =3D { - .start =3D 0x40800000, - .end =3D 0x4080001b, - .flags =3D IORESOURCE_MEM, - }, - [4] =3D { - .start =3D 0x40700000, - .end =3D 0x40700023, - .flags =3D IORESOURCE_MEM, - }, -}; - -struct platform_device pxa_device_ficp =3D { - .name =3D "pxa2xx-ir", - .id =3D -1, - .num_resources =3D ARRAY_SIZE(pxa_ir_resources), - .resource =3D pxa_ir_resources, - .dev =3D { - .dma_mask =3D &pxaficp_dmamask, - .coherent_dma_mask =3D 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[] =3D { [0] =3D { .start =3D 0x40900000, diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h index 498b07bc6a3e..2828bea76cd7 100644 --- 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 4aafd692c1e8..35c23a5d73a3 100644 --- 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 -#include =20 void pxa2xx_clear_reset_status(unsigned int mask) { @@ -26,34 +25,6 @@ void pxa2xx_clear_reset_status(unsigned int mask) RCSR =3D mask; } =20 -static unsigned long pxa2xx_mfp_fir[] =3D { - GPIO46_FICP_RXD, - GPIO47_FICP_TXD, -}; - -static unsigned long pxa2xx_mfp_sir[] =3D { - GPIO46_STUART_RXD, - GPIO47_STUART_TXD, -}; - -static unsigned long pxa2xx_mfp_off[] =3D { - 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) =20 diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 9964729cd428..26f0ebc4d136 100644 --- 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 #include #include #include @@ -687,27 +686,6 @@ static void __init spitz_uhc_init(void) static inline void spitz_uhc_init(void) {} #endif =20 -/*************************************************************************= ***** - * IrDA - *************************************************************************= *****/ -#if defined(CONFIG_PXA_FICP) || defined(CONFIG_PXA_FICP_MODULE) -static struct pxaficp_platform_data spitz_ficp_platform_data =3D { - .transceiver_cap =3D IR_SIRMODE | IR_OFF, -}; - -static void __init spitz_irda_init(void) -{ - if (machine_is_akita()) - spitz_ficp_platform_data.gpio_pwdown =3D AKITA_GPIO_IR_ON; - else - spitz_ficp_platform_data.gpio_pwdown =3D SPITZ_GPIO_IR_ON; - - pxa_set_ficp_info(&spitz_ficp_platform_data); -} -#else -static inline void spitz_irda_init(void) {} -#endif - /*************************************************************************= ***** * Framebuffer *************************************************************************= *****/ @@ -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/pla= tform_data/irda-pxaficp.h deleted file mode 100644 index bd35ddcf3068..000000000000 --=20 2.39.0