From patchwork Thu Jan 5 13:45:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090598 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E183AC4708E for ; Thu, 5 Jan 2023 22:15:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ezArf1YFFtGWmlE4yv5R6rp6Fkr05xuw+NwBLbdtb3A=; b=SM/YB7RnLye8im 6rRF0nOSetmzlUq2/1mnSnKIrxZrIDgHwsxFi/OKqgCsoPtH3siHAAyauNn/5TbUQYJM1E2djRHcj n6m2qDuKNW7JcGTqmYRnv7XWPwUs8LrPljV4SOeXiLyzWIQHn2Llj4IkJ7UtId3p2tGNqRROuTbnp A+dZET+Ql3eRFaCU5kGDpcFXLjXfWNxikXR6FRKv1G4aRAwmXfA0Ky1yXfKA2tzLiOikqnKJn9bnm lOBuQfqXH/gAnFoBn2CpUztJZWfIcAj9VEYO0pnmUNt+kzUK3BPT386grzurrt5hZeC2HqkAMBp8L pD+EeL5VQ3JxpV9zMxow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYV5-00FTmU-JA; Thu, 05 Jan 2023 22:14:16 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVCt-00Dlx3-V9 for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:43:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:Content-Type :MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=K4XabxJFx+daYFta/l55o5VLOxVp9vQO3VO1c+MX07w=; b=ZRBbNMK17oagUecFwUY3EPGbmF 7VuuM5UxuMMgAEDiDR4ltX717UdXGnaEUXS5JQtyhIj8pHrzV8Faje6b0rPRx6nWF57aZ296ny0LK 52voGdzopyNX+6rNqiipa1+Fw315orMQn4ZmI68AE6HiIoUm5OByBib7eyI1FidEOhCiVIbtLvall XD8vFoHKxhE51RRlWYXxK+2/AC2ftIeqQ5R7fZjFvVK33Q17AZXQpeFRpK3n70EUQfnprA8jO3rP+ g18Ewy9R9AZW7CCL+hnUvbY9LO3HHKY6LVFb42Gqf3iOeLXz0MALwm7qM+W0ZjrjlcBAzwFsrTcif ma7LekAA==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQZu-001Lyd-36 for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:46:47 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id EA41C61A4D; Thu, 5 Jan 2023 13:46:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9C90C433EF; Thu, 5 Jan 2023 13:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926406; bh=QW95drhjEd2B7cLTxK2XfcE251o5ge5KKlLQKFVGxDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZCQrJtEe4v3sXLjiU0mo0kDQgGCWYeHNJ8xP3wS27irk6KDHLy0rtO/4bFdG+Nraw +uc1JsdrLOZIGbQ/fJGTvrvdoj6RDi5KpkPDbt/vvrcZNnSsKf9AQ56jCtifTSkfKf sg2R2vSxI8t8vBZD5baHkEQI97wXhDhu/vlqbWB1uzhJp8CaVFPqjJJ46+0FN4Ghm3 fMn7Gqk0eaNS3XZ9u9Z2xIazFpyaXxYP8RGmjLCoZBL4gyW89jYkYFIa/u9jXaA/ml 5nQkRepNzzvYNkwiYHg3FdMkk4xxm+ex8sEoFHY/0oPdB9/raQogpPrUx2cZArYCUh 0Q2ajYYeQ/sHA== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Ales Bardorfer , Ales Snuparek , Alex Osborne , Alex Osborne , Dirk Opfer , Dmitry Eremin-Solenikov , Ian Molton , Lennert Buytenhek , Marek Vasut , Michael Petchkovsky , Nick Bane , Paul Parsons , Philipp Zabel , Richard Purdie , Sergey Lapin , Tomas Cech Subject: [PATCH 01/27] ARM: pxa: remove unused board files Date: Thu, 5 Jan 2023 14:45:56 +0100 Message-Id: <20230105134622.254560-2-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134643_572852_FE18B47F X-CRM114-Status: GOOD ( 19.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The majority of all pxa board files has not been touched in a long time, and no users have spoken up in favor of keeping them around. This leaves only support for the platforms that were already converted to DT, as well as the gumstix and spitz/akita/borzoi machines that work in qemu and can still be converted to DT later. Cc: Ales Bardorfer Cc: Ales Snuparek Cc: Alex Osborne Cc: Alex Osborne Cc: Dirk Opfer Cc: Dmitry Eremin-Solenikov Cc: Ian Molton Cc: Lennert Buytenhek Cc: Marek Vasut Cc: Michael Petchkovsky Cc: Nick Bane Cc: Paul Parsons Cc: Philipp Zabel Cc: Richard Purdie Cc: Robert Jarzmik Cc: Sergey Lapin Cc: Tomas Cech Signed-off-by: Arnd Bergmann Acked-by: Dmitry Baryshkov --- MAINTAINERS | 99 -- arch/arm/configs/cm_x300_defconfig | 163 --- arch/arm/configs/colibri_pxa270_defconfig | 157 --- arch/arm/configs/colibri_pxa300_defconfig | 60 - arch/arm/configs/corgi_defconfig | 247 ---- arch/arm/configs/eseries_pxa_defconfig | 97 -- arch/arm/configs/ezx_defconfig | 389 ------ arch/arm/configs/h5000_defconfig | 74 -- arch/arm/configs/lpd270_defconfig | 58 - arch/arm/configs/lubbock_defconfig | 53 - arch/arm/configs/magician_defconfig | 151 --- arch/arm/configs/mainstone_defconfig | 51 - arch/arm/configs/palmz72_defconfig | 75 -- arch/arm/configs/pcm027_defconfig | 90 -- arch/arm/configs/pxa255-idp_defconfig | 55 - arch/arm/configs/pxa_defconfig | 3 - arch/arm/configs/trizeps4_defconfig | 207 --- arch/arm/configs/viper_defconfig | 160 --- arch/arm/configs/xcep_defconfig | 90 -- arch/arm/configs/zeus_defconfig | 173 --- arch/arm/mach-pxa/Kconfig | 583 +------- arch/arm/mach-pxa/Makefile | 58 - arch/arm/mach-pxa/balloon3-pcmcia.c | 137 -- arch/arm/mach-pxa/balloon3.c | 821 ------------ arch/arm/mach-pxa/balloon3.h | 181 --- arch/arm/mach-pxa/capc7117.c | 159 --- arch/arm/mach-pxa/cm-x300.c | 883 ------------ arch/arm/mach-pxa/colibri-evalboard.c | 138 -- arch/arm/mach-pxa/colibri-pcmcia.c | 165 --- arch/arm/mach-pxa/colibri-pxa270-income.c | 236 ---- arch/arm/mach-pxa/colibri-pxa270.c | 330 ----- arch/arm/mach-pxa/colibri-pxa300.c | 193 --- arch/arm/mach-pxa/colibri-pxa320.c | 264 ---- arch/arm/mach-pxa/colibri-pxa3xx.c | 147 -- arch/arm/mach-pxa/colibri.h | 70 - arch/arm/mach-pxa/corgi.c | 826 ------------ arch/arm/mach-pxa/corgi.h | 110 -- arch/arm/mach-pxa/corgi_pm.c | 221 --- arch/arm/mach-pxa/csb701.c | 67 - arch/arm/mach-pxa/csb726.c | 291 ---- arch/arm/mach-pxa/csb726.h | 24 - arch/arm/mach-pxa/e740-pcmcia.c | 127 -- arch/arm/mach-pxa/eseries-gpio.h | 63 - arch/arm/mach-pxa/eseries-irq.h | 24 - arch/arm/mach-pxa/eseries.c | 1001 -------------- arch/arm/mach-pxa/ezx.c | 1254 ------------------ arch/arm/mach-pxa/h5000.c | 210 --- arch/arm/mach-pxa/h5000.h | 109 -- arch/arm/mach-pxa/himalaya.c | 166 --- arch/arm/mach-pxa/hx4700-pcmcia.c | 118 -- arch/arm/mach-pxa/hx4700.c | 942 ------------- arch/arm/mach-pxa/hx4700.h | 129 -- arch/arm/mach-pxa/icontrol.c | 218 --- arch/arm/mach-pxa/idp.c | 285 ---- arch/arm/mach-pxa/idp.h | 195 --- arch/arm/mach-pxa/littleton.c | 462 ------- arch/arm/mach-pxa/littleton.h | 14 - arch/arm/mach-pxa/lpd270.c | 518 -------- arch/arm/mach-pxa/lpd270.h | 40 - arch/arm/mach-pxa/lubbock.c | 649 --------- arch/arm/mach-pxa/lubbock.h | 47 - arch/arm/mach-pxa/magician.c | 1112 ---------------- arch/arm/mach-pxa/magician.h | 125 -- arch/arm/mach-pxa/mainstone.c | 738 ----------- arch/arm/mach-pxa/mainstone.h | 140 -- arch/arm/mach-pxa/mfp-pxa320.h | 458 ------- arch/arm/mach-pxa/mioa701.c | 784 ----------- arch/arm/mach-pxa/mioa701.h | 76 -- arch/arm/mach-pxa/mioa701_bootresume.S | 38 - arch/arm/mach-pxa/mp900.c | 101 -- arch/arm/mach-pxa/mxm8x10.c | 477 ------- arch/arm/mach-pxa/mxm8x10.h | 22 - arch/arm/mach-pxa/palm27x.c | 473 ------- arch/arm/mach-pxa/palm27x.h | 77 -- arch/arm/mach-pxa/palmld-pcmcia.c | 111 -- arch/arm/mach-pxa/palmld.c | 392 ------ arch/arm/mach-pxa/palmld.h | 107 -- arch/arm/mach-pxa/palmt5.c | 234 ---- arch/arm/mach-pxa/palmt5.h | 82 -- arch/arm/mach-pxa/palmtc-pcmcia.c | 162 --- arch/arm/mach-pxa/palmtc.c | 539 -------- arch/arm/mach-pxa/palmtc.h | 84 -- arch/arm/mach-pxa/palmte2.c | 383 ------ arch/arm/mach-pxa/palmte2.h | 64 - arch/arm/mach-pxa/palmtreo.c | 548 -------- arch/arm/mach-pxa/palmtreo.h | 64 - arch/arm/mach-pxa/palmtx-pcmcia.c | 111 -- arch/arm/mach-pxa/palmtx.c | 390 ------ arch/arm/mach-pxa/palmtx.h | 110 -- arch/arm/mach-pxa/palmz72.c | 319 ----- arch/arm/mach-pxa/palmz72.h | 80 -- arch/arm/mach-pxa/pcm027.c | 266 ---- arch/arm/mach-pxa/pcm027.h | 73 - arch/arm/mach-pxa/pcm990-baseboard.c | 408 ------ arch/arm/mach-pxa/pcm990_baseboard.h | 199 --- arch/arm/mach-pxa/poodle.c | 484 ------- arch/arm/mach-pxa/poodle.h | 92 -- arch/arm/mach-pxa/pxa320.c | 88 -- arch/arm/mach-pxa/pxa320.h | 9 - arch/arm/mach-pxa/pxa930.c | 217 --- arch/arm/mach-pxa/pxa930.h | 8 - arch/arm/mach-pxa/pxa_cplds_irqs.c | 200 --- arch/arm/mach-pxa/regs-uart.h | 146 -- arch/arm/mach-pxa/saar.c | 604 --------- arch/arm/mach-pxa/sharpsl_pm.c | 4 - arch/arm/mach-pxa/tavorevb.c | 506 ------- arch/arm/mach-pxa/tosa-bt.c | 134 -- arch/arm/mach-pxa/tosa.c | 946 ------------- arch/arm/mach-pxa/tosa.h | 165 --- arch/arm/mach-pxa/tosa_bt.h | 18 - arch/arm/mach-pxa/trizeps4-pcmcia.c | 200 --- arch/arm/mach-pxa/trizeps4.c | 575 -------- arch/arm/mach-pxa/trizeps4.h | 166 --- arch/arm/mach-pxa/viper-pcmcia.c | 180 --- arch/arm/mach-pxa/viper-pcmcia.h | 12 - arch/arm/mach-pxa/viper.c | 1034 --------------- arch/arm/mach-pxa/viper.h | 91 -- arch/arm/mach-pxa/vpac270-pcmcia.c | 137 -- arch/arm/mach-pxa/vpac270.c | 736 ---------- arch/arm/mach-pxa/vpac270.h | 38 - arch/arm/mach-pxa/xcep.c | 190 --- arch/arm/mach-pxa/z2.c | 781 ----------- arch/arm/mach-pxa/z2.h | 37 - arch/arm/mach-pxa/zeus.c | 974 -------------- arch/arm/mach-pxa/zeus.h | 82 -- arch/arm/mach-pxa/zylonite.c | 495 ------- arch/arm/mach-pxa/zylonite.h | 45 - arch/arm/mach-pxa/zylonite_pxa300.c | 281 ---- arch/arm/mach-pxa/zylonite_pxa320.c | 213 --- drivers/input/touchscreen/mainstone-wm97xx.c | 10 - drivers/pcmcia/pxa2xx_base.c | 8 +- drivers/pcmcia/sa1111_generic.c | 4 - drivers/power/supply/ds2760_battery.c | 8 - drivers/usb/gadget/udc/pxa25x_udc.c | 62 - drivers/video/backlight/locomolcd.c | 10 - 135 files changed, 2 insertions(+), 34262 deletions(-) delete mode 100644 arch/arm/configs/cm_x300_defconfig delete mode 100644 arch/arm/configs/colibri_pxa270_defconfig delete mode 100644 arch/arm/configs/colibri_pxa300_defconfig delete mode 100644 arch/arm/configs/corgi_defconfig delete mode 100644 arch/arm/configs/eseries_pxa_defconfig delete mode 100644 arch/arm/configs/ezx_defconfig delete mode 100644 arch/arm/configs/h5000_defconfig delete mode 100644 arch/arm/configs/lpd270_defconfig delete mode 100644 arch/arm/configs/lubbock_defconfig delete mode 100644 arch/arm/configs/magician_defconfig delete mode 100644 arch/arm/configs/mainstone_defconfig delete mode 100644 arch/arm/configs/palmz72_defconfig delete mode 100644 arch/arm/configs/pcm027_defconfig delete mode 100644 arch/arm/configs/pxa255-idp_defconfig delete mode 100644 arch/arm/configs/trizeps4_defconfig delete mode 100644 arch/arm/configs/viper_defconfig delete mode 100644 arch/arm/configs/xcep_defconfig delete mode 100644 arch/arm/configs/zeus_defconfig delete mode 100644 arch/arm/mach-pxa/balloon3-pcmcia.c delete mode 100644 arch/arm/mach-pxa/balloon3.c delete mode 100644 arch/arm/mach-pxa/balloon3.h delete mode 100644 arch/arm/mach-pxa/capc7117.c delete mode 100644 arch/arm/mach-pxa/cm-x300.c delete mode 100644 arch/arm/mach-pxa/colibri-evalboard.c delete mode 100644 arch/arm/mach-pxa/colibri-pcmcia.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa270-income.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa270.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa300.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa320.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa3xx.c delete mode 100644 arch/arm/mach-pxa/colibri.h delete mode 100644 arch/arm/mach-pxa/corgi.c delete mode 100644 arch/arm/mach-pxa/corgi.h delete mode 100644 arch/arm/mach-pxa/corgi_pm.c delete mode 100644 arch/arm/mach-pxa/csb701.c delete mode 100644 arch/arm/mach-pxa/csb726.c delete mode 100644 arch/arm/mach-pxa/csb726.h delete mode 100644 arch/arm/mach-pxa/e740-pcmcia.c delete mode 100644 arch/arm/mach-pxa/eseries-gpio.h delete mode 100644 arch/arm/mach-pxa/eseries-irq.h delete mode 100644 arch/arm/mach-pxa/eseries.c delete mode 100644 arch/arm/mach-pxa/ezx.c delete mode 100644 arch/arm/mach-pxa/h5000.c delete mode 100644 arch/arm/mach-pxa/h5000.h delete mode 100644 arch/arm/mach-pxa/himalaya.c delete mode 100644 arch/arm/mach-pxa/hx4700-pcmcia.c delete mode 100644 arch/arm/mach-pxa/hx4700.c delete mode 100644 arch/arm/mach-pxa/hx4700.h delete mode 100644 arch/arm/mach-pxa/icontrol.c delete mode 100644 arch/arm/mach-pxa/idp.c delete mode 100644 arch/arm/mach-pxa/idp.h delete mode 100644 arch/arm/mach-pxa/littleton.c delete mode 100644 arch/arm/mach-pxa/littleton.h delete mode 100644 arch/arm/mach-pxa/lpd270.c delete mode 100644 arch/arm/mach-pxa/lpd270.h delete mode 100644 arch/arm/mach-pxa/lubbock.c delete mode 100644 arch/arm/mach-pxa/lubbock.h delete mode 100644 arch/arm/mach-pxa/magician.c delete mode 100644 arch/arm/mach-pxa/magician.h delete mode 100644 arch/arm/mach-pxa/mainstone.c delete mode 100644 arch/arm/mach-pxa/mainstone.h delete mode 100644 arch/arm/mach-pxa/mfp-pxa320.h delete mode 100644 arch/arm/mach-pxa/mioa701.c delete mode 100644 arch/arm/mach-pxa/mioa701.h delete mode 100644 arch/arm/mach-pxa/mioa701_bootresume.S delete mode 100644 arch/arm/mach-pxa/mp900.c delete mode 100644 arch/arm/mach-pxa/mxm8x10.c delete mode 100644 arch/arm/mach-pxa/mxm8x10.h delete mode 100644 arch/arm/mach-pxa/palm27x.c delete mode 100644 arch/arm/mach-pxa/palm27x.h delete mode 100644 arch/arm/mach-pxa/palmld-pcmcia.c delete mode 100644 arch/arm/mach-pxa/palmld.c delete mode 100644 arch/arm/mach-pxa/palmld.h delete mode 100644 arch/arm/mach-pxa/palmt5.c delete mode 100644 arch/arm/mach-pxa/palmt5.h delete mode 100644 arch/arm/mach-pxa/palmtc-pcmcia.c delete mode 100644 arch/arm/mach-pxa/palmtc.c delete mode 100644 arch/arm/mach-pxa/palmtc.h delete mode 100644 arch/arm/mach-pxa/palmte2.c delete mode 100644 arch/arm/mach-pxa/palmte2.h delete mode 100644 arch/arm/mach-pxa/palmtreo.c delete mode 100644 arch/arm/mach-pxa/palmtreo.h delete mode 100644 arch/arm/mach-pxa/palmtx-pcmcia.c delete mode 100644 arch/arm/mach-pxa/palmtx.c delete mode 100644 arch/arm/mach-pxa/palmtx.h delete mode 100644 arch/arm/mach-pxa/palmz72.c delete mode 100644 arch/arm/mach-pxa/palmz72.h delete mode 100644 arch/arm/mach-pxa/pcm027.c delete mode 100644 arch/arm/mach-pxa/pcm027.h delete mode 100644 arch/arm/mach-pxa/pcm990-baseboard.c delete mode 100644 arch/arm/mach-pxa/pcm990_baseboard.h delete mode 100644 arch/arm/mach-pxa/poodle.c delete mode 100644 arch/arm/mach-pxa/poodle.h delete mode 100644 arch/arm/mach-pxa/pxa320.c delete mode 100644 arch/arm/mach-pxa/pxa320.h delete mode 100644 arch/arm/mach-pxa/pxa930.c delete mode 100644 arch/arm/mach-pxa/pxa930.h delete mode 100644 arch/arm/mach-pxa/pxa_cplds_irqs.c delete mode 100644 arch/arm/mach-pxa/regs-uart.h delete mode 100644 arch/arm/mach-pxa/saar.c delete mode 100644 arch/arm/mach-pxa/tavorevb.c delete mode 100644 arch/arm/mach-pxa/tosa-bt.c delete mode 100644 arch/arm/mach-pxa/tosa.c delete mode 100644 arch/arm/mach-pxa/tosa.h delete mode 100644 arch/arm/mach-pxa/tosa_bt.h delete mode 100644 arch/arm/mach-pxa/trizeps4-pcmcia.c delete mode 100644 arch/arm/mach-pxa/trizeps4.c delete mode 100644 arch/arm/mach-pxa/trizeps4.h delete mode 100644 arch/arm/mach-pxa/viper-pcmcia.c delete mode 100644 arch/arm/mach-pxa/viper-pcmcia.h delete mode 100644 arch/arm/mach-pxa/viper.c delete mode 100644 arch/arm/mach-pxa/viper.h delete mode 100644 arch/arm/mach-pxa/vpac270-pcmcia.c delete mode 100644 arch/arm/mach-pxa/vpac270.c delete mode 100644 arch/arm/mach-pxa/vpac270.h delete mode 100644 arch/arm/mach-pxa/xcep.c delete mode 100644 arch/arm/mach-pxa/z2.c delete mode 100644 arch/arm/mach-pxa/z2.h delete mode 100644 arch/arm/mach-pxa/zeus.c delete mode 100644 arch/arm/mach-pxa/zeus.h delete mode 100644 arch/arm/mach-pxa/zylonite.c delete mode 100644 arch/arm/mach-pxa/zylonite.h delete mode 100644 arch/arm/mach-pxa/zylonite_pxa300.c delete mode 100644 arch/arm/mach-pxa/zylonite_pxa320.c diff --git a/MAINTAINERS b/MAINTAINERS index cc5017a3d90d..abdab4212c92 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2114,10 +2114,6 @@ F: tools/perf/arch/arm/util/pmu.c F: tools/perf/util/cs-etm-decoder/* F: tools/perf/util/cs-etm.* -ARM/CORGI MACHINE SUPPORT -M: Richard Purdie -S: Maintained - ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE M: Hans Ulli Kroll M: Linus Walleij @@ -2157,12 +2153,6 @@ F: include/dt-bindings/bus/moxtet.h F: include/linux/armada-37xx-rwtm-mailbox.h F: include/linux/moxtet.h -ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) -M: Robert Jarzmik -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/ezx.c - ARM/FARADAY FA526 PORT M: Hans Ulli Kroll L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -2212,25 +2202,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git F: arch/arm/boot/dts/vf* F: arch/arm/mach-imx/*vf610* -ARM/GLOMATION GESBC9312SX MACHINE SUPPORT -M: Lennert Buytenhek -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/GUMSTIX MACHINE SUPPORT M: Steve Sakoman L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT -M: Philipp Zabel -M: Paul Parsons -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/hx4700.c -F: arch/arm/mach-pxa/include/mach/hx4700.h -F: sound/soc/pxa/hx4700.c - ARM/HISILICON SOC SUPPORT M: Wei Xu L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -2273,12 +2249,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/boot/dts/omap3-igep* -ARM/INCOME PXA270 SUPPORT -M: Marek Vasut -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/colibri-pxa270-income.c - ARM/INTEL IXP4XX ARM ARCHITECTURE M: Linus Walleij M: Imre Kaloz @@ -2311,22 +2281,12 @@ M: Lennert Buytenhek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT -M: Lennert Buytenhek -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/LG1K ARCHITECTURE M: Chanho Min L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm64/boot/dts/lg/ -ARM/LOGICPD PXA270 MACHINE SUPPORT -M: Lennert Buytenhek -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/LPC18XX ARCHITECTURE M: Vladimir Zapolskiy L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -2353,10 +2313,6 @@ F: drivers/usb/host/ohci-nxp.c F: drivers/watchdog/pnx4008_wdt.c N: lpc32xx -ARM/MAGICIAN MACHINE SUPPORT -M: Philipp Zabel -S: Maintained - ARM/Marvell Dove/MV78xx0/Orion SOC support M: Andrew Lunn M: Sebastian Hesselbarth @@ -2485,12 +2441,6 @@ F: arch/arm/boot/dts/milbeaut* F: arch/arm/mach-milbeaut/ N: milbeaut -ARM/MIOA701 MACHINE SUPPORT -M: Robert Jarzmik -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/mioa701.c - ARM/MStar/Sigmastar Armv7 SoC support M: Daniel Palmer M: Romain Perier @@ -2511,10 +2461,6 @@ F: drivers/watchdog/msc313e_wdt.c F: include/dt-bindings/clock/mstar-* F: include/dt-bindings/gpio/msc313-gpio.h -ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT -M: Michael Petchkovsky -S: Maintained - ARM/NOMADIK/Ux500 ARCHITECTURES M: Linus Walleij L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -2600,32 +2546,6 @@ F: arch/arm/mach-oxnas/ F: drivers/power/reset/oxnas-restart.c N: oxnas -ARM/PALM TREO SUPPORT -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Orphan -F: arch/arm/mach-pxa/palmtreo.* - -ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT -M: Marek Vasut -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -W: http://hackndev.com -F: arch/arm/mach-pxa/include/mach/palmld.h -F: arch/arm/mach-pxa/include/mach/palmtc.h -F: arch/arm/mach-pxa/include/mach/palmtx.h -F: arch/arm/mach-pxa/palmld.c -F: arch/arm/mach-pxa/palmt5.* -F: arch/arm/mach-pxa/palmtc.c -F: arch/arm/mach-pxa/palmte2.* -F: arch/arm/mach-pxa/palmtx.c - -ARM/PALMZ72 SUPPORT -M: Sergey Lapin -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -W: http://hackndev.com -F: arch/arm/mach-pxa/palmz72.* - ARM/QUALCOMM SUPPORT M: Andy Gross M: Bjorn Andersson @@ -2999,11 +2919,6 @@ F: arch/arm64/boot/dts/ti/Makefile F: arch/arm64/boot/dts/ti/k3-* F: include/dt-bindings/pinctrl/k3.h -ARM/TOSA MACHINE SUPPORT -M: Dmitry Eremin-Solenikov -M: Dirk Opfer -S: Maintained - ARM/TOSHIBA VISCONTI ARCHITECTURE M: Nobuhiro Iwamatsu L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -3073,13 +2988,6 @@ S: Maintained W: http://www.armlinux.org.uk/ F: arch/arm/vfp/ -ARM/VOIPAC PXA270 SUPPORT -M: Marek Vasut -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/include/mach/vpac270.h -F: arch/arm/mach-pxa/vpac270.c - ARM/VT8500 ARM ARCHITECTURE L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Orphan @@ -3097,13 +3005,6 @@ F: drivers/video/fbdev/vt8500lcdfb.* F: drivers/video/fbdev/wm8505fb* F: drivers/video/fbdev/wmt_ge_rops.* -ARM/ZIPIT Z2 SUPPORT -M: Marek Vasut -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/include/mach/z2.h -F: arch/arm/mach-pxa/z2.c - ARM/ZYNQ ARCHITECTURE M: Michal Simek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig deleted file mode 100644 index 95144e380b4b..000000000000 diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig deleted file mode 100644 index 8357d721c69c..000000000000 diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig deleted file mode 100644 index 42adfefdb6dc..000000000000 diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig deleted file mode 100644 index df84640f4f57..000000000000 diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig deleted file mode 100644 index b4c2e6457e04..000000000000 diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig deleted file mode 100644 index ef7b0a0aee3a..000000000000 diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig deleted file mode 100644 index d01f1a6bd04d..000000000000 diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig deleted file mode 100644 index b0c21a99a0a8..000000000000 diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig deleted file mode 100644 index 4fc744c96196..000000000000 diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig deleted file mode 100644 index 5a8776f6aba3..000000000000 diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig deleted file mode 100644 index 096cd7bc667a..000000000000 diff --git a/arch/arm/configs/palmz72_defconfig b/arch/arm/configs/palmz72_defconfig deleted file mode 100644 index a9a808bc2f70..000000000000 diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig deleted file mode 100644 index a392312a13ce..000000000000 diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig deleted file mode 100644 index ae0444949a87..000000000000 diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 0a0f12df40b5..74c7145c79ea 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -19,7 +19,6 @@ CONFIG_ARCH_GUMSTIX=y CONFIG_PXA_SHARPSL=y CONFIG_MACH_AKITA=y CONFIG_MACH_BORZOI=y -CONFIG_PXA_SYSTEMS_CPLDS=y CONFIG_AEABI=y CONFIG_ARCH_FORCE_MAX_ORDER=9 CONFIG_CMDLINE="root=/dev/ram0 ro" @@ -397,9 +396,7 @@ CONFIG_FB_VIRTUAL=m CONFIG_FB_SIMPLE=y CONFIG_LCD_CORGI=m CONFIG_LCD_PLATFORM=m -CONFIG_LCD_TOSA=m CONFIG_BACKLIGHT_PWM=m -CONFIG_BACKLIGHT_TOSA=m CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_LOGO=y diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig deleted file mode 100644 index 009abe1e49ef..000000000000 diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig deleted file mode 100644 index 02f9849893b2..000000000000 diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig deleted file mode 100644 index 6bd9f71b71fc..000000000000 diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig deleted file mode 100644 index c4535315e216..000000000000 diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index b90d98bae68d..1d2eba70c18c 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -16,10 +16,6 @@ menuconfig ARCH_PXA if ARCH_PXA -menu "Intel PXA2xx/PXA3xx Implementations" - -comment "Intel/Marvell Dev Platforms (sorted by hardware release time)" - config MACH_PXA25X_DT bool "Support PXA25x platforms from device tree" select PINCTRL @@ -56,115 +52,7 @@ config MACH_PXA3XX_DT if ATAGS -config ARCH_LUBBOCK - bool "Intel DBPXA250 Development Platform (aka Lubbock)" - depends on UNUSED_BOARD_FILES - select GPIO_REG - select PXA25x - select SA1111 - -config MACH_MAINSTONE - bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)" - depends on UNUSED_BOARD_FILES - select GPIO_REG - select PXA27x - -config MACH_ZYLONITE - bool - select PXA3xx - -config MACH_ZYLONITE300 - bool "PXA3xx Development Platform (aka Zylonite) PXA300/310" - depends on UNUSED_BOARD_FILES - select CPU_PXA300 - select CPU_PXA310 - select MACH_ZYLONITE - -config MACH_ZYLONITE320 - bool "PXA3xx Development Platform (aka Zylonite) PXA320" - depends on UNUSED_BOARD_FILES - select CPU_PXA320 - select MACH_ZYLONITE - -config MACH_LITTLETON - bool "PXA3xx Form Factor Platform (aka Littleton)" - depends on UNUSED_BOARD_FILES - select CPU_PXA300 - select CPU_PXA310 - select PXA3xx - -config MACH_TAVOREVB - bool "PXA930 Evaluation Board (aka TavorEVB)" - depends on UNUSED_BOARD_FILES - select CPU_PXA930 - select CPU_PXA935 - select PXA3xx - select FB - select FB_PXA - -config MACH_SAAR - bool "PXA930 Handheld Platform (aka SAAR)" - depends on UNUSED_BOARD_FILES - select CPU_PXA930 - select CPU_PXA935 - select PXA3xx - select FB - select FB_PXA - -comment "Third Party Dev Platforms (sorted by vendor name)" - -config ARCH_PXA_IDP - bool "Accelent Xscale IDP" - depends on UNUSED_BOARD_FILES - select PXA25x - -config ARCH_VIPER - bool "Arcom/Eurotech VIPER SBC" - depends on UNUSED_BOARD_FILES - select ARCOM_PCMCIA - select I2C_GPIO if I2C=y - select ISA - select PXA25x - -config MACH_ARCOM_ZEUS - bool "Arcom/Eurotech ZEUS SBC" - depends on UNUSED_BOARD_FILES - select ARCOM_PCMCIA - select ISA - select PXA27x - -config MACH_BALLOON3 - bool "Balloon 3 board" - depends on UNUSED_BOARD_FILES - select IWMMXT - select PXA27x - -config MACH_CSB726 - bool "Enable Cogent CSB726 System On a Module" - depends on UNUSED_BOARD_FILES - select IWMMXT - select PXA27x - help - Say Y here if you intend to run this kernel on a Cogent - CSB726 System On Module. - -config CSB726_CSB701 - bool "Enable support for CSB701 baseboard" - depends on UNUSED_BOARD_FILES - depends on MACH_CSB726 - -config MACH_CM_X300 - bool "CompuLab CM-X300 modules" - depends on UNUSED_BOARD_FILES - select CPU_PXA300 - select CPU_PXA310 - select PXA3xx - -config MACH_CAPC7117 - bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM" - depends on UNUSED_BOARD_FILES - select CPU_PXA320 - select PXA3xx +comment "Legacy board files" config ARCH_GUMSTIX bool "Gumstix XScale 255 boards" @@ -185,307 +73,6 @@ config GUMSTIX_AM300EPD endchoice -config MACH_XCEP - bool "Iskratel Electronics XCEP" - depends on UNUSED_BOARD_FILES - select MTD - select MTD_CFI - select MTD_CFI_INTELEXT - select MTD_PHYSMAP - select PXA25x - help - PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash. - Tuned for usage in Libera instruments for particle accelerators. - -config TRIZEPS_PXA - bool "PXA based Keith und Koep Trizeps DIMM-Modules" - depends on UNUSED_BOARD_FILES - -config MACH_TRIZEPS4 - bool "Keith und Koep Trizeps4 DIMM-Module" - depends on TRIZEPS_PXA - select PXA27x - select TRIZEPS_PCMCIA - -config MACH_TRIZEPS4WL - bool "Keith und Koep Trizeps4-WL DIMM-Module" - depends on TRIZEPS_PXA - select MACH_TRIZEPS4 - select PXA27x - select TRIZEPS_PCMCIA - -choice - prompt "Select base board for Trizeps module" - depends on TRIZEPS_PXA - -config MACH_TRIZEPS_CONXS - bool "ConXS Eval Board" - -config MACH_TRIZEPS_UCONXS - bool "uConXS Eval Board" - -config MACH_TRIZEPS_ANY - bool "another Board" - -endchoice - -config ARCOM_PCMCIA - bool - help - Generic option for Arcom Viper/Zeus PCMCIA - -config TRIZEPS_PCMCIA - bool - help - Enable PCMCIA support for Trizeps modules - -config MACH_LOGICPD_PXA270 - bool "LogicPD PXA270 Card Engine Development Platform" - depends on UNUSED_BOARD_FILES - select PXA27x - -config MACH_PCM027 - bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" - depends on UNUSED_BOARD_FILES - select IWMMXT - select PXA27x - -config MACH_PCM990_BASEBOARD - bool "PHYTEC PCM-990 development board" - depends on UNUSED_BOARD_FILES - depends on MACH_PCM027 - -choice - prompt "display on pcm990" - depends on MACH_PCM990_BASEBOARD - -config PCM990_DISPLAY_SHARP - bool "sharp lq084v1dg21 stn display" - -config PCM990_DISPLAY_NEC - bool "nec nl6448bc20_18d tft display" - -config PCM990_DISPLAY_NONE - bool "no display" - -endchoice - -config MACH_COLIBRI - bool "Toradex Colibri PXA270" - depends on UNUSED_BOARD_FILES - select PXA27x - -config MACH_COLIBRI_PXA270_INCOME - bool "Income s.r.o. PXA270 SBC" - depends on UNUSED_BOARD_FILES - depends on MACH_COLIBRI - select PXA27x - -config MACH_COLIBRI300 - bool "Toradex Colibri PXA300/310" - depends on UNUSED_BOARD_FILES - select CPU_PXA300 - select CPU_PXA310 - select PXA3xx - -config MACH_COLIBRI320 - bool "Toradex Colibri PXA320" - depends on UNUSED_BOARD_FILES - select CPU_PXA320 - select PXA3xx - -config MACH_COLIBRI_EVALBOARD - bool "Toradex Colibri Evaluation Carrier Board support" - depends on UNUSED_BOARD_FILES - depends on MACH_COLIBRI || MACH_COLIBRI300 || MACH_COLIBRI320 - -config MACH_VPAC270 - bool "Voipac PXA270" - depends on UNUSED_BOARD_FILES - select HAVE_PATA_PLATFORM - select PXA27x - help - PXA270 based Single Board Computer. - -comment "End-user Products (sorted by vendor name)" - -config MACH_H4700 - bool "HP iPAQ hx4700" - depends on UNUSED_BOARD_FILES - select IWMMXT - select PXA27x - -config MACH_H5000 - bool "HP iPAQ h5000" - depends on UNUSED_BOARD_FILES - select PXA25x - -config MACH_HIMALAYA - bool "HTC Himalaya Support" - depends on UNUSED_BOARD_FILES - select CPU_PXA26x - -config MACH_MAGICIAN - bool "Enable HTC Magician Support" - depends on UNUSED_BOARD_FILES - select IWMMXT - select PXA27x - -config MACH_MIOA701 - bool "Mitac Mio A701 Support" - depends on UNUSED_BOARD_FILES - select IWMMXT - select PXA27x - help - Say Y here if you intend to run this kernel on a - MIO A701. Currently there is only basic support - for this PDA. - -config PXA_EZX - bool "Motorola EZX Platform" - depends on UNUSED_BOARD_FILES - select IWMMXT - select PXA27x - -config MACH_EZX_A780 - bool "Motorola EZX A780" - default y - depends on PXA_EZX - -config MACH_EZX_E680 - bool "Motorola EZX E680" - default y - depends on PXA_EZX - -config MACH_EZX_A1200 - bool "Motorola EZX A1200" - default y - depends on PXA_EZX - -config MACH_EZX_A910 - bool "Motorola EZX A910" - default y - depends on PXA_EZX - -config MACH_EZX_E6 - bool "Motorola EZX E6" - default y - depends on PXA_EZX - -config MACH_EZX_E2 - bool "Motorola EZX E2" - default y - depends on PXA_EZX - -config MACH_MP900C - bool "Nec Mobilepro 900/c" - depends on UNUSED_BOARD_FILES - select PXA25x - -config ARCH_PXA_PALM - bool "PXA based Palm PDAs" - depends on UNUSED_BOARD_FILES - -config MACH_PALM27X - bool - -config MACH_PALMTE2 - bool "Palm Tungsten|E2" - depends on UNUSED_BOARD_FILES - default y - depends on ARCH_PXA_PALM - select PXA25x - help - Say Y here if you intend to run this kernel on a Palm Tungsten|E2 - handheld computer. - -config MACH_PALMTC - bool "Palm Tungsten|C" - default y - depends on ARCH_PXA_PALM - select PXA25x - help - Say Y here if you intend to run this kernel on a Palm Tungsten|C - handheld computer. - -config MACH_PALMT5 - bool "Palm Tungsten|T5" - depends on UNUSED_BOARD_FILES - default y - depends on ARCH_PXA_PALM - select IWMMXT - select MACH_PALM27X - select PXA27x - help - Say Y here if you intend to run this kernel on a Palm Tungsten|T5 - handheld computer. - -config MACH_PALMTX - bool "Palm T|X" - depends on UNUSED_BOARD_FILES - default y - depends on ARCH_PXA_PALM - select IWMMXT - select MACH_PALM27X - select PXA27x - help - Say Y here if you intend to run this kernel on a Palm T|X - handheld computer. - -config MACH_PALMZ72 - bool "Palm Zire 72" - depends on UNUSED_BOARD_FILES - default y - depends on ARCH_PXA_PALM - select IWMMXT - select MACH_PALM27X - select PXA27x - help - Say Y here if you intend to run this kernel on Palm Zire 72 - handheld computer. - -config MACH_PALMLD - bool "Palm LifeDrive" - depends on UNUSED_BOARD_FILES - default y - depends on ARCH_PXA_PALM - select IWMMXT - select MACH_PALM27X - select PXA27x - help - Say Y here if you intend to run this kernel on a Palm LifeDrive - handheld computer. - -config PALM_TREO - bool - depends on ARCH_PXA_PALM - -config MACH_CENTRO - bool "Palm Centro 685 (GSM)" - depends on UNUSED_BOARD_FILES - default y - depends on ARCH_PXA_PALM - select IWMMXT - select MACH_PALM27X - select PALM_TREO - select PXA27x - help - Say Y here if you intend to run this kernel on Palm Centro 685 (GSM) - smartphone. - -config MACH_TREO680 - bool "Palm Treo 680" - depends on UNUSED_BOARD_FILES - default y - depends on ARCH_PXA_PALM - select IWMMXT - select MACH_PALM27X - select PALM_TREO - select PXA27x - help - Say Y here if you intend to run this kernel on Palm Treo 680 - smartphone. - config PXA_SHARPSL bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" select SHARP_PARAM @@ -505,34 +92,6 @@ config PXA_SHARPSL_DETECT_MACH_ID the Zaurus machine ID at run-time. For latest kexec-based boot loader, this is not necessary. -config MACH_POODLE - bool "Enable Sharp SL-5600 (Poodle) Support" - depends on PXA_SHARPSL - depends on UNUSED_BOARD_FILES - select PXA25x - select SHARP_LOCOMO - -config MACH_CORGI - bool "Enable Sharp SL-C700 (Corgi) Support" - depends on PXA_SHARPSL - depends on UNUSED_BOARD_FILES - select PXA25x - select PXA_SHARP_C7xx - -config MACH_SHEPHERD - bool "Enable Sharp SL-C750 (Shepherd) Support" - depends on PXA_SHARPSL - depends on UNUSED_BOARD_FILES - select PXA25x - select PXA_SHARP_C7xx - -config MACH_HUSKY - bool "Enable Sharp SL-C760 (Husky) Support" - depends on PXA_SHARPSL - depends on UNUSED_BOARD_FILES - select PXA25x - select PXA_SHARP_C7xx - config MACH_AKITA bool "Enable Sharp SL-1000 (Akita) Support" depends on PXA_SHARPSL @@ -554,98 +113,7 @@ config MACH_BORZOI select PXA27x select PXA_SHARP_Cxx00 -config MACH_TOSA - bool "Enable Sharp SL-6000x (Tosa) Support" - depends on UNUSED_BOARD_FILES - depends on PXA_SHARPSL - select PXA25x - -config TOSA_BT - tristate "Control the state of built-in bluetooth chip on Sharp SL-6000" - depends on MACH_TOSA && NET - select RFKILL - help - This is a simple driver that is able to control - the state of built in bluetooth chip on tosa. - -config TOSA_USE_EXT_KEYCODES - bool "Tosa keyboard: use extended keycodes" - depends on MACH_TOSA - help - Say Y here to enable the tosa keyboard driver to generate extended - (>= 127) keycodes. Be aware, that they can't be correctly interpreted - by either console keyboard driver or by Kdrive keybd driver. - - Say Y only if you know, what you are doing! - -config MACH_ICONTROL - bool "TMT iControl/SafeTCam based on the MXM-8x10 CoM" - depends on UNUSED_BOARD_FILES - select CPU_PXA320 - select PXA3xx - -config ARCH_PXA_ESERIES - bool "PXA based Toshiba e-series PDAs" - depends on UNUSED_BOARD_FILES - select FB_W100 - select FB - select PXA25x - -config MACH_E330 - bool "Toshiba e330" - default y - depends on ARCH_PXA_ESERIES - help - Say Y here if you intend to run this kernel on a Toshiba - e330 family PDA. - -config MACH_E350 - bool "Toshiba e350" - default y - depends on ARCH_PXA_ESERIES - help - Say Y here if you intend to run this kernel on a Toshiba - e350 family PDA. - -config MACH_E740 - bool "Toshiba e740" - default y - depends on ARCH_PXA_ESERIES - help - Say Y here if you intend to run this kernel on a Toshiba - e740 family PDA. - -config MACH_E750 - bool "Toshiba e750" - default y - depends on ARCH_PXA_ESERIES - help - Say Y here if you intend to run this kernel on a Toshiba - e750 family PDA. - -config MACH_E400 - bool "Toshiba e400" - default y - depends on ARCH_PXA_ESERIES - help - Say Y here if you intend to run this kernel on a Toshiba - e400 family PDA. - -config MACH_E800 - bool "Toshiba e800" - default y - depends on ARCH_PXA_ESERIES - help - Say Y here if you intend to run this kernel on a Toshiba - e800 family PDA. - -config MACH_ZIPIT2 - bool "Zipit Z2 Handheld" - depends on UNUSED_BOARD_FILES - select PXA27x - endif # ATAGS -endmenu config PXA25x bool @@ -659,12 +127,6 @@ config PXA27x help Select code specific to PXA27x variants -config CPU_PXA26x - bool - select PXA25x - help - Select code specific to PXA26x (codename Dalhart) - config PXA3xx bool select CPU_XSC3 @@ -677,37 +139,6 @@ config CPU_PXA300 help PXA300 (codename Monahans-L) -config CPU_PXA310 - bool - select CPU_PXA300 - select PXA310_ULPI if USB_ULPI - help - PXA310 (codename Monahans-LV) - -config CPU_PXA320 - bool - select PXA3xx - help - PXA320 (codename Monahans-P) - -config CPU_PXA930 - bool - select PXA3xx - help - PXA930 (codename Tavor-P) - -config CPU_PXA935 - bool - select CPU_PXA930 - help - PXA935 (codename Tavor-P65) - -config PXA_SHARP_C7xx - bool - select SHARPSL_PM - help - Enable support for all Sharp C7xx models - config PXA_SHARP_Cxx00 bool select SHARPSL_PM @@ -726,16 +157,4 @@ config SHARPSL_PM_MAX1111 select SPI select SPI_MASTER -config PXA310_ULPI - bool - -config PXA_SYSTEMS_CPLDS - tristate "Motherboard cplds" - default ARCH_LUBBOCK || MACH_MAINSTONE - help - This driver supports the Lubbock and Mainstone multifunction chip - found on the pxa25x development platform system (Lubbock) and pxa27x - development platform system (Mainstone). This IO board supports the - interrupts handling, ethernet controller, flash chips, etc ... - endif diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 0aec36e67dc1..4ca8cac2e60f 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -14,8 +14,6 @@ obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o pxa2xx.o pxa27x.o obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o obj-$(CONFIG_CPU_PXA300) += pxa300.o -obj-$(CONFIG_CPU_PXA320) += pxa320.o -obj-$(CONFIG_CPU_PXA930) += pxa930.o # NOTE: keep the order of boards in accordance to their order in Kconfig @@ -24,66 +22,10 @@ obj-$(CONFIG_MACH_PXA25X_DT) += pxa-dt.o obj-$(CONFIG_MACH_PXA27X_DT) += pxa-dt.o obj-$(CONFIG_MACH_PXA3XX_DT) += pxa-dt.o -# Intel/Marvell Dev Platforms -obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o -obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o -obj-$(CONFIG_MACH_ZYLONITE300) += zylonite.o zylonite_pxa300.o -obj-$(CONFIG_MACH_ZYLONITE320) += zylonite.o zylonite_pxa320.o -obj-$(CONFIG_MACH_LITTLETON) += littleton.o -obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o -obj-$(CONFIG_MACH_SAAR) += saar.o - # 3rd Party Dev Platforms -obj-$(CONFIG_ARCH_PXA_IDP) += idp.o -obj-$(CONFIG_ARCH_VIPER) += viper.o -obj-$(CONFIG_MACH_ARCOM_ZEUS) += zeus.o -obj-$(CONFIG_ARCOM_PCMCIA) += viper-pcmcia.o -obj-$(CONFIG_MACH_BALLOON3) += balloon3.o balloon3-pcmcia.o -obj-$(CONFIG_MACH_CSB726) += csb726.o -obj-$(CONFIG_CSB726_CSB701) += csb701.o -obj-$(CONFIG_MACH_CM_X300) += cm-x300.o -obj-$(CONFIG_MACH_CAPC7117) += capc7117.o mxm8x10.o obj-$(CONFIG_ARCH_GUMSTIX) += gumstix.o obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o obj-$(CONFIG_GUMSTIX_AM300EPD) += am300epd.o -obj-$(CONFIG_MACH_XCEP) += xcep.o -obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o -obj-$(CONFIG_TRIZEPS_PCMCIA) += trizeps4-pcmcia.o -obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o -obj-$(CONFIG_MACH_PCM027) += pcm027.o -obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o -obj-$(CONFIG_MACH_COLIBRI) += colibri-pxa270.o colibri-pcmcia.o -obj-$(CONFIG_MACH_COLIBRI_EVALBOARD) += colibri-evalboard.o -obj-$(CONFIG_MACH_COLIBRI_PXA270_INCOME) += colibri-pxa270-income.o -obj-$(CONFIG_MACH_COLIBRI300) += colibri-pxa3xx.o colibri-pxa300.o -obj-$(CONFIG_MACH_COLIBRI320) += colibri-pxa3xx.o colibri-pxa320.o colibri-pcmcia.o -obj-$(CONFIG_MACH_VPAC270) += vpac270.o vpac270-pcmcia.o # End-user Products -obj-$(CONFIG_MACH_H4700) += hx4700.o -obj-$(CONFIG_MACH_H4700) += hx4700-pcmcia.o -obj-$(CONFIG_MACH_H5000) += h5000.o -obj-$(CONFIG_MACH_HIMALAYA) += himalaya.o -obj-$(CONFIG_MACH_MAGICIAN) += magician.o -obj-$(CONFIG_MACH_MIOA701) += mioa701.o mioa701_bootresume.o -obj-$(CONFIG_PXA_EZX) += ezx.o -obj-$(CONFIG_MACH_MP900C) += mp900.o -obj-$(CONFIG_MACH_PALMTE2) += palmte2.o -obj-$(CONFIG_MACH_PALMTC) += palmtc.o palmtc-pcmcia.o -obj-$(CONFIG_MACH_PALM27X) += palm27x.o -obj-$(CONFIG_MACH_PALMT5) += palmt5.o -obj-$(CONFIG_MACH_PALMTX) += palmtx.o palmtx-pcmcia.o -obj-$(CONFIG_MACH_PALMZ72) += palmz72.o -obj-$(CONFIG_MACH_PALMLD) += palmld.o palmld-pcmcia.o -obj-$(CONFIG_PALM_TREO) += palmtreo.o -obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o -obj-$(CONFIG_MACH_POODLE) += poodle.o -obj-$(CONFIG_MACH_TOSA) += tosa.o -obj-$(CONFIG_MACH_ICONTROL) += icontrol.o mxm8x10.o -obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o -obj-$(CONFIG_MACH_E740) += e740-pcmcia.o -obj-$(CONFIG_MACH_ZIPIT2) += z2.o - -obj-$(CONFIG_PXA_SYSTEMS_CPLDS) += pxa_cplds_irqs.o -obj-$(CONFIG_TOSA_BT) += tosa-bt.o diff --git a/arch/arm/mach-pxa/balloon3-pcmcia.c b/arch/arm/mach-pxa/balloon3-pcmcia.c deleted file mode 100644 index 6a27b76cc603..000000000000 diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c deleted file mode 100644 index 896d47d9a8dc..000000000000 diff --git a/arch/arm/mach-pxa/balloon3.h b/arch/arm/mach-pxa/balloon3.h deleted file mode 100644 index 04f3639c4082..000000000000 diff --git a/arch/arm/mach-pxa/capc7117.c b/arch/arm/mach-pxa/capc7117.c deleted file mode 100644 index 7712327f56a8..000000000000 diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c deleted file mode 100644 index 01f364a66446..000000000000 diff --git a/arch/arm/mach-pxa/colibri-evalboard.c b/arch/arm/mach-pxa/colibri-evalboard.c deleted file mode 100644 index b62af07b8f96..000000000000 diff --git a/arch/arm/mach-pxa/colibri-pcmcia.c b/arch/arm/mach-pxa/colibri-pcmcia.c deleted file mode 100644 index 9da7b478e5eb..000000000000 diff --git a/arch/arm/mach-pxa/colibri-pxa270-income.c b/arch/arm/mach-pxa/colibri-pxa270-income.c deleted file mode 100644 index f6eaf464ca83..000000000000 diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c deleted file mode 100644 index 5dc669752836..000000000000 diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c deleted file mode 100644 index 11ca6c4795e7..000000000000 diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c deleted file mode 100644 index 1a59056e181e..000000000000 diff --git a/arch/arm/mach-pxa/colibri-pxa3xx.c b/arch/arm/mach-pxa/colibri-pxa3xx.c deleted file mode 100644 index 77d6ef5fa42d..000000000000 diff --git a/arch/arm/mach-pxa/colibri.h b/arch/arm/mach-pxa/colibri.h deleted file mode 100644 index 01a46f36cc1f..000000000000 diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c deleted file mode 100644 index 5738496717e2..000000000000 diff --git a/arch/arm/mach-pxa/corgi.h b/arch/arm/mach-pxa/corgi.h deleted file mode 100644 index b565ca7b8cda..000000000000 diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c deleted file mode 100644 index 555a5c1afd96..000000000000 diff --git a/arch/arm/mach-pxa/csb701.c b/arch/arm/mach-pxa/csb701.c deleted file mode 100644 index 527c9fdf9795..000000000000 diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c deleted file mode 100644 index 410b1af87d55..000000000000 diff --git a/arch/arm/mach-pxa/csb726.h b/arch/arm/mach-pxa/csb726.h deleted file mode 100644 index 628928743bd5..000000000000 diff --git a/arch/arm/mach-pxa/e740-pcmcia.c b/arch/arm/mach-pxa/e740-pcmcia.c deleted file mode 100644 index 11a2c5d42920..000000000000 diff --git a/arch/arm/mach-pxa/eseries-gpio.h b/arch/arm/mach-pxa/eseries-gpio.h deleted file mode 100644 index 5c645600d401..000000000000 diff --git a/arch/arm/mach-pxa/eseries-irq.h b/arch/arm/mach-pxa/eseries-irq.h deleted file mode 100644 index 572d573ce66b..000000000000 diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c deleted file mode 100644 index 2e4daeab6278..000000000000 diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c deleted file mode 100644 index 69c2ec02a16c..000000000000 diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c deleted file mode 100644 index 212efe24aedb..000000000000 diff --git a/arch/arm/mach-pxa/h5000.h b/arch/arm/mach-pxa/h5000.h deleted file mode 100644 index 58687e94a0c7..000000000000 diff --git a/arch/arm/mach-pxa/himalaya.c b/arch/arm/mach-pxa/himalaya.c deleted file mode 100644 index 469ffeec6da5..000000000000 diff --git a/arch/arm/mach-pxa/hx4700-pcmcia.c b/arch/arm/mach-pxa/hx4700-pcmcia.c deleted file mode 100644 index e2331dfe427d..000000000000 diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c deleted file mode 100644 index 2fd665944103..000000000000 diff --git a/arch/arm/mach-pxa/hx4700.h b/arch/arm/mach-pxa/hx4700.h deleted file mode 100644 index 0c30e6d9c660..000000000000 diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c deleted file mode 100644 index 624088257cfc..000000000000 diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c deleted file mode 100644 index 525d01ddfbbb..000000000000 diff --git a/arch/arm/mach-pxa/idp.h b/arch/arm/mach-pxa/idp.h deleted file mode 100644 index 81b9bd9ba754..000000000000 diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c deleted file mode 100644 index 98423a96f440..000000000000 diff --git a/arch/arm/mach-pxa/littleton.h b/arch/arm/mach-pxa/littleton.h deleted file mode 100644 index a0a8d2bf9d71..000000000000 diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c deleted file mode 100644 index 0e4123c5fd42..000000000000 diff --git a/arch/arm/mach-pxa/lpd270.h b/arch/arm/mach-pxa/lpd270.h deleted file mode 100644 index 4b096fb9d61f..000000000000 diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c deleted file mode 100644 index 4f0944f3b262..000000000000 diff --git a/arch/arm/mach-pxa/lubbock.h b/arch/arm/mach-pxa/lubbock.h deleted file mode 100644 index 55cf91e22ae2..000000000000 diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c deleted file mode 100644 index 0827ebca1d38..000000000000 diff --git a/arch/arm/mach-pxa/magician.h b/arch/arm/mach-pxa/magician.h deleted file mode 100644 index e1e4f9f6b22b..000000000000 diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c deleted file mode 100644 index fd386f1c414c..000000000000 diff --git a/arch/arm/mach-pxa/mainstone.h b/arch/arm/mach-pxa/mainstone.h deleted file mode 100644 index f116c56cf5d9..000000000000 diff --git a/arch/arm/mach-pxa/mfp-pxa320.h b/arch/arm/mach-pxa/mfp-pxa320.h deleted file mode 100644 index 21c31eb52d6c..000000000000 diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c deleted file mode 100644 index d08f962ffb04..000000000000 diff --git a/arch/arm/mach-pxa/mioa701.h b/arch/arm/mach-pxa/mioa701.h deleted file mode 100644 index d94295c67460..000000000000 diff --git a/arch/arm/mach-pxa/mioa701_bootresume.S b/arch/arm/mach-pxa/mioa701_bootresume.S deleted file mode 100644 index 4ad2fa27fc41..000000000000 diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c deleted file mode 100644 index 8ef8ac4ab4ac..000000000000 diff --git a/arch/arm/mach-pxa/mxm8x10.c b/arch/arm/mach-pxa/mxm8x10.c deleted file mode 100644 index 35546b59c88e..000000000000 diff --git a/arch/arm/mach-pxa/mxm8x10.h b/arch/arm/mach-pxa/mxm8x10.h deleted file mode 100644 index dcd32321c995..000000000000 diff --git a/arch/arm/mach-pxa/palm27x.c b/arch/arm/mach-pxa/palm27x.c deleted file mode 100644 index 1a8d25eecac3..000000000000 diff --git a/arch/arm/mach-pxa/palm27x.h b/arch/arm/mach-pxa/palm27x.h deleted file mode 100644 index bd3075bbb3aa..000000000000 diff --git a/arch/arm/mach-pxa/palmld-pcmcia.c b/arch/arm/mach-pxa/palmld-pcmcia.c deleted file mode 100644 index 720294a50864..000000000000 diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c deleted file mode 100644 index 32308c63884e..000000000000 diff --git a/arch/arm/mach-pxa/palmld.h b/arch/arm/mach-pxa/palmld.h deleted file mode 100644 index 99a6d8b3a1e3..000000000000 diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c deleted file mode 100644 index 463b62ec1b01..000000000000 diff --git a/arch/arm/mach-pxa/palmt5.h b/arch/arm/mach-pxa/palmt5.h deleted file mode 100644 index cf84aedca717..000000000000 diff --git a/arch/arm/mach-pxa/palmtc-pcmcia.c b/arch/arm/mach-pxa/palmtc-pcmcia.c deleted file mode 100644 index 8e3f382343fe..000000000000 diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c deleted file mode 100644 index 3054ffa397ad..000000000000 diff --git a/arch/arm/mach-pxa/palmtc.h b/arch/arm/mach-pxa/palmtc.h deleted file mode 100644 index 9257a02c46e5..000000000000 diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c deleted file mode 100644 index fedac670a8af..000000000000 diff --git a/arch/arm/mach-pxa/palmte2.h b/arch/arm/mach-pxa/palmte2.h deleted file mode 100644 index 2589400c1a2f..000000000000 diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c deleted file mode 100644 index 238a31f32cba..000000000000 diff --git a/arch/arm/mach-pxa/palmtreo.h b/arch/arm/mach-pxa/palmtreo.h deleted file mode 100644 index 5715cd505424..000000000000 diff --git a/arch/arm/mach-pxa/palmtx-pcmcia.c b/arch/arm/mach-pxa/palmtx-pcmcia.c deleted file mode 100644 index 8c2aaad93043..000000000000 diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c deleted file mode 100644 index c0d0762540ab..000000000000 diff --git a/arch/arm/mach-pxa/palmtx.h b/arch/arm/mach-pxa/palmtx.h deleted file mode 100644 index ec88abf0fc6c..000000000000 diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c deleted file mode 100644 index 66e8fe6f1661..000000000000 diff --git a/arch/arm/mach-pxa/palmz72.h b/arch/arm/mach-pxa/palmz72.h deleted file mode 100644 index 40f3f9987983..000000000000 diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c deleted file mode 100644 index 7ff6f0d655c8..000000000000 diff --git a/arch/arm/mach-pxa/pcm027.h b/arch/arm/mach-pxa/pcm027.h deleted file mode 100644 index 58ade4ad6ba3..000000000000 diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c deleted file mode 100644 index 33a9d2eeca1c..000000000000 diff --git a/arch/arm/mach-pxa/pcm990_baseboard.h b/arch/arm/mach-pxa/pcm990_baseboard.h deleted file mode 100644 index 18cf71decb03..000000000000 diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c deleted file mode 100644 index 7772a39430ed..000000000000 diff --git a/arch/arm/mach-pxa/poodle.h b/arch/arm/mach-pxa/poodle.h deleted file mode 100644 index 00798b44f204..000000000000 diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c deleted file mode 100644 index e372e6c118de..000000000000 diff --git a/arch/arm/mach-pxa/pxa320.h b/arch/arm/mach-pxa/pxa320.h deleted file mode 100644 index c701e3f663b0..000000000000 diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c deleted file mode 100644 index b9021a40cbd1..000000000000 diff --git a/arch/arm/mach-pxa/pxa930.h b/arch/arm/mach-pxa/pxa930.h deleted file mode 100644 index bbf25c044641..000000000000 diff --git a/arch/arm/mach-pxa/pxa_cplds_irqs.c b/arch/arm/mach-pxa/pxa_cplds_irqs.c deleted file mode 100644 index eda5a47d7fbb..000000000000 diff --git a/arch/arm/mach-pxa/regs-uart.h b/arch/arm/mach-pxa/regs-uart.h deleted file mode 100644 index 490e9ca16297..000000000000 diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c deleted file mode 100644 index 3275b679792b..000000000000 diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index a829baf8d922..929cc51ed7c2 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c @@ -170,10 +170,6 @@ extern int max1111_read_channel(int); */ int sharpsl_pm_pxa_read_max1111(int channel) { - /* Ugly, better move this function into another module */ - if (machine_is_tosa()) - return 0; - /* max1111 accepts channels from 0-3, however, * it is encoded from 0-7 here in the code. */ diff --git a/arch/arm/mach-pxa/tavorevb.c b/arch/arm/mach-pxa/tavorevb.c deleted file mode 100644 index a15eb3b9484d..000000000000 diff --git a/arch/arm/mach-pxa/tosa-bt.c b/arch/arm/mach-pxa/tosa-bt.c deleted file mode 100644 index c9541632b8b1..000000000000 diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c deleted file mode 100644 index d41641d6cfcd..000000000000 diff --git a/arch/arm/mach-pxa/tosa.h b/arch/arm/mach-pxa/tosa.h deleted file mode 100644 index 3b3efa0a0e22..000000000000 diff --git a/arch/arm/mach-pxa/tosa_bt.h b/arch/arm/mach-pxa/tosa_bt.h deleted file mode 100644 index 56acd5dabec4..000000000000 diff --git a/arch/arm/mach-pxa/trizeps4-pcmcia.c b/arch/arm/mach-pxa/trizeps4-pcmcia.c deleted file mode 100644 index 25e363770565..000000000000 diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c deleted file mode 100644 index 716cce885379..000000000000 diff --git a/arch/arm/mach-pxa/trizeps4.h b/arch/arm/mach-pxa/trizeps4.h deleted file mode 100644 index b6c19d155ef9..000000000000 diff --git a/arch/arm/mach-pxa/viper-pcmcia.c b/arch/arm/mach-pxa/viper-pcmcia.c deleted file mode 100644 index 26599dcc49b3..000000000000 diff --git a/arch/arm/mach-pxa/viper-pcmcia.h b/arch/arm/mach-pxa/viper-pcmcia.h deleted file mode 100644 index a23b58aff9e1..000000000000 diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c deleted file mode 100644 index 5b43351ee840..000000000000 diff --git a/arch/arm/mach-pxa/viper.h b/arch/arm/mach-pxa/viper.h deleted file mode 100644 index 5a8b132229dc..000000000000 diff --git a/arch/arm/mach-pxa/vpac270-pcmcia.c b/arch/arm/mach-pxa/vpac270-pcmcia.c deleted file mode 100644 index 9fd990c8a5fb..000000000000 diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c deleted file mode 100644 index 8f74bafcf1f9..000000000000 diff --git a/arch/arm/mach-pxa/vpac270.h b/arch/arm/mach-pxa/vpac270.h deleted file mode 100644 index 0cd094d8c553..000000000000 diff --git a/arch/arm/mach-pxa/xcep.c b/arch/arm/mach-pxa/xcep.c deleted file mode 100644 index 6bb02b65fb82..000000000000 diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c deleted file mode 100644 index c4d4162a7e6e..000000000000 diff --git a/arch/arm/mach-pxa/z2.h b/arch/arm/mach-pxa/z2.h deleted file mode 100644 index a78b2e28b1db..000000000000 diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c deleted file mode 100644 index ff0d8bb9f557..000000000000 diff --git a/arch/arm/mach-pxa/zeus.h b/arch/arm/mach-pxa/zeus.h deleted file mode 100644 index 8fa6b2923f63..000000000000 diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c deleted file mode 100644 index 8ed75ac29b1a..000000000000 diff --git a/arch/arm/mach-pxa/zylonite.h b/arch/arm/mach-pxa/zylonite.h deleted file mode 100644 index afe3efcb8e04..000000000000 diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c deleted file mode 100644 index 50a8a3547dbc..000000000000 diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c deleted file mode 100644 index 67cab4f1194b..000000000000 diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c index c39f49720fe4..85b95ed461e7 100644 --- a/drivers/input/touchscreen/mainstone-wm97xx.c +++ b/drivers/input/touchscreen/mainstone-wm97xx.c @@ -187,16 +187,6 @@ static int wm97xx_acc_startup(struct wm97xx *wm) "mainstone accelerated touchscreen driver, %d samples/sec\n", cinfo[sp_idx].speed); - /* IRQ driven touchscreen is used on Palm hardware */ - if (machine_is_palmt5() || machine_is_palmtx() || machine_is_palmld()) { - pen_int = 1; - /* There is some obscure mutant of WM9712 interbred with WM9713 - * used on Palm HW */ - wm->variant = WM97xx_WM1613; - } else if (machine_is_zylonite()) { - pen_int = 1; - } - if (pen_int) { gpiod_irq = gpiod_get(wm->dev, "touch", GPIOD_IN); if (IS_ERR(gpiod_irq)) diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 0ea41f1411e5..5254028354f4 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -206,13 +206,7 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, void pxa2xx_configure_sockets(struct device *dev, struct pcmcia_low_level *ops) { - int nr = 1; - - if ((ops->first + ops->nr) > 1 || - machine_is_viper() || machine_is_arcom_zeus()) - nr = 2; - - pxa_smemc_set_pcmcia_socket(nr); + pxa_smemc_set_pcmcia_socket(1); } EXPORT_SYMBOL(pxa2xx_configure_sockets); diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 6c1c2785611b..2a67e33fb5f0 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c @@ -216,10 +216,6 @@ static int pcmcia_probe(struct sa1111_dev *dev) if (machine_is_jornada720()) ret = pcmcia_jornada720_init(dev); #endif -#ifdef CONFIG_ARCH_LUBBOCK - if (machine_is_lubbock()) - ret = pcmcia_lubbock_init(dev); -#endif #ifdef CONFIG_ASSABET_NEPONSET if (machine_is_assabet()) ret = pcmcia_neponset_init(dev); diff --git a/drivers/power/supply/ds2760_battery.c b/drivers/power/supply/ds2760_battery.c index 5f50da524f41..40fba31be174 100644 --- a/drivers/power/supply/ds2760_battery.c +++ b/drivers/power/supply/ds2760_battery.c @@ -227,20 +227,12 @@ static int rated_capacities[] = { 920, /* NEC */ 1440, /* Samsung */ 1440, /* BYD */ -#ifdef CONFIG_MACH_H4700 - 1800, /* HP iPAQ hx4700 3.7V 1800mAh (359113-001) */ -#else 1440, /* Lishen */ -#endif 1440, /* NEC */ 2880, /* Samsung */ 2880, /* BYD */ 2880, /* Lishen */ 2880, /* NEC */ -#ifdef CONFIG_MACH_H4700 - 0, - 3600, /* HP iPAQ hx4700 3.7V 3600mAh (359114-001) */ -#endif }; /* array is level at temps 0°C, 10°C, 20°C, 30°C, 40°C diff --git a/drivers/usb/gadget/udc/pxa25x_udc.c b/drivers/usb/gadget/udc/pxa25x_udc.c index c593fc383481..e19b84a46a1e 100644 --- a/drivers/usb/gadget/udc/pxa25x_udc.c +++ b/drivers/usb/gadget/udc/pxa25x_udc.c @@ -1559,40 +1559,6 @@ static int pxa25x_udc_stop(struct usb_gadget*g) return 0; } -/*-------------------------------------------------------------------------*/ - -#ifdef CONFIG_ARCH_LUBBOCK - -/* Lubbock has separate connect and disconnect irqs. More typical designs - * use one GPIO as the VBUS IRQ, and another to control the D+ pullup. - */ - -static irqreturn_t -lubbock_vbus_irq(int irq, void *_dev) -{ - struct pxa25x_udc *dev = _dev; - int vbus; - - dev->stats.irqs++; - if (irq == dev->usb_irq) { - vbus = 1; - disable_irq(dev->usb_irq); - enable_irq(dev->usb_disc_irq); - } else if (irq == dev->usb_disc_irq) { - vbus = 0; - disable_irq(dev->usb_disc_irq); - enable_irq(dev->usb_irq); - } else { - return IRQ_NONE; - } - - pxa25x_udc_vbus_session(&dev->gadget, vbus); - return IRQ_HANDLED; -} - -#endif - - /*-------------------------------------------------------------------------*/ static inline void clear_ep_state (struct pxa25x_udc *dev) @@ -2413,34 +2379,6 @@ static int pxa25x_udc_probe(struct platform_device *pdev) } dev->got_irq = 1; -#ifdef CONFIG_ARCH_LUBBOCK - if (machine_is_lubbock()) { - dev->usb_irq = platform_get_irq(pdev, 1); - if (dev->usb_irq < 0) - return dev->usb_irq; - - dev->usb_disc_irq = platform_get_irq(pdev, 2); - if (dev->usb_disc_irq < 0) - return dev->usb_disc_irq; - - retval = devm_request_irq(&pdev->dev, dev->usb_disc_irq, - lubbock_vbus_irq, 0, driver_name, - dev); - if (retval != 0) { - pr_err("%s: can't get irq %i, err %d\n", - driver_name, dev->usb_disc_irq, retval); - goto err; - } - retval = devm_request_irq(&pdev->dev, dev->usb_irq, - lubbock_vbus_irq, 0, driver_name, - dev); - if (retval != 0) { - pr_err("%s: can't get irq %i, err %d\n", - driver_name, dev->usb_irq, retval); - goto err; - } - } else -#endif create_debug_files(dev); retval = usb_add_gadget_udc(&pdev->dev, &dev->gadget); diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c index 0468ea82159f..346d3e29a843 100644 --- a/drivers/video/backlight/locomolcd.c +++ b/drivers/video/backlight/locomolcd.c @@ -95,8 +95,6 @@ void locomolcd_power(int on) /* read comadj */ if (comadj == -1 && machine_is_collie()) comadj = 128; - if (comadj == -1 && machine_is_poodle()) - comadj = 118; if (on) locomolcd_on(comadj); @@ -181,14 +179,6 @@ static int locomolcd_probe(struct locomo_dev *ldev) locomo_gpio_set_dir(ldev->dev.parent, LOCOMO_GPIO_FL_VR, 0); - /* - * the poodle_lcd_power function is called for the first time - * from fs_initcall, which is before locomo is activated. - * We need to recall poodle_lcd_power here - */ - if (machine_is_poodle()) - locomolcd_power(1); - local_irq_restore(flags); memset(&props, 0, sizeof(struct backlight_properties)); From patchwork Thu Jan 5 13:45:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090665 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 949FDC3DA7A for ; Thu, 5 Jan 2023 23:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bsBMc9/yP8ifTCDhtZ/2xkQ+cVwtlGeWGfCQLPWaRz8=; b=a3nozQv7ck/QD7 Ktw++oGyIjAHP6/FUSqNND9cleOqGszh+acRitPmBvZae2Lugmqb4ZM+cnC5o40xSeuLjh8R4KA0O B9xdrkRtQUmf/0XgoDVrSTwUPQqumqFcrVUmNZ69KNHZpLLTVeyRJ37fv7FAIT0hXKBlyk92uOo2S kqu8aGPA1QCXOgIGGoaFBXECpdafszR6IYwzhRimk/xuAOmmTbepa8or650ZlR5+/kySRUJYA1sOz RhsCUrbhZH3iOOe/ZZAP8ZSVYD9hrkt8nLtUDCxuKvYhnT/2u5P2e1UM5t0SwTZN8LosKoEMa31zG ftfn3kelTnHthsSgq1iA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZFO-00Ftzr-FZ; Thu, 05 Jan 2023 23:02:06 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVSb-00Duf7-El for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:59:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=H8j7QJRBvrEOhtpKeZeH0ZGNQvUIdx+oBedxzxA0OqM=; b=NnGpldxaWrKq5GfHeGnGyE6Irp XazJQSmA3OAhEI7FaqzeiaOXP6dj/i8fvnFz8jnqdFzNGFQpObkk/+Mc7OHxSm5XGHqGzjYPXRz/4 bz+XyOtDoPAeb3VfetBxCViw/c1cbYa/KG10AF4qM/RiR4DclywpEh4ZEuVvBwB27GAMzD3Ix6HCl uXm+MNQJ5BHyVVofUHi7nqY7fD2lUbmWdMx5eCi2lkU6tQVzdqWokKWrC/BYo1faNM2phkBXoBl4t y0VtutS/6MLLx5q0FI3l1xP5a9prTNulSteNUlup8GlWbL63l/yPxlq3aRKUwQ7BLEZfCIIDKw1rE Gq4gqLqg==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQZw-001Lz7-0n for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:46:46 +0000 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 89934B81AD6; 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134644_734389_03179C11 X-CRM114-Status: GOOD ( 17.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 = { .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 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 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 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 -/****************************************************************************** - * 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 ******************************************************************************/ @@ -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 index bd35ddcf3068..000000000000 From patchwork Thu Jan 5 13:45:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090667 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25424C3DA7A for ; Thu, 5 Jan 2023 23:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Oy/v4Adz20k7pGCJIKXFvVvKwGq6xO7EjfCXrlzunHY=; b=o6GqDU5FeHXRqb PHZGrstmnuq9ylcWIILYMIRwduLH7xa5ndgMSbeL56qXlJwsto3LWo0/Q9zkTe+JG/r3k30iZv+Fu qycx+Ka9JkiCuVOf4cnWSVN9ra/hTBnL9Yr7Y1Z9LLH16AI6tsarWW1tfHsGNQjjjjztCz8ZkE7MF zTrG/JehVtGre2dFEXl1mntsOJqu4imRnjxhBLpJStyo88SmlelB/m0VyrtkwYLSDqLPVSRavWqvp ecQfiLPuqysTiKG0EspaO1m2cJD7IWowT+hb92XBs0HJ3OPZLkv9ZvoFKmGrtYr1d+1kbeHKQdRiN TusRjX4uVC1ctzSceobw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZIh-00Fvuh-Vc; Thu, 05 Jan 2023 23:05:32 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVUP-00DvdQ-CW for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 19:01:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=spx9M/KWjHbPE3sV3T5N2eFYaGvBWdvgW9CHtSm+IIY=; b=dqy0htuapcCMggVPUUikroM6xO xGN9ayaY+CapWUuWa0Yj1tZMSV+y3xQR97vh4scaB5wVAlGEfve64cpCA1rA9Y32Ya4M2TZWq3lMN uiqdkyBBDpKBXvcWziTKDQNSp45ZXvPV9hwq9GslaMXr2fjuMcilJ558HNRLcpCzoQrztU4eIZo0l VjG/yz+e6WdMq5K9k9W66a2dEpwj1xDsOU7GOgauJ3VdrVyk6o3y+gt1ce1LfpwZygOAH84FPznAG eCOD9qaLC/c4fGvpJWBpJ2lOw1vW7gr1MBzS3zO/HRKjc3q3Qib/5A7GLGZiYm7KSqPXAJGewJf0u F5dw6pwA==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQZy-001LzQ-1e for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:46:48 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 5C94E61A8A; Thu, 5 Jan 2023 13:46:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEDC4C433EF; Thu, 5 Jan 2023 13:46:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926410; bh=G8P7Dlh0jvFyjoAJiE2Nwh9lRK7Adhw9b5koXsAYWs0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ejFxyqZdkIyc8w2gV3P0BUGzVpl19r73AB20FYQLC0ugf4mc8+x3Ph8o1LPh6aGdu 8o0b7hOJKWIdFVFWkA1G4bdIVzVPNXoico9eYs2d3YfYvuXHeXfsbnn001lRTuvTKu KkxvEcYXpypdiMFbQ6GJ9gYrbBAuS2xNAxbm9zzXMV42tO4Rq2o2ncLFwtkogBwYT/ p2ofra8UNIpATWuNA+8rmWAl7iQacvuJhH0LVN1jIJiQNpUvm/DKfMn6VtXFyWIjkR nggYYNCvHDLv+at6TiRKnAf2ovry3ZgeGPUByPAz5GNFb0+P6g2ecDjlx7IS40WMch JJes+Bb+ONo/Q== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Alan Stern , Greg Kroah-Hartman , linux-usb@vger.kernel.org Subject: [PATCH 03/27] ARM: pxa: remove unused pxa3xx-ulpi Date: Thu, 5 Jan 2023 14:45:58 +0100 Message-Id: <20230105134622.254560-4-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134646_946109_148DA02C X-CRM114-Status: GOOD ( 21.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann This was only used by the cm-x300 board, which is now gone. Cc: Alan Stern Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/Makefile | 2 +- arch/arm/mach-pxa/devices.c | 28 -- arch/arm/mach-pxa/devices.h | 1 - arch/arm/mach-pxa/pxa3xx-ulpi.c | 385 ------------------ arch/arm/mach-pxa/regs-u2d.h | 199 --------- drivers/usb/host/ohci-pxa27x.c | 9 - include/linux/platform_data/usb-pxa3xx-ulpi.h | 32 -- 7 files changed, 1 insertion(+), 655 deletions(-) delete mode 100644 arch/arm/mach-pxa/pxa3xx-ulpi.c delete mode 100644 arch/arm/mach-pxa/regs-u2d.h delete mode 100644 include/linux/platform_data/usb-pxa3xx-ulpi.h diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 4ca8cac2e60f..9624f90d9ef6 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -12,7 +12,7 @@ obj-$(CONFIG_PM) += pm.o sleep.o standby.o # SoC-specific code obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o pxa2xx.o pxa27x.o -obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o +obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o pxa3xx.o smemc.o obj-$(CONFIG_CPU_PXA300) += pxa300.o # NOTE: keep the order of boards in accordance to their order in Kconfig diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 72adaac9f332..8e3bc56d2044 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -12,7 +12,6 @@ #include #include "udc.h" -#include #include #include #include "irqs.h" @@ -130,33 +129,6 @@ struct platform_device pxa27x_device_udc = { } }; -#ifdef CONFIG_PXA3xx -static struct resource pxa3xx_u2d_resources[] = { - [0] = { - .start = 0x54100000, - .end = 0x54100fff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_USB2, - .end = IRQ_USB2, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device pxa3xx_device_u2d = { - .name = "pxa3xx-u2d", - .id = -1, - .resource = pxa3xx_u2d_resources, - .num_resources = ARRAY_SIZE(pxa3xx_u2d_resources), -}; - -void __init pxa3xx_set_u2d_info(struct pxa3xx_u2d_platform_data *info) -{ - pxa_register_device(&pxa3xx_device_u2d, info); -} -#endif /* CONFIG_PXA3xx */ - static struct resource pxafb_resources[] = { [0] = { .start = 0x44000000, diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h index 2828bea76cd7..82c83939017a 100644 --- a/arch/arm/mach-pxa/devices.h +++ b/arch/arm/mach-pxa/devices.h @@ -9,7 +9,6 @@ extern struct platform_device pxa3xx_device_mci2; extern struct platform_device pxa3xx_device_mci3; extern struct platform_device pxa25x_device_udc; extern struct platform_device pxa27x_device_udc; -extern struct platform_device pxa3xx_device_u2d; extern struct platform_device pxa_device_fb; extern struct platform_device pxa_device_ffuart; extern struct platform_device pxa_device_btuart; diff --git a/arch/arm/mach-pxa/pxa3xx-ulpi.c b/arch/arm/mach-pxa/pxa3xx-ulpi.c deleted file mode 100644 index c29a7f0fa1b0..000000000000 diff --git a/arch/arm/mach-pxa/regs-u2d.h b/arch/arm/mach-pxa/regs-u2d.h deleted file mode 100644 index ab517ba62c9a..000000000000 diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index a1dad8745622..0bc7e96bcc93 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -275,7 +274,6 @@ static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev) int retval; struct pxaohci_platform_data *inf; uint32_t uhchr; - struct usb_hcd *hcd = dev_get_drvdata(dev); inf = dev_get_platdata(dev); @@ -301,9 +299,6 @@ static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev) return retval; } - if (cpu_is_pxa3xx()) - pxa3xx_u2d_start_hc(&hcd->self); - uhchr = __raw_readl(pxa_ohci->mmio_base + UHCHR) & ~UHCHR_SSE; __raw_writel(uhchr, pxa_ohci->mmio_base + UHCHR); __raw_writel(UHCHIE_UPRIE | UHCHIE_RWIE, pxa_ohci->mmio_base + UHCHIE); @@ -316,14 +311,10 @@ static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev) static void pxa27x_stop_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev) { struct pxaohci_platform_data *inf; - struct usb_hcd *hcd = dev_get_drvdata(dev); uint32_t uhccoms; inf = dev_get_platdata(dev); - if (cpu_is_pxa3xx()) - pxa3xx_u2d_stop_hc(&hcd->self); - if (inf->exit) inf->exit(dev); diff --git a/include/linux/platform_data/usb-pxa3xx-ulpi.h b/include/linux/platform_data/usb-pxa3xx-ulpi.h deleted file mode 100644 index 4d31a5cbdeb1..000000000000 From patchwork Thu Jan 5 13:45:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090482 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 11947C3DA7A for ; Thu, 5 Jan 2023 21:07:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QQ56JqKqr5ccd7uN1zbTqb4FWAPAhc21T/p06lDI6Sw=; b=zRBRfX4ADx3N5g 92sbCqSiGt3aqI2rxb98Fgk8Hx1p1wt9Y1SeHBWrqUpxU//2I0BTBcWO6g4Ckes6avoLzI2Fqa77V e+uGcmkTxnDMLZGwklZl9BrT1WEJIBMSQDQaktUa4lldhl3fXrHEWJGBMuPNOyQ8gKdHOQh+l+ABy MbCDxnSkV7DQInwDrGMkQ/XucaXg0qvLB3WDaJoWx6yChugQHljSgR0Q8ZQ1iLslHfajEFmHgf4l3 F6cCanvRpH2Jhhke1nP4j6GFdJbYmV+nAcRcaTP0xWJLFTpMlc3WkDHeEq3FkgbEodVzSEyzzWrqM 4uRFjq07o6rB383LF9pA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDXRB-00EuAQ-Gs; Thu, 05 Jan 2023 21:06:10 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDUmz-00DSRy-IA for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:16:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=mmSAf1hhJokkPgYUWdAzoiw9IO9U6yyY4yIGWiEsLkU=; b=ZF2JlhUubfoD4K4Gvhmrr7dwjI OV5tuysxdpwnimpkx/ENaoWFRKdZuB4AiMIdXwgy1Bf0u+LmKShnrAPz+VMWm2vmvL1P0A7eM9gra h1RMUimT7YJBGg3i1JUwQ7zt2LJEPu0DgUG2aUdj5RvHkSl/PJaOHXkca8NzAwz5+AzphpU0nzQTf RsG5ZvwhSfFAnZGVZs1RoA4ZYKGAtVifB/B/hDIHOGr5froR5V7pPI1Rtt0QkuFbFrWKnWrgeZB6R ZDsfGcoFUzHcxWOj2nbKPmLv6tDRMv+VQ3sn+nB10Obmc293rLrtl+XRjBvn8p+5vpTCFwJct0OHZ PjFxev2Q==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQa3-001M01-0d for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:46:53 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 02B7B61A91; Thu, 5 Jan 2023 13:46:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44E88C433F1; Thu, 5 Jan 2023 13:46:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926414; bh=hDZVtcujKWtYdndI0ba6f6HB7HdfrT4YcZAnQccoayk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WOFoWAlDkvszr2Z9eXXqIFC8gOTs7I37sRn3nu8apjX/TkKYTAPrYcDIzcob28eaS SeyWfKycLybcABQHQPKx5Y6+yKe+rl632JOj6VAeujuekGIM1xfT7Yl37eWUPIDQ3A TXUjc4y42lLafyUY5hB4erUixdsqFoSYLX7OK0623wp096hPzQrHTllwIsSBoPY5ti JrJMtyRiMGR2tLK1U6d/Yu2/NLi7XucsmlqJEZC+I4n/MQ+ABVv1TzyedcJ821uh00 bLond2MHPo/9+POwA4LJa2AGEthZSIU1ZsUw+xsCp95eyUHhIpp34Hrmit5od6w4id 50btfknoOraqw== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Michael Turquette , Stephen Boyd , "Rafael J. Wysocki" , Viresh Kumar , Ulf Hansson , Dominik Brodowski , linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support Date: Thu, 5 Jan 2023 14:45:59 +0100 Message-Id: <20230105134622.254560-5-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134651_650007_0E3CA787 X-CRM114-Status: GOOD ( 26.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann There is currently no devicetree support for any of these three SoCs, and no board files remain. As it seems unlikely that anyone is going to add DT support soon, let's drop the SoC specific code now. Cc: Michael Turquette Cc: Stephen Boyd Cc: "Rafael J. Wysocki" Cc: Viresh Kumar Cc: Ulf Hansson Cc: Dominik Brodowski Cc: linux-clk@vger.kernel.org Cc: linux-pm@vger.kernel.org Cc: linux-mmc@vger.kernel.org Signed-off-by: Arnd Bergmann Acked-by: Ulf Hansson # For MMC Acked-by: Viresh Kumar Acked-by: Robert Jarzmik --- arch/arm/mach-pxa/devices.h | 1 - arch/arm/mach-pxa/mfp-pxa300.h | 52 ---- arch/arm/mach-pxa/mfp-pxa930.h | 495 ------------------------------- arch/arm/mach-pxa/pxa300.c | 17 +- arch/arm/mach-pxa/pxa3xx.c | 4 +- drivers/clk/pxa/clk-pxa3xx.c | 22 +- drivers/cpufreq/pxa3xx-cpufreq.c | 21 +- drivers/mmc/host/pxamci.c | 3 +- drivers/pcmcia/pxa2xx_base.c | 6 - include/linux/soc/pxa/cpu.h | 93 +----- 10 files changed, 9 insertions(+), 705 deletions(-) delete mode 100644 arch/arm/mach-pxa/mfp-pxa930.h diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h index 82c83939017a..1c252eca39c1 100644 --- a/arch/arm/mach-pxa/devices.h +++ b/arch/arm/mach-pxa/devices.h @@ -54,7 +54,6 @@ extern struct platform_device pxa_device_asoc_ssp4; extern struct platform_device pxa25x_device_gpio; extern struct platform_device pxa27x_device_gpio; extern struct platform_device pxa3xx_device_gpio; -extern struct platform_device pxa93x_device_gpio; void __init pxa_register_device(struct platform_device *dev, void *data); void __init pxa2xx_set_dmac_info(struct mmp_dma_platdata *dma_pdata); diff --git a/arch/arm/mach-pxa/mfp-pxa300.h b/arch/arm/mach-pxa/mfp-pxa300.h index 1223e350cea0..058698e7e513 100644 --- a/arch/arm/mach-pxa/mfp-pxa300.h +++ b/arch/arm/mach-pxa/mfp-pxa300.h @@ -27,15 +27,6 @@ #define GPIO61_GPIO MFP_CFG(GPIO61, AF0) #define GPIO62_GPIO MFP_CFG(GPIO62, AF0) -#ifdef CONFIG_CPU_PXA310 -#define GPIO7_2_GPIO MFP_CFG(GPIO7_2, AF0) -#define GPIO8_2_GPIO MFP_CFG(GPIO8_2, AF0) -#define GPIO9_2_GPIO MFP_CFG(GPIO9_2, AF0) -#define GPIO10_2_GPIO MFP_CFG(GPIO10_2, AF0) -#define GPIO11_2_GPIO MFP_CFG(GPIO11_2, AF0) -#define GPIO12_2_GPIO MFP_CFG(GPIO12_2, AF0) -#endif - /* Chip Select */ #define GPIO1_nCS2 MFP_CFG(GPIO1, AF1) #define GPIO2_nCS3 MFP_CFG(GPIO2, AF1) @@ -526,47 +517,4 @@ #define GPIO46_UTM_PHYDATA_7 MFP_CFG(GPIO46, AF3) #endif /* CONFIG_CPU_PXA300 */ -/* - * PXA310 specific MFP configurations - */ -#ifdef CONFIG_CPU_PXA310 -/* USB P2 */ -#define GPIO36_USB_P2_1 MFP_CFG(GPIO36, AF1) -#define GPIO30_USB_P2_2 MFP_CFG(GPIO30, AF1) -#define GPIO35_USB_P2_3 MFP_CFG(GPIO35, AF1) -#define GPIO32_USB_P2_4 MFP_CFG(GPIO32, AF1) -#define GPIO34_USB_P2_5 MFP_CFG(GPIO34, AF1) -#define GPIO31_USB_P2_6 MFP_CFG(GPIO31, AF1) - -/* MMC1 */ -#define GPIO24_MMC1_CMD MFP_CFG(GPIO24, AF3) -#define GPIO29_MMC1_DAT0 MFP_CFG(GPIO29, AF3) - -/* MMC3 */ -#define GPIO103_MMC3_CLK MFP_CFG(GPIO103, AF2) -#define GPIO105_MMC3_CMD MFP_CFG(GPIO105, AF2) -#define GPIO11_2_MMC3_CLK MFP_CFG(GPIO11_2, AF1) -#define GPIO12_2_MMC3_CMD MFP_CFG(GPIO12_2, AF1) -#define GPIO7_2_MMC3_DAT0 MFP_CFG(GPIO7_2, AF1) -#define GPIO8_2_MMC3_DAT1 MFP_CFG(GPIO8_2, AF1) -#define GPIO9_2_MMC3_DAT2 MFP_CFG(GPIO9_2, AF1) -#define GPIO10_2_MMC3_DAT3 MFP_CFG(GPIO10_2, AF1) - -/* ULPI */ -#define GPIO38_ULPI_CLK MFP_CFG(GPIO38, AF1) -#define GPIO30_ULPI_DATA_OUT_0 MFP_CFG(GPIO30, AF3) -#define GPIO31_ULPI_DATA_OUT_1 MFP_CFG(GPIO31, AF3) -#define GPIO32_ULPI_DATA_OUT_2 MFP_CFG(GPIO32, AF3) -#define GPIO33_ULPI_DATA_OUT_3 MFP_CFG(GPIO33, AF3) -#define GPIO34_ULPI_DATA_OUT_4 MFP_CFG(GPIO34, AF3) -#define GPIO35_ULPI_DATA_OUT_5 MFP_CFG(GPIO35, AF3) -#define GPIO36_ULPI_DATA_OUT_6 MFP_CFG(GPIO36, AF3) -#define GPIO37_ULPI_DATA_OUT_7 MFP_CFG(GPIO37, AF3) -#define GPIO33_ULPI_OTG_INTR MFP_CFG(GPIO33, AF1) - -#define ULPI_DIR MFP_CFG_DRV(ULPI_DIR, AF0, DS01X) -#define ULPI_NXT MFP_CFG_DRV(ULPI_NXT, AF0, DS01X) -#define ULPI_STP MFP_CFG_DRV(ULPI_STP, AF0, DS01X) -#endif /* CONFIG_CPU_PXA310 */ - #endif /* __ASM_ARCH_MFP_PXA300_H */ diff --git a/arch/arm/mach-pxa/mfp-pxa930.h b/arch/arm/mach-pxa/mfp-pxa930.h deleted file mode 100644 index 0d195d3a8c61..000000000000 diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index f77ec118d5b9..accd270ff8e2 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c @@ -69,28 +69,13 @@ static struct mfp_addr_map pxa300_mfp_addr_map[] __initdata = { MFP_ADDR_END, }; -/* override pxa300 MFP register addresses */ -static struct mfp_addr_map pxa310_mfp_addr_map[] __initdata = { - MFP_ADDR_X(GPIO30, GPIO98, 0x0418), - MFP_ADDR_X(GPIO7_2, GPIO12_2, 0x052C), - - MFP_ADDR(ULPI_STP, 0x040C), - MFP_ADDR(ULPI_NXT, 0x0410), - MFP_ADDR(ULPI_DIR, 0x0414), - - MFP_ADDR_END, -}; - static int __init pxa300_init(void) { - if (cpu_is_pxa300() || cpu_is_pxa310()) { + if (cpu_is_pxa300()) { mfp_init_base(io_p2v(MFPR_BASE)); mfp_init_addr(pxa300_mfp_addr_map); } - if (cpu_is_pxa310()) - mfp_init_addr(pxa310_mfp_addr_map); - return 0; } diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index b26f00fc75d5..7a02ddb30969 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -496,8 +496,6 @@ static int __init pxa3xx_init(void) pxa3xx_init_pm(); enable_irq_wake(IRQ_WAKEUP0); - if (cpu_is_pxa320()) - enable_irq_wake(IRQ_WAKEUP1); register_syscore_ops(&pxa_irq_syscore_ops); register_syscore_ops(&pxa3xx_mfp_syscore_ops); @@ -509,7 +507,7 @@ static int __init pxa3xx_init(void) ret = platform_add_devices(devices, ARRAY_SIZE(devices)); if (ret) return ret; - if (cpu_is_pxa300() || cpu_is_pxa310() || cpu_is_pxa320()) { + if (cpu_is_pxa300()) { platform_device_add_data(&pxa3xx_device_gpio, &pxa3xx_gpio_pdata, sizeof(pxa3xx_gpio_pdata)); diff --git a/drivers/clk/pxa/clk-pxa3xx.c b/drivers/clk/pxa/clk-pxa3xx.c index 42958a542662..9b45dc297b22 100644 --- a/drivers/clk/pxa/clk-pxa3xx.c +++ b/drivers/clk/pxa/clk-pxa3xx.c @@ -269,19 +269,6 @@ static struct desc_clk_cken pxa300_310_clocks[] __initdata = { PXA3XX_CKEN_1RATE("pxa3xx-gpio", NULL, GPIO, pxa3xx_13MHz_bus_parents), }; -static struct desc_clk_cken pxa320_clocks[] __initdata = { - PXA3XX_PBUS_CKEN("pxa3xx-nand", NULL, NAND, 1, 2, 1, 6, 0), - PXA3XX_PBUS_CKEN("pxa3xx-gcu", NULL, PXA320_GCU, 1, 1, 1, 1, 0), - PXA3XX_CKEN_1RATE("pxa3xx-gpio", NULL, GPIO, pxa3xx_13MHz_bus_parents), -}; - -static struct desc_clk_cken pxa93x_clocks[] __initdata = { - - PXA3XX_PBUS_CKEN("pxa3xx-gcu", NULL, PXA300_GCU, 1, 1, 1, 1, 0), - PXA3XX_PBUS_CKEN("pxa3xx-nand", NULL, NAND, 1, 2, 1, 4, 0), - PXA3XX_CKEN_1RATE("pxa93x-gpio", NULL, GPIO, pxa3xx_13MHz_bus_parents), -}; - static unsigned long clk_pxa3xx_system_bus_get_rate(struct clk_hw *hw, unsigned long parent_rate) { @@ -446,13 +433,8 @@ int __init pxa3xx_clocks_init(void __iomem *regs, void __iomem *oscc_reg) ret = clk_pxa_cken_init(pxa3xx_clocks, ARRAY_SIZE(pxa3xx_clocks), regs); if (ret) return ret; - if (cpu_is_pxa320()) - return clk_pxa_cken_init(pxa320_clocks, - ARRAY_SIZE(pxa320_clocks), regs); - if (cpu_is_pxa300() || cpu_is_pxa310()) - return clk_pxa_cken_init(pxa300_310_clocks, - ARRAY_SIZE(pxa300_310_clocks), regs); - return clk_pxa_cken_init(pxa93x_clocks, ARRAY_SIZE(pxa93x_clocks), regs); + return clk_pxa_cken_init(pxa300_310_clocks, + ARRAY_SIZE(pxa300_310_clocks), regs); } static void __init pxa3xx_dt_clocks_init(struct device_node *np) diff --git a/drivers/cpufreq/pxa3xx-cpufreq.c b/drivers/cpufreq/pxa3xx-cpufreq.c index 4afa48d172db..23bc3c7a6288 100644 --- a/drivers/cpufreq/pxa3xx-cpufreq.c +++ b/drivers/cpufreq/pxa3xx-cpufreq.c @@ -91,15 +91,6 @@ static struct pxa3xx_freq_info pxa300_freqs[] = { OP(624, 24, 2, 208, 260, 208, 312, 3, 1375, 1400), /* 624MHz */ }; -static struct pxa3xx_freq_info pxa320_freqs[] = { - /* CPU XL XN HSS DMEM SMEM SRAM DFI VCC_CORE VCC_SRAM */ - OP(104, 8, 1, 104, 260, 78, 104, 3, 1000, 1100), /* 104MHz */ - OP(208, 16, 1, 104, 260, 104, 156, 2, 1000, 1100), /* 208MHz */ - OP(416, 16, 2, 156, 260, 104, 208, 2, 1100, 1200), /* 416MHz */ - OP(624, 24, 2, 208, 260, 208, 312, 3, 1375, 1400), /* 624MHz */ - OP(806, 31, 2, 208, 260, 208, 312, 3, 1400, 1400), /* 806MHz */ -}; - static unsigned int pxa3xx_freqs_num; static struct pxa3xx_freq_info *pxa3xx_freqs; static struct cpufreq_frequency_table *pxa3xx_freqs_table; @@ -186,17 +177,11 @@ static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy) /* set default policy and cpuinfo */ policy->min = policy->cpuinfo.min_freq = 104000; - policy->max = policy->cpuinfo.max_freq = - (cpu_is_pxa320()) ? 806000 : 624000; + policy->max = policy->cpuinfo.max_freq = 624000; policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ - if (cpu_is_pxa300() || cpu_is_pxa310()) - ret = setup_freqs_table(policy, pxa300_freqs, - ARRAY_SIZE(pxa300_freqs)); - - if (cpu_is_pxa320()) - ret = setup_freqs_table(policy, pxa320_freqs, - ARRAY_SIZE(pxa320_freqs)); + ret = setup_freqs_table(policy, pxa300_freqs, + ARRAY_SIZE(pxa300_freqs)); if (ret) { pr_err("failed to setup frequency table\n"); diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 2a988f942b6c..60bdd691c391 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -44,8 +44,7 @@ #define NR_SG 1 #define CLKRT_OFF (~0) -#define mmc_has_26MHz() (cpu_is_pxa300() || cpu_is_pxa310() \ - || cpu_is_pxa935()) +#define mmc_has_26MHz() (cpu_is_pxa300()) struct pxamci_host { struct mmc_host *mmc; diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 5254028354f4..a6c6ee034582 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -268,12 +268,6 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) goto err0; } - if (cpu_is_pxa320() && ops->nr > 1) { - dev_err(&dev->dev, "pxa320 supports only one pcmcia slot"); - ret = -EINVAL; - goto err0; - } - clk = devm_clk_get(&dev->dev, NULL); if (IS_ERR(clk)) return -ENODEV; diff --git a/include/linux/soc/pxa/cpu.h b/include/linux/soc/pxa/cpu.h index 5782450ee45c..0f894d12fe1d 100644 --- a/include/linux/soc/pxa/cpu.h +++ b/include/linux/soc/pxa/cpu.h @@ -56,12 +56,6 @@ * PXA935 B1 0x56056938 0x8E653013 */ #ifdef CONFIG_PXA25x -#define __cpu_is_pxa210(id) \ - ({ \ - unsigned int _id = (id) & 0xf3f0; \ - _id == 0x2120; \ - }) - #define __cpu_is_pxa250(id) \ ({ \ unsigned int _id = (id) & 0xf3ff; \ @@ -80,7 +74,6 @@ _id == 0x2100; \ }) #else -#define __cpu_is_pxa210(id) (0) #define __cpu_is_pxa250(id) (0) #define __cpu_is_pxa255(id) (0) #define __cpu_is_pxa25x(id) (0) @@ -106,51 +99,6 @@ #define __cpu_is_pxa300(id) (0) #endif -#ifdef CONFIG_CPU_PXA310 -#define __cpu_is_pxa310(id) \ - ({ \ - unsigned int _id = (id) >> 4 & 0xfff; \ - _id == 0x689; \ - }) -#else -#define __cpu_is_pxa310(id) (0) -#endif - -#ifdef CONFIG_CPU_PXA320 -#define __cpu_is_pxa320(id) \ - ({ \ - unsigned int _id = (id) >> 4 & 0xfff; \ - _id == 0x603 || _id == 0x682; \ - }) -#else -#define __cpu_is_pxa320(id) (0) -#endif - -#ifdef CONFIG_CPU_PXA930 -#define __cpu_is_pxa930(id) \ - ({ \ - unsigned int _id = (id) >> 4 & 0xfff; \ - _id == 0x683; \ - }) -#else -#define __cpu_is_pxa930(id) (0) -#endif - -#ifdef CONFIG_CPU_PXA935 -#define __cpu_is_pxa935(id) \ - ({ \ - unsigned int _id = (id) >> 4 & 0xfff; \ - _id == 0x693; \ - }) -#else -#define __cpu_is_pxa935(id) (0) -#endif - -#define cpu_is_pxa210() \ - ({ \ - __cpu_is_pxa210(read_cpuid_id()); \ - }) - #define cpu_is_pxa250() \ ({ \ __cpu_is_pxa250(read_cpuid_id()); \ @@ -176,27 +124,6 @@ __cpu_is_pxa300(read_cpuid_id()); \ }) -#define cpu_is_pxa310() \ - ({ \ - __cpu_is_pxa310(read_cpuid_id()); \ - }) - -#define cpu_is_pxa320() \ - ({ \ - __cpu_is_pxa320(read_cpuid_id()); \ - }) - -#define cpu_is_pxa930() \ - ({ \ - __cpu_is_pxa930(read_cpuid_id()); \ - }) - -#define cpu_is_pxa935() \ - ({ \ - __cpu_is_pxa935(read_cpuid_id()); \ - }) - - /* * CPUID Core Generation Bit @@ -215,25 +142,12 @@ #ifdef CONFIG_PXA3xx #define __cpu_is_pxa3xx(id) \ ({ \ - __cpu_is_pxa300(id) \ - || __cpu_is_pxa310(id) \ - || __cpu_is_pxa320(id) \ - || __cpu_is_pxa93x(id); \ + __cpu_is_pxa300(id); \ }) #else #define __cpu_is_pxa3xx(id) (0) #endif -#if defined(CONFIG_CPU_PXA930) || defined(CONFIG_CPU_PXA935) -#define __cpu_is_pxa93x(id) \ - ({ \ - __cpu_is_pxa930(id) \ - || __cpu_is_pxa935(id); \ - }) -#else -#define __cpu_is_pxa93x(id) (0) -#endif - #define cpu_is_pxa2xx() \ ({ \ __cpu_is_pxa2xx(read_cpuid_id()); \ @@ -244,9 +158,4 @@ __cpu_is_pxa3xx(read_cpuid_id()); \ }) -#define cpu_is_pxa93x() \ - ({ \ - __cpu_is_pxa93x(read_cpuid_id()); \ - }) - #endif From patchwork Thu Jan 5 13:46:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090649 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C684CC3DA7A for ; Thu, 5 Jan 2023 22:50:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uclUfPOKLjT39bUVVMocNC2BX1hh1nkxb658aXg7+jI=; b=oL4Gs6fMpWK6t3 3GDwijXjHUmBkXo/fTCkvZcBaLVa9vBjGS3xWP5bbkv3mBekf4C+mMIFvbODvOfCnu7jSa/qihsdU +DL9Hz0VGtlkw45uMfclExfs64WWD0CKcO2GLFRc2GP7y/DF2zLNtX2oZ89tfDtCgrUOSNOkPEM0F /ImPpQDmyxBXMk/4GREPX2gyp4pkgQGbLFFM6VV6wvZfMQDtkB2srW6SOU+gz0+rWYBKcbUzADy8q zE4FMYsLtd6FTPPpSI0i7K9FpIytsJTEuhetH/HmsbWlyAcCN5iT5no2FOgu3cr7yLj9tIfxLqhwa MsB17tLbB8rbAzmvLgPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZ2j-00FmL0-LS; Thu, 05 Jan 2023 22:49:02 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVNw-00Ds5B-86 for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:54:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=FxbybGTqGtLi5vcMAQNjCCf0cncesybKehCMgMLRG/k=; b=DjMNsPnSZkasRJw4E0OEiPMpqf mV+DVqvY84iwFo6r1sGS1s0KZNOpBPs1KE7fSfUY9KCVaRGRgN932HwhExjcViY9CFrAuLilADS0U AUb3vLNQMs+AvUVacfkbbTUMQ0PI1VOhzrEkYNlvHE30x/ogImlHyA0k4w1LeU7t9DEMGPOrT3/4N UmCiuoZ7gBPR+wIh+DC3+3+HIbz/ZDcKWQo8XUgdZClve1vXUbSsxDwbFb9vUY5UlbIXHm5ul36Dl joYaVL6J+HIcLUcBG1MhPNd6c2RPbhct7pCgogTeGuDn/kBSweHaQ0eqWGt1NimexAL+oqU25248k psDnjVIg==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQa4-001M0L-0p for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:46:55 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id DE2FF61A81; Thu, 5 Jan 2023 13:46:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D867FC43392; Thu, 5 Jan 2023 13:46:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926416; bh=/YTFxMpRgty9v/I0GLC8pgjg57PL6GmuZISrLWV/U8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FTrAw01gPlVtEIq/fuN0vW9LwVxjqjgQKoItBFhaR93V6EvYMsTYUBnlRecNp0aee 4arwb4iNCtOGM1ZKJrg/Tf+V83Em+Xt7XgP0GE63qoTr81me/cepRQp/eRcx7Ho4uw rMhqsziF9t+ub+MeX/J9enVq8xNr6LBSUWpn2oMMPTRCcK6JCARVC8FkbIN6cZzmdw KuzCdhlluOLAT06bOBrYyxsAN+qIP+yhxtRIqFBjz9fEwWHpyTyW5HleMdd+KH2h1T gGVePhCAg88Y4rNy3tVQEQzpOeYtQCK2KV+OR74ezi520NV9zoIvXnNqIPyW3sd5OQ mYf9mCJg+dEmA== 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 05/27] ARM: pxa: prune unused device support Date: Thu, 5 Jan 2023 14:46:00 +0100 Message-Id: <20230105134622.254560-6-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134652_862890_985DE9B5 X-CRM114-Status: GOOD ( 27.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann pxa3xx is now DT-only, and the remaining pxa2xx board files only use a subset of the possible devices, so remove all definitions that are not referenced any more. Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/devices.c | 338 --------------------------------- arch/arm/mach-pxa/mfp-pxa25x.h | 33 ---- arch/arm/mach-pxa/mfp-pxa2xx.c | 4 - arch/arm/mach-pxa/pm.c | 2 - arch/arm/mach-pxa/pm.h | 10 - arch/arm/mach-pxa/pxa25x.c | 7 - arch/arm/mach-pxa/pxa27x.c | 18 +- arch/arm/mach-pxa/pxa27x.h | 3 - arch/arm/mach-pxa/pxa3xx.c | 89 --------- 9 files changed, 3 insertions(+), 501 deletions(-) diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 8e3bc56d2044..661b3fc43275 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -16,11 +16,7 @@ #include #include "irqs.h" #include -#include -#include -#include #include -#include #include "regs-ost.h" #include "reset.h" @@ -82,16 +78,10 @@ void __init pxa_set_mci_info(struct pxamci_platform_data *info) pxa_register_device(&pxa_device_mci, info); } - static struct pxa2xx_udc_mach_info pxa_udc_info = { .gpio_pullup = -1, }; -void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info) -{ - memcpy(&pxa_udc_info, info, sizeof *info); -} - static struct resource pxa2xx_udc_resources[] = { [0] = { .start = 0x40600000, @@ -383,49 +373,6 @@ struct platform_device sa1100_device_rtc = { .resource = pxa_rtc_resources, }; -static struct resource pxa_ac97_resources[] = { - [0] = { - .start = 0x40500000, - .end = 0x40500000 + 0xfff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_AC97, - .end = IRQ_AC97, - .flags = IORESOURCE_IRQ, - }, -}; - -static u64 pxa_ac97_dmamask = 0xffffffffUL; - -struct platform_device pxa_device_ac97 = { - .name = "pxa2xx-ac97", - .id = -1, - .dev = { - .dma_mask = &pxa_ac97_dmamask, - .coherent_dma_mask = 0xffffffff, - }, - .num_resources = ARRAY_SIZE(pxa_ac97_resources), - .resource = pxa_ac97_resources, -}; - -void __init pxa_set_ac97_info(pxa2xx_audio_ops_t *ops) -{ - int ret; - - ret = clk_add_alias("ac97_clk", "pxa2xx-ac97:0", "AC97CLK", - &pxa_device_ac97.dev); - if (ret) - pr_err("PXA AC97 clock1 alias error: %d\n", ret); - - ret = clk_add_alias("ac97_clk", "pxa2xx-ac97:1", "AC97CLK", - &pxa_device_ac97.dev); - if (ret) - pr_err("PXA AC97 clock2 alias error: %d\n", ret); - - pxa_register_device(&pxa_device_ac97, ops); -} - #ifdef CONFIG_PXA25x static struct resource pxa25x_resource_pwm0[] = { @@ -539,44 +486,6 @@ struct platform_device pxa25x_device_assp = { #endif /* CONFIG_PXA25x */ #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) -static struct resource pxa27x_resource_camera[] = { - [0] = { - .start = 0x50000000, - .end = 0x50000fff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_CAMERA, - .end = IRQ_CAMERA, - .flags = IORESOURCE_IRQ, - }, -}; - -static u64 pxa27x_dma_mask_camera = DMA_BIT_MASK(32); - -static struct platform_device pxa27x_device_camera = { - .name = "pxa27x-camera", - .id = 0, /* This is used to put cameras on this interface */ - .dev = { - .dma_mask = &pxa27x_dma_mask_camera, - .coherent_dma_mask = 0xffffffff, - }, - .num_resources = ARRAY_SIZE(pxa27x_resource_camera), - .resource = pxa27x_resource_camera, -}; - -void __init pxa_set_camera_info(struct pxacamera_platform_data *info) -{ - struct clk *mclk; - - /* Register a fixed-rate clock for camera sensors. */ - mclk = clk_register_fixed_rate(NULL, "pxa_camera_clk", NULL, 0, - info->mclk_10khz * 10000); - if (!IS_ERR(mclk)) - clkdev_create(mclk, "mclk", NULL); - pxa_register_device(&pxa27x_device_camera, info); -} - static u64 pxa27x_ohci_dma_mask = DMA_BIT_MASK(32); static struct resource pxa27x_resource_ohci[] = { @@ -610,31 +519,6 @@ void __init pxa_set_ohci_info(struct pxaohci_platform_data *info) #endif /* CONFIG_PXA27x || CONFIG_PXA3xx */ #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) -static struct resource pxa27x_resource_keypad[] = { - [0] = { - .start = 0x41500000, - .end = 0x4150004c, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_KEYPAD, - .end = IRQ_KEYPAD, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device pxa27x_device_keypad = { - .name = "pxa27x-keypad", - .id = -1, - .resource = pxa27x_resource_keypad, - .num_resources = ARRAY_SIZE(pxa27x_resource_keypad), -}; - -void __init pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info) -{ - pxa_register_device(&pxa27x_device_keypad, info); -} - static u64 pxa27x_ssp1_dma_mask = DMA_BIT_MASK(32); static struct resource pxa27x_resource_ssp1[] = { @@ -744,210 +628,6 @@ struct platform_device pxa27x_device_pwm1 = { }; #endif /* CONFIG_PXA27x || CONFIG_PXA3xx */ -#ifdef CONFIG_PXA3xx -static struct resource pxa3xx_resources_mci2[] = { - [0] = { - .start = 0x42000000, - .end = 0x42000fff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_MMC2, - .end = IRQ_MMC2, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device pxa3xx_device_mci2 = { - .name = "pxa2xx-mci", - .id = 1, - .dev = { - .dma_mask = &pxamci_dmamask, - .coherent_dma_mask = 0xffffffff, - }, - .num_resources = ARRAY_SIZE(pxa3xx_resources_mci2), - .resource = pxa3xx_resources_mci2, -}; - -void __init pxa3xx_set_mci2_info(struct pxamci_platform_data *info) -{ - pxa_register_device(&pxa3xx_device_mci2, info); -} - -static struct resource pxa3xx_resources_mci3[] = { - [0] = { - .start = 0x42500000, - .end = 0x42500fff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_MMC3, - .end = IRQ_MMC3, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device pxa3xx_device_mci3 = { - .name = "pxa2xx-mci", - .id = 2, - .dev = { - .dma_mask = &pxamci_dmamask, - .coherent_dma_mask = 0xffffffff, - }, - .num_resources = ARRAY_SIZE(pxa3xx_resources_mci3), - .resource = pxa3xx_resources_mci3, -}; - -void __init pxa3xx_set_mci3_info(struct pxamci_platform_data *info) -{ - pxa_register_device(&pxa3xx_device_mci3, info); -} - -static struct resource pxa3xx_resources_gcu[] = { - { - .start = 0x54000000, - .end = 0x54000fff, - .flags = IORESOURCE_MEM, - }, - { - .start = IRQ_GCU, - .end = IRQ_GCU, - .flags = IORESOURCE_IRQ, - }, -}; - -static u64 pxa3xx_gcu_dmamask = DMA_BIT_MASK(32); - -struct platform_device pxa3xx_device_gcu = { - .name = "pxa3xx-gcu", - .id = -1, - .num_resources = ARRAY_SIZE(pxa3xx_resources_gcu), - .resource = pxa3xx_resources_gcu, - .dev = { - .dma_mask = &pxa3xx_gcu_dmamask, - .coherent_dma_mask = 0xffffffff, - }, -}; - -#endif /* CONFIG_PXA3xx */ - -#if defined(CONFIG_PXA3xx) -static struct resource pxa3xx_resources_i2c_power[] = { - { - .start = 0x40f500c0, - .end = 0x40f500d3, - .flags = IORESOURCE_MEM, - }, { - .start = IRQ_PWRI2C, - .end = IRQ_PWRI2C, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device pxa3xx_device_i2c_power = { - .name = "pxa3xx-pwri2c", - .id = 1, - .resource = pxa3xx_resources_i2c_power, - .num_resources = ARRAY_SIZE(pxa3xx_resources_i2c_power), -}; - -static struct resource pxa3xx_resources_nand[] = { - [0] = { - .start = 0x43100000, - .end = 0x43100053, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_NAND, - .end = IRQ_NAND, - .flags = IORESOURCE_IRQ, - }, -}; - -static u64 pxa3xx_nand_dma_mask = DMA_BIT_MASK(32); - -struct platform_device pxa3xx_device_nand = { - .name = "pxa3xx-nand", - .id = -1, - .dev = { - .dma_mask = &pxa3xx_nand_dma_mask, - .coherent_dma_mask = DMA_BIT_MASK(32), - }, - .num_resources = ARRAY_SIZE(pxa3xx_resources_nand), - .resource = pxa3xx_resources_nand, -}; - -void __init pxa3xx_set_nand_info(struct pxa3xx_nand_platform_data *info) -{ - pxa_register_device(&pxa3xx_device_nand, info); -} - -static u64 pxa3xx_ssp4_dma_mask = DMA_BIT_MASK(32); - -static struct resource pxa3xx_resource_ssp4[] = { - [0] = { - .start = 0x41a00000, - .end = 0x41a0003f, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_SSP4, - .end = IRQ_SSP4, - .flags = IORESOURCE_IRQ, - }, -}; - -/* - * PXA3xx SSP is basically equivalent to PXA27x. - * However, we need to register the device by the correct name in order to - * make the driver set the correct internal type, hence we provide specific - * platform_devices for each of them. - */ -struct platform_device pxa3xx_device_ssp1 = { - .name = "pxa3xx-ssp", - .id = 0, - .dev = { - .dma_mask = &pxa27x_ssp1_dma_mask, - .coherent_dma_mask = DMA_BIT_MASK(32), - }, - .resource = pxa27x_resource_ssp1, - .num_resources = ARRAY_SIZE(pxa27x_resource_ssp1), -}; - -struct platform_device pxa3xx_device_ssp2 = { - .name = "pxa3xx-ssp", - .id = 1, - .dev = { - .dma_mask = &pxa27x_ssp2_dma_mask, - .coherent_dma_mask = DMA_BIT_MASK(32), - }, - .resource = pxa27x_resource_ssp2, - .num_resources = ARRAY_SIZE(pxa27x_resource_ssp2), -}; - -struct platform_device pxa3xx_device_ssp3 = { - .name = "pxa3xx-ssp", - .id = 2, - .dev = { - .dma_mask = &pxa27x_ssp3_dma_mask, - .coherent_dma_mask = DMA_BIT_MASK(32), - }, - .resource = pxa27x_resource_ssp3, - .num_resources = ARRAY_SIZE(pxa27x_resource_ssp3), -}; - -struct platform_device pxa3xx_device_ssp4 = { - .name = "pxa3xx-ssp", - .id = 3, - .dev = { - .dma_mask = &pxa3xx_ssp4_dma_mask, - .coherent_dma_mask = DMA_BIT_MASK(32), - }, - .resource = pxa3xx_resource_ssp4, - .num_resources = ARRAY_SIZE(pxa3xx_resource_ssp4), -}; -#endif /* CONFIG_PXA3xx */ - struct resource pxa_resource_gpio[] = { { .start = 0x40e00000, @@ -972,11 +652,7 @@ struct resource pxa_resource_gpio[] = { }; struct platform_device pxa25x_device_gpio = { -#ifdef CONFIG_CPU_PXA26x - .name = "pxa26x-gpio", -#else .name = "pxa25x-gpio", -#endif .id = -1, .num_resources = ARRAY_SIZE(pxa_resource_gpio), .resource = pxa_resource_gpio, @@ -989,20 +665,6 @@ struct platform_device pxa27x_device_gpio = { .resource = pxa_resource_gpio, }; -struct platform_device pxa3xx_device_gpio = { - .name = "pxa3xx-gpio", - .id = -1, - .num_resources = ARRAY_SIZE(pxa_resource_gpio), - .resource = pxa_resource_gpio, -}; - -struct platform_device pxa93x_device_gpio = { - .name = "pxa93x-gpio", - .id = -1, - .num_resources = ARRAY_SIZE(pxa_resource_gpio), - .resource = pxa_resource_gpio, -}; - /* pxa2xx-spi platform-device ID equals respective SSP platform-device ID + 1. * See comment in arch/arm/mach-pxa/ssp.c::ssp_probe() */ void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_controller *info) diff --git a/arch/arm/mach-pxa/mfp-pxa25x.h b/arch/arm/mach-pxa/mfp-pxa25x.h index d0ebb2154503..3dc5c833e28f 100644 --- a/arch/arm/mach-pxa/mfp-pxa25x.h +++ b/arch/arm/mach-pxa/mfp-pxa25x.h @@ -158,39 +158,6 @@ #define GPIO76_LCD_PCLK MFP_CFG_OUT(GPIO76, AF2, DRIVE_LOW) #define GPIO77_LCD_BIAS MFP_CFG_OUT(GPIO77, AF2, DRIVE_LOW) -#ifdef CONFIG_CPU_PXA26x -/* GPIO */ -#define GPIO85_GPIO MFP_CFG_IN(GPIO85, AF0) -#define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF1) -#define GPIO87_GPIO MFP_CFG_IN(GPIO87, AF1) -#define GPIO88_GPIO MFP_CFG_IN(GPIO88, AF1) -#define GPIO89_GPIO MFP_CFG_IN(GPIO89, AF1) - -/* SDRAM */ -#define GPIO86_nSDCS2 MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH) -#define GPIO87_nSDCS3 MFP_CFG_OUT(GPIO87, AF0, DRIVE_HIGH) -#define GPIO88_RDnWR MFP_CFG_OUT(GPIO88, AF0, DRIVE_HIGH) - -/* USB */ -#define GPIO9_USB_RCV MFP_CFG_IN(GPIO9, AF1) -#define GPIO32_USB_VP MFP_CFG_IN(GPIO32, AF2) -#define GPIO34_USB_VM MFP_CFG_IN(GPIO34, AF2) -#define GPIO39_USB_VPO MFP_CFG_OUT(GPIO39, AF3, DRIVE_LOW) -#define GPIO56_USB_VMO MFP_CFG_OUT(GPIO56, AF1, DRIVE_LOW) -#define GPIO57_USB_nOE MFP_CFG_OUT(GPIO57, AF1, DRIVE_HIGH) - -/* ASSP */ -#define GPIO28_ASSP_BITCLK_IN MFP_CFG_IN(GPIO28, AF3) -#define GPIO28_ASSP_BITCLK_OUT MFP_CFG_OUT(GPIO28, AF3, DRIVE_LOW) -#define GPIO29_ASSP_RXD MFP_CFG_IN(GPIO29, AF3) -#define GPIO30_ASSP_TXD MFP_CFG_OUT(GPIO30, AF3, DRIVE_LOW) -#define GPIO31_ASSP_SFRM_IN MFP_CFG_IN(GPIO31, AF1) -#define GPIO31_ASSP_SFRM_OUT MFP_CFG_OUT(GPIO31, AF3, DRIVE_LOW) - -/* AC97 */ -#define GPIO89_AC97_nRESET MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH) -#endif /* CONFIG_CPU_PXA26x */ - /* commonly used pin configurations */ #define GPIOxx_LCD_16BPP \ GPIO58_LCD_LDD_0, \ diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c index 57b0782880de..b556452dfcf9 100644 --- a/arch/arm/mach-pxa/mfp-pxa2xx.c +++ b/arch/arm/mach-pxa/mfp-pxa2xx.c @@ -226,11 +226,7 @@ static void __init pxa25x_mfp_init(void) int i; /* running before pxa_gpio_probe() */ -#ifdef CONFIG_CPU_PXA26x - pxa_last_gpio = 89; -#else pxa_last_gpio = 84; -#endif for (i = 0; i <= pxa_last_gpio; i++) gpio_desc[i].valid = 1; diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index f2237f471750..c63e854921ea 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c @@ -51,8 +51,6 @@ int pxa_pm_enter(suspend_state_t state) /* if invalid, display message and wait for a hardware reset */ if (checksum != sleep_save_checksum) { - lubbock_set_hexled(0xbadbadc5); - while (1) pxa_cpu_pm_fns->enter(state); } diff --git a/arch/arm/mach-pxa/pm.h b/arch/arm/mach-pxa/pm.h index 00ea3529e30e..a16fa140883c 100644 --- a/arch/arm/mach-pxa/pm.h +++ b/arch/arm/mach-pxa/pm.h @@ -27,13 +27,3 @@ extern void pxa_pm_finish(void); extern const char pm_enter_standby_start[], pm_enter_standby_end[]; extern int pxa3xx_finish_suspend(unsigned long); - -/* NOTE: this is for PM debugging on Lubbock, it's really a big - * ugly, but let's keep the crap minimum here, instead of direct - * accessing the LUBBOCK CPLD registers in arch/arm/mach-pxa/pm.c - */ -#ifdef CONFIG_ARCH_LUBBOCK -extern void lubbock_set_hexled(uint32_t value); -#else -#define lubbock_set_hexled(x) -#endif diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 6b34d7c169ea..1b83be181bab 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -145,13 +145,6 @@ void __init pxa25x_init_irq(void) pxa_init_irq(32, pxa25x_set_wake); } -#ifdef CONFIG_CPU_PXA26x -void __init pxa26x_init_irq(void) -{ - pxa_init_irq(32, pxa25x_set_wake); -} -#endif - static int __init __init pxa25x_dt_init_irq(struct device_node *node, struct device_node *parent) { diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index eea507fd5095..4135ba2877c4 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -85,18 +85,6 @@ EXPORT_SYMBOL_GPL(pxa27x_configure_ac97reset); */ static unsigned int pwrmode = PWRMODE_SLEEP; -int pxa27x_set_pwrmode(unsigned int mode) -{ - switch (mode) { - case PWRMODE_SLEEP: - case PWRMODE_DEEPSLEEP: - pwrmode = mode; - return 0; - } - - return -EINVAL; -} - /* * List of global PXA peripheral registers to preserve. * More ones like CP and general purpose register values are preserved @@ -109,7 +97,7 @@ enum { SLEEP_SAVE_COUNT }; -void pxa27x_cpu_pm_save(unsigned long *sleep_save) +static void pxa27x_cpu_pm_save(unsigned long *sleep_save) { sleep_save[SLEEP_SAVE_MDREFR] = __raw_readl(MDREFR); SAVE(PCFR); @@ -117,7 +105,7 @@ void pxa27x_cpu_pm_save(unsigned long *sleep_save) SAVE(PSTR); } -void pxa27x_cpu_pm_restore(unsigned long *sleep_save) +static void pxa27x_cpu_pm_restore(unsigned long *sleep_save) { __raw_writel(sleep_save[SLEEP_SAVE_MDREFR], MDREFR); RESTORE(PCFR); @@ -127,7 +115,7 @@ void pxa27x_cpu_pm_restore(unsigned long *sleep_save) RESTORE(PSTR); } -void pxa27x_cpu_pm_enter(suspend_state_t state) +static void pxa27x_cpu_pm_enter(suspend_state_t state) { extern void pxa_cpu_standby(void); #ifndef CONFIG_IWMMXT diff --git a/arch/arm/mach-pxa/pxa27x.h b/arch/arm/mach-pxa/pxa27x.h index ede96f3f7214..c9d9948ae7d1 100644 --- a/arch/arm/mach-pxa/pxa27x.h +++ b/arch/arm/mach-pxa/pxa27x.h @@ -20,7 +20,4 @@ #define ARB_CORE_PARK (1<<24) /* Be parked with core when idle */ #define ARB_LOCK_FLAG (1<<23) /* Only Locking masters gain access to the bus */ -extern int pxa27x_set_pwrmode(unsigned int mode); -extern void pxa27x_cpu_pm_enter(suspend_state_t state); - #endif /* __MACH_PXA27x_H */ diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 7a02ddb30969..5441b778a081 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -363,13 +363,6 @@ static void __init __pxa3xx_init_irq(void) pxa_init_ext_wakeup_irq(pxa3xx_set_wake); } -void __init pxa3xx_init_irq(void) -{ - __pxa3xx_init_irq(); - pxa_init_irq(56, pxa3xx_set_wake); -} - -#ifdef CONFIG_OF static int __init __init pxa3xx_dt_init_irq(struct device_node *node, struct device_node *parent) { @@ -380,7 +373,6 @@ pxa3xx_dt_init_irq(struct device_node *node, struct device_node *parent) return 0; } IRQCHIP_DECLARE(pxa3xx_intc, "marvell,pxa-intc", pxa3xx_dt_init_irq); -#endif /* CONFIG_OF */ static struct map_desc pxa3xx_io_desc[] __initdata = { { /* Mem Ctl */ @@ -403,73 +395,6 @@ void __init pxa3xx_map_io(void) pxa3xx_get_clk_frequency_khz(1); } -/* - * device registration specific to PXA3xx. - */ - -void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info) -{ - pxa_register_device(&pxa3xx_device_i2c_power, info); -} - -static struct pxa_gpio_platform_data pxa3xx_gpio_pdata = { - .irq_base = PXA_GPIO_TO_IRQ(0), -}; - -static struct platform_device *devices[] __initdata = { - &pxa27x_device_udc, - &pxa_device_pmu, - &pxa_device_i2s, - &pxa_device_asoc_ssp1, - &pxa_device_asoc_ssp2, - &pxa_device_asoc_ssp3, - &pxa_device_asoc_ssp4, - &pxa_device_asoc_platform, - &pxa_device_rtc, - &pxa3xx_device_ssp1, - &pxa3xx_device_ssp2, - &pxa3xx_device_ssp3, - &pxa3xx_device_ssp4, - &pxa27x_device_pwm0, - &pxa27x_device_pwm1, -}; - -static const struct dma_slave_map pxa3xx_slave_map[] = { - /* PXA25x, PXA27x and PXA3xx common entries */ - { "pxa2xx-ac97", "pcm_pcm_mic_mono", PDMA_FILTER_PARAM(LOWEST, 8) }, - { "pxa2xx-ac97", "pcm_pcm_aux_mono_in", PDMA_FILTER_PARAM(LOWEST, 9) }, - { "pxa2xx-ac97", "pcm_pcm_aux_mono_out", - PDMA_FILTER_PARAM(LOWEST, 10) }, - { "pxa2xx-ac97", "pcm_pcm_stereo_in", PDMA_FILTER_PARAM(LOWEST, 11) }, - { "pxa2xx-ac97", "pcm_pcm_stereo_out", PDMA_FILTER_PARAM(LOWEST, 12) }, - { "pxa-ssp-dai.0", "rx", PDMA_FILTER_PARAM(LOWEST, 13) }, - { "pxa-ssp-dai.0", "tx", PDMA_FILTER_PARAM(LOWEST, 14) }, - { "pxa-ssp-dai.1", "rx", PDMA_FILTER_PARAM(LOWEST, 15) }, - { "pxa-ssp-dai.1", "tx", PDMA_FILTER_PARAM(LOWEST, 16) }, - { "pxa2xx-ir", "rx", PDMA_FILTER_PARAM(LOWEST, 17) }, - { "pxa2xx-ir", "tx", PDMA_FILTER_PARAM(LOWEST, 18) }, - { "pxa2xx-mci.0", "rx", PDMA_FILTER_PARAM(LOWEST, 21) }, - { "pxa2xx-mci.0", "tx", PDMA_FILTER_PARAM(LOWEST, 22) }, - { "pxa-ssp-dai.2", "rx", PDMA_FILTER_PARAM(LOWEST, 66) }, - { "pxa-ssp-dai.2", "tx", PDMA_FILTER_PARAM(LOWEST, 67) }, - - /* PXA3xx specific map */ - { "pxa-ssp-dai.3", "rx", PDMA_FILTER_PARAM(LOWEST, 2) }, - { "pxa-ssp-dai.3", "tx", PDMA_FILTER_PARAM(LOWEST, 3) }, - { "pxa2xx-mci.1", "rx", PDMA_FILTER_PARAM(LOWEST, 93) }, - { "pxa2xx-mci.1", "tx", PDMA_FILTER_PARAM(LOWEST, 94) }, - { "pxa3xx-nand", "data", PDMA_FILTER_PARAM(LOWEST, 97) }, - { "pxa2xx-mci.2", "rx", PDMA_FILTER_PARAM(LOWEST, 100) }, - { "pxa2xx-mci.2", "tx", PDMA_FILTER_PARAM(LOWEST, 101) }, -}; - -static struct mmp_dma_platdata pxa3xx_dma_pdata = { - .dma_channels = 32, - .nb_requestors = 100, - .slave_map = pxa3xx_slave_map, - .slave_map_cnt = ARRAY_SIZE(pxa3xx_slave_map), -}; - static int __init pxa3xx_init(void) { int ret = 0; @@ -499,20 +424,6 @@ static int __init pxa3xx_init(void) register_syscore_ops(&pxa_irq_syscore_ops); register_syscore_ops(&pxa3xx_mfp_syscore_ops); - - if (of_have_populated_dt()) - return 0; - - pxa2xx_set_dmac_info(&pxa3xx_dma_pdata); - ret = platform_add_devices(devices, ARRAY_SIZE(devices)); - if (ret) - return ret; - if (cpu_is_pxa300()) { - platform_device_add_data(&pxa3xx_device_gpio, - &pxa3xx_gpio_pdata, - sizeof(pxa3xx_gpio_pdata)); - ret = platform_device_register(&pxa3xx_device_gpio); - } } return ret; From patchwork Thu Jan 5 13:46:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090648 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B80B8C4708E for ; Thu, 5 Jan 2023 22:46:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/GVccMk5TGFAAIcnpkxS96LEPglJT3Mn9U0S4/hs7zo=; b=Sg1v3a4ygiLrJT tkQjSfqAtbvxzhKd1/wVb0VLwDJATAqWpYKVNOXWMu0JX5Gj9lTicVD4q9At/2H36HSnZNRdH+JwO Inp8ZvJvKQRtf9ReTxHU1TuKmHk4QaCkBrt8ey493Dc9UBYPlwhYSh1CQ1ci8kk0svS//GJA0OCo+ 29URT7cCOg6ErHjoD/eKV5RzcJo+USoHOxpffLaebcTvV2RjUnkAFc6sIER6EHQztx3Fxi8QziuMW 4FeE1OS4ppf3gFlL6m/FeCjXqBzgAMg8vO8SH/iDHV61n/YaEHsZVt0wR07eJi84j2ZAd+jmVScku R2xxi5BFyxlw1Ig/HiXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYzX-00FkXw-2u; Thu, 05 Jan 2023 22:45:44 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVMc-00DrLx-Ku for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:53:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=oLKvlaGJe0knamNYXkjnuJm+VFPVLryg8kj2XtubSx4=; b=NeYRd5SvNenDFWxPJ8a0vTIZVR Nui+Momkmxg2KSg320Bl+g5EL/9GMcOXF0rDr+SBVs1lEVaD62j0kLJU3o8wbbXAoYVdhQa2GHpdg gCeiREv6YVQatSESUy6EKD0eMhI6zmeiJMYDRZNzh645q1HzW28jJouK1wCRp9W0wAbxOyC+bJu7J 47FIO7EUfZuTyOcci8X56ZD9XEgY23fBK3YkQ+SRh1bXma6/UG1mDt04GMHUnhDPPmK7DEyYWVccO CpAgoh5lohfEy72OoH5XChpT5lF8wrYqMQIrc06/sbpXsJT7xFS2bm3+ZFdjAyCJFshMdEUB8ynKT gJyDLYLQ==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQa6-001M0q-1l for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:46:56 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 714B661A94; Thu, 5 Jan 2023 13:46:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5215C433F0; Thu, 5 Jan 2023 13:46:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926418; bh=e0rh5Q1bzQ8kguah32CkujzsiMLyOjXpRZxvgw1rRWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J0tYaLv60QsWy4N9wnWs0/+eaczcOajHC71ZYibLcn7TND7gAHGOU5jtuozHMp0DQ 3XJaPZVrv+BtsooQmaasqyyqZ4s2OO3ckd7LvzQlVmZYeHalgJtxgMrP7TXJgYhPqI EcZrAYQyZGnLN2T3oPsD3MUrlidyqkmck6KgeMsXuNZhFrD1rEi1io9yqC6AccrEaQ udyiBnuK1oFmgEQxzYl7zeHNZ0Jel54gC1eJxB6ACi9Dyd8tsm3euZUzRtnYAE7Pgz iBg3sJfeKAN97o5LCWc0jQEvIbPvPz6ghf9PEoDRAHAAlyhvWU6nUXuOnhkg0uPNjm wft5EvutZxUfQ== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , linux-pm@vger.kernel.org, Peter Edwards , Sebastian Reichel Subject: [PATCH 06/27] power: remove z2_battery driver Date: Thu, 5 Jan 2023 14:46:01 +0100 Message-Id: <20230105134622.254560-7-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134655_245580_ADA0ED9A X-CRM114-Status: GOOD ( 14.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The PXA z2 platform is gone, and this driver is now orphaned. Cc: linux-pm@vger.kernel.org Cc: Peter Edwards Cc: Sebastian Reichel Signed-off-by: Arnd Bergmann --- drivers/power/supply/Kconfig | 6 - drivers/power/supply/Makefile | 1 - drivers/power/supply/z2_battery.c | 318 ------------------------------ include/linux/z2_battery.h | 17 -- 4 files changed, 342 deletions(-) delete mode 100644 drivers/power/supply/z2_battery.c delete mode 100644 include/linux/z2_battery.h diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 98d4e9364606..b7fdcfd5d4e7 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -422,12 +422,6 @@ config BATTERY_MAX1721X Say Y here to enable support for the MAX17211/MAX17215 standalone battery gas-gauge. -config BATTERY_Z2 - tristate "Z2 battery driver" - depends on I2C && MACH_ZIPIT2 - help - Say Y to include support for the battery on the Zipit Z2. - config BATTERY_TWL4030_MADC tristate "TWL4030 MADC battery driver" depends on TWL4030_MADC diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 2fb02f19a9e0..38737ea9b9d5 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -54,7 +54,6 @@ obj-$(CONFIG_BATTERY_DA9150) += da9150-fg.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o obj-$(CONFIG_BATTERY_MAX1721X) += max1721x_battery.o -obj-$(CONFIG_BATTERY_Z2) += z2_battery.o obj-$(CONFIG_BATTERY_RT5033) += rt5033_battery.o obj-$(CONFIG_CHARGER_RT9455) += rt9455_charger.o obj-$(CONFIG_BATTERY_TWL4030_MADC) += twl4030_madc_battery.o diff --git a/drivers/power/supply/z2_battery.c b/drivers/power/supply/z2_battery.c deleted file mode 100644 index 0ba4a590a0a5..000000000000 diff --git a/include/linux/z2_battery.h b/include/linux/z2_battery.h deleted file mode 100644 index 9e8be7a7cd25..000000000000 From patchwork Thu Jan 5 13:46:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090587 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0629BC3DA7A for ; Thu, 5 Jan 2023 22:09:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=x4rGm/Vp4Fk/c0OeJ/aMx32vteDstOu9yI08PzkneyQ=; b=urpTrLKltn/12I Rue3q4Ix7JHWjjBcDG+IhlnpdTneApH8XP2D9x00mvlnMo21nP9X6Jwxl1f1Dj4lSWahpiJeS2vIW NttQ3psNzgEjPE6GxxwyWSBMvlcsUjmn2PRBrwHa+ADaAtTf7vz24xXypOhN1egYJpG3TDDMSDb5G g9OOHANi4EmbwZ5A6GpGBoUqkZv2v7HKx0jRadvQd3n/z2KkmFl3YINAj9wGPb8H0k6fvg4BJRM01 1Eqn+CrYZJZgQ2BlOW1djgjhCU5AF/0gD8SoPF9We00iOI0JGeCKoR5duWRGNfIeq4+YsJAq7C+Sg TwznGtS1nL+PjHioz0kA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYPO-00FQv4-EU; Thu, 05 Jan 2023 22:08:22 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVAw-00DkST-VK for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:41:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=/I0g97bSlOzVZdnDZBtUJeUCceBDmdkdecQMRSKuA0U=; b=kpcrWeISjbjESor/dFsJpNAVut fM+V3UD0im3AadLZ2fiyk2k1S7rjEAT1mZGRtfymzmQWesQVzm/+tRPTck1afYX/KWNiN98VFDm3s Oy5Y5kYSbSLiiPl8FiAAAyYNLxQVRpF25k/Ecd7Tfrr2uzApCjsTXhXqABkQWGrigfjIvbf5tkK+i L70v6Cnjj48DSZ/PG2b8pQvIJ7AciBcdn8hCZ0sJXy5BalHEAfnhZs54GoPOWO7FmxOeAX1SXQ1T4 jw/9l+jGgnqH+3Hw/+7+X4oCvDIXGS7nfCvpurxKVkZA2D1ulp4EnMiztCkyYtCsUeXF7J5OY4iYY 0LZuRS0g==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQa9-001M1J-0P for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:46:59 +0000 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 621E9B81ABD; Thu, 5 Jan 2023 13:47:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56FD3C433EF; Thu, 5 Jan 2023 13:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926421; bh=dEuDRHQ7Sm3N5Gxt4MXi3ZvxmHYSAXFo1vd8BJvQn2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OchErH5pzoqwPQBxaeD1KmpvM0Qf2mQyORTo8uiK9ZSVEqrBoYdnvxeA9fgltxI2w K+lt7wSpOAQhtFngzLS1YPMeDa7u8YyYfUQzWhLEXx//v+NcMwVVGMZ14j5B4yYwtc Gz2llC+hREtLN7T2j8TJhoapsu4Tvl9H9Ea4U+iywIe1WfdqiSsa91X/PN/QU6vkOj vpceBO4bgkeM8GC/d+9oF8hnTDs4VEmb/5XPegk8IVnpcFPmYY/oaZHAn80aeJ5bzl P3e/3RKK1j7yO5jllOrMfT/qGfdO1mmg+SQO7/JuMeTPBucaMAGW81RqdaLxPIKrsw 0Y6heMtAHqsQg== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Sebastian Reichel , linux-pm@vger.kernel.org Subject: [PATCH 07/27] power: remove tosa_battery driver Date: Thu, 5 Jan 2023 14:46:02 +0100 Message-Id: <20230105134622.254560-8-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134657_330427_0F10F15B X-CRM114-Status: GOOD ( 14.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The PXA tosa machine is removed, so this driver is no longer in use. Cc: Sebastian Reichel Cc: linux-pm@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/power/supply/Kconfig | 7 - drivers/power/supply/Makefile | 1 - drivers/power/supply/tosa_battery.c | 512 ---------------------------- 3 files changed, 520 deletions(-) delete mode 100644 drivers/power/supply/tosa_battery.c diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index b7fdcfd5d4e7..3c37f3a6431c 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -195,13 +195,6 @@ config BATTERY_SAMSUNG_SDI Say Y to enable support for Samsung SDI battery data. These batteries are used in Samsung mobile phones. -config BATTERY_TOSA - tristate "Sharp SL-6000 (tosa) battery" - depends on MACH_TOSA && MFD_TC6393XB && TOUCHSCREEN_WM97XX - help - Say Y to enable support for the battery on the Sharp Zaurus - SL-6000 (tosa) models. - config BATTERY_COLLIE tristate "Sharp SL-5500 (collie) battery" depends on SA1100_COLLIE && MCP_UCB1200 diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 38737ea9b9d5..55c1aae91d1d 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -36,7 +36,6 @@ obj-$(CONFIG_BATTERY_LEGO_EV3) += lego_ev3_battery.o obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o obj-$(CONFIG_BATTERY_SAMSUNG_SDI) += samsung-sdi-battery.o -obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o obj-$(CONFIG_BATTERY_INGENIC) += ingenic-battery.o obj-$(CONFIG_BATTERY_IPAQ_MICRO) += ipaq_micro_battery.o diff --git a/drivers/power/supply/tosa_battery.c b/drivers/power/supply/tosa_battery.c deleted file mode 100644 index 73d4aca4c386..000000000000 From patchwork Thu Jan 5 13:46:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090494 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4634EC3DA7A for ; Thu, 5 Jan 2023 21:22:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3DsosppK2bSL5vG1yF8iqc4wZxwkWOd2OB2l9Iwebp0=; b=UKT6xll5rQ2oZ1 0DJ7XYSunZBXUkWOgUr8UmdRDt49aBVt8EUvpjmCnraV8VDrGigQaxD3BHt4H5lGEL0UxfeySv+3U Hy8jEVpgTk4CxxOY8tQFOtFNokYi/aYKakx3dI/dvca/MbLpAQZ+eCYlB9+7Jv17r+258V2nDDcaj OtLXR4fKodO3JJH6UQcKm2DtSP1NMl0X1OAb0LwsXCZw/2nqY8K4+FJBmgjYhsX2zzaZSpH8bZcqx J0ok5E+KUF78BWUWP7wJQg3/phleQ+3uzjPgzqdDEWZxvKRCmCcMV2Tgb2ebSNKYRpjxDOGjlLqNz f3NNq/V58AcSDrikLg7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDXgG-00F2hW-SJ; Thu, 05 Jan 2023 21:21:45 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDUtA-00DWbw-2I for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:22:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=txQFF/i2r0c/QkuTht8ec+N1AEHUzxPUjcXQEIzcDGo=; b=R62yWzlx5rYKdFQFZVMmOvBUz1 2B8CszbeV/vn7olvB72AJ7WIK+DGyKwofkyrv9K23nnvuPyHpXRm4vc3KcvrF+xCQzCQjjRJI6ReT u1s3IDkOeQ7VOFVySMoSaQ6Y6olMdF51VuHsw01ZGU/IM5ypDsR6gWu0hP1s1Gdyjks1vZ5CRK6mg yTT5JQaXXL4HglwiUoXDrfcJi2oq0GdRKrOHPGxHWamr6W05Sgt2D2Lbw8KrG+8N9n9B5Uy7sjbHn quzPIQAW6SGU3RQANo/DH96PVZJlCPv2mx8kWjry1k59P0dXZSzvI3OCPFwLX8dI2zIdnJmDWGPy5 ASj1wSMw==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaB-001M1a-2R for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:01 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id A543961A0C; Thu, 5 Jan 2023 13:47:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A15C1C433F0; Thu, 5 Jan 2023 13:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926424; bh=Yiulr7Sl0+EFOJK9Ppots4MUfhCrrD1tUceLFrFQBAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Au29traIASfq9dNyl8+ZbpOYCSGvTUHA36hQmRXoeSdhcuZNHgxROKVUPJcimuE1n wTEbQgbBcTh9IKa30BBGzEEizNTCmerQLas4A01ekpZ58esEAO/+Rde/Vg27XOVo9b bZNnVdGZ93ajq5l4ODUBGX0WnM68txXrJsYBDAwyEidQ9mf8CIKrOVXYFYQWaPEn+O SZjSn6y6w3oUdaUw+CnGpaDlHsnD5C4XYBSugOjNdoXwB2Q3c/7/PEbf9fq/02yvJT D7aT/kVmyHHz6NK7VOyLFzbHEYox6ou3pPktli0m8tKNR2Nmx/a9L3hF3PeLfot47M iz0s6LCgloHbQ== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Alessandro Zummo , Marek Vasut , Damien Le Moal , Sergey Shtylyov , linux-ide@vger.kernel.org Subject: [PATCH 08/27] ata: remove palmld pata driver Date: Thu, 5 Jan 2023 14:46:03 +0100 Message-Id: <20230105134622.254560-9-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134700_030454_9F263B5F X-CRM114-Status: GOOD ( 17.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The PXA palmld machine was removed, so the pata driver is no longer used and can be removed. There is a chance that some of this code might be useful for turning some of the other PXA PCMCIA host drivers into PATA drivers, but it's clear that it would not work unmodified, and it seems unlikely that someone would do this work. Cc: Alessandro Zummo Cc: Marek Vasut Cc: Damien Le Moal Cc: Sergey Shtylyov Cc: linux-kernel@vger.kernel.org Cc: linux-ide@vger.kernel.org Signed-off-by: Arnd Bergmann Acked-by: Damien Le Moal Reviewed-by: Sergey Shtylyov --- drivers/ata/Kconfig | 9 --- drivers/ata/Makefile | 1 - drivers/ata/pata_palmld.c | 137 -------------------------------------- 3 files changed, 147 deletions(-) delete mode 100644 drivers/ata/pata_palmld.c diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index e4d9e39b08dd..4aafb75bf0c3 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -1082,15 +1082,6 @@ config PATA_OPTI If unsure, say N. -config PATA_PALMLD - tristate "Palm LifeDrive PATA support" - depends on MACH_PALMLD - help - This option enables support for Palm LifeDrive's internal ATA - port via the new ATA layer. - - If unsure, say N. - config PATA_PCMCIA tristate "PCMCIA PATA support" depends on PCMCIA diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 0a863e7f3c60..4ee5c0761d90 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -105,7 +105,6 @@ obj-$(CONFIG_PATA_MPIIX) += pata_mpiix.o obj-$(CONFIG_PATA_NS87410) += pata_ns87410.o obj-$(CONFIG_PATA_OPTI) += pata_opti.o obj-$(CONFIG_PATA_PCMCIA) += pata_pcmcia.o -obj-$(CONFIG_PATA_PALMLD) += pata_palmld.o obj-$(CONFIG_PATA_PLATFORM) += pata_platform.o obj-$(CONFIG_PATA_OF_PLATFORM) += pata_of_platform.o obj-$(CONFIG_PATA_RB532) += pata_rb532_cf.o diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c deleted file mode 100644 index 51caa2a427dd..000000000000 From patchwork Thu Jan 5 13:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090666 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6B13FC3DA7A for ; Thu, 5 Jan 2023 23:04:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wSKFTEdYFGawXR+4CO73AlJcJmvbi3eSyD4agE+ePJ4=; b=z1RhtzlfJOLTFS GtuiIZ1K7+EwezfQetXTxtxcgkUhlczjsLyIK3iLLwVJoubAmYcyQ34rDoDqI77QhF0Cup7RV9AAE ZtEsUNgcGG7efZq7fNiBxNJJwZQ1LtoMmPDoQKET/FPJkegGjVi7AY1KD22FpqUqC1jQ9F0Kjw77b DBnpHM1HsNalTans9+fUdj3LdszNRhdTzvCZcI+BfzyMcXLwqFY5JT0vICJBGQLxTU7Ab/rzts2x8 vwj4G+V3dsF3t/L0QzeFgcZ0b2GhO8o9EeDxv2hh6FhRimUCk9i+Er5yvDlj+JZTE2CxVcW0YnztY ysQILd+GPnrdCGKn2dGg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZGf-00Fuj8-LW; Thu, 05 Jan 2023 23:03:27 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVTH-00Dv20-5x for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 19:00:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=FRCCNbZWAEZcc9EsO5icJJCWCtXm/57lXdA7unpWNHo=; b=oxyMI3t6xhhEBTXDTCrzjDfpLZ sRbmld+aAvwA6PvwRLxjQdcaKt0mttGbSQxwqHBqg+Yv4UluCiPcf/LSLoXsY6IZKYuzCKCr+Dhwb f45EKfIP32B2Cg5pA/94+wK5+EdVJ839yG47wMG2o9ERyum7UH4YL3sX6Zk57aLEEvO0fykz87ICP pcfnoEtuH0eOipNpXu4ruJTXu44poG03P3CB38dxl4OlhKEObPxpNkEKxaI7molUHYeWpzitk0r0a WfVLniUHHLUnWFRnSreYHEiZ64o6ArPFouypWrSDYMhlFC5Uqa9kPQvmNtzrrICK9eRJXa/VQOGSe PMe7CRGg==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaE-001M1u-1S for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:04 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 4A95D61A81; Thu, 5 Jan 2023 13:47:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F3F5C433EF; Thu, 5 Jan 2023 13:47:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926426; bh=kCdt9zcWy5Z7iBU2hEYAS5q9hfAuSycaoJsMghPPkTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s/Uq82a7wjGYOlAB2yEoZCR0RZ5zMqdRv7BhzgrX55PC+FXvDjhN/2+qUsOui/X/J FxhNSex0pPlmit+fN6Q+ZQzpwS8RzmxCKaw2qJmR5NjPulnR3paSfT+4efe/5nNkgq 93sx1WUAdy0epj5JNt14gmBLLdbARS003W/ePPDxzCEZtWEfulLkx/Nub+0iq3sIRR uKrX7oihiV2b5KWAIJ+QP93WkCdDcTS1a8CMVzIdOwkByqCgUupeTrSZ67DpEosa3i S1SxlNCTWeBpN2DRtxfIWBlfGdxPVHrsgdy4xG1/cdYj9uioLx1Bpv76xXEy4N/E4r 48Ku0/y/pmy0Q== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Lee Jones , Daniel Thompson , Jingoo Han , linux-fbdev@vger.kernel.org Subject: [PATCH 09/27] backlight: remove pxa tosa support Date: Thu, 5 Jan 2023 14:46:04 +0100 Message-Id: <20230105134622.254560-10-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134702_900121_0EB877BA X-CRM114-Status: GOOD ( 14.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The PXA tosa machine was removed, so this backlight driver is no longer needed. Cc: Lee Jones Cc: Daniel Thompson Cc: Jingoo Han Cc: linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER) Signed-off-by: Arnd Bergmann --- drivers/video/backlight/Kconfig | 14 -- drivers/video/backlight/Makefile | 2 - drivers/video/backlight/tosa_bl.c | 172 ----------------- drivers/video/backlight/tosa_bl.h | 8 - drivers/video/backlight/tosa_lcd.c | 284 ----------------------------- 5 files changed, 480 deletions(-) delete mode 100644 drivers/video/backlight/tosa_bl.c delete mode 100644 drivers/video/backlight/tosa_bl.h delete mode 100644 drivers/video/backlight/tosa_lcd.c diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig index 936ba1e4d35e..01804847c39f 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -90,13 +90,6 @@ config LCD_PLATFORM This driver provides a platform-device registered LCD power control interface. -config LCD_TOSA - tristate "Sharp SL-6000 LCD Driver" - depends on I2C && SPI && MACH_TOSA - help - If you have an Sharp SL-6000 Zaurus say Y to enable a driver - for its LCD. - config LCD_HP700 tristate "HP Jornada 700 series LCD Driver" depends on SA1100_JORNADA720_SSP && !PREEMPTION @@ -288,13 +281,6 @@ config BACKLIGHT_APPLE If you have an Intel-based Apple say Y to enable a driver for its backlight. -config BACKLIGHT_TOSA - tristate "Sharp SL-6000 Backlight Driver" - depends on I2C && MACH_TOSA && LCD_TOSA - help - If you have an Sharp SL-6000 Zaurus say Y to enable a driver - for its backlight - config BACKLIGHT_QCOM_WLED tristate "Qualcomm PMIC WLED Driver" select REGMAP diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile index e815f3f1deff..2a9126dbfe79 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile @@ -15,7 +15,6 @@ obj-$(CONFIG_LCD_LTV350QV) += ltv350qv.o obj-$(CONFIG_LCD_OTM3225A) += otm3225a.o obj-$(CONFIG_LCD_PLATFORM) += platform_lcd.o obj-$(CONFIG_LCD_TDO24M) += tdo24m.o -obj-$(CONFIG_LCD_TOSA) += tosa_lcd.o obj-$(CONFIG_LCD_VGG2432A4) += vgg2432a4.o obj-$(CONFIG_BACKLIGHT_88PM860X) += 88pm860x_bl.o @@ -53,7 +52,6 @@ obj-$(CONFIG_BACKLIGHT_QCOM_WLED) += qcom-wled.o obj-$(CONFIG_BACKLIGHT_RT4831) += rt4831-backlight.o obj-$(CONFIG_BACKLIGHT_SAHARA) += kb3886_bl.o obj-$(CONFIG_BACKLIGHT_SKY81452) += sky81452-backlight.o -obj-$(CONFIG_BACKLIGHT_TOSA) += tosa_bl.o obj-$(CONFIG_BACKLIGHT_TPS65217) += tps65217_bl.o obj-$(CONFIG_BACKLIGHT_WM831X) += wm831x_bl.o obj-$(CONFIG_BACKLIGHT_ARCXCNN) += arcxcnn_bl.o diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c deleted file mode 100644 index 77b71f6c19b5..000000000000 diff --git a/drivers/video/backlight/tosa_bl.h b/drivers/video/backlight/tosa_bl.h deleted file mode 100644 index 589e17e6fdb2..000000000000 diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c deleted file mode 100644 index 23d6c6bf0f54..000000000000 From patchwork Thu Jan 5 13:46:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090661 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 378BEC3DA7A for ; Thu, 5 Jan 2023 23:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=B1wFPviEPWJaGTEtQgLV+QvifKrDbRiyeIstNhKXet8=; b=NhuRT+idsOR56e 6EKQ+kJ7uUcNd6DMoRGlH/VS9ggUB7Ti7wkCbzLyZn1WGCzOOxVNMtdsILBaG/q6Kv0qIVUr0tz4a 6vLYCPqOhmylA8MlitjoSh4bMuRqJZ2xKPpCgFxNHJjnq1VMuq+0XrNjqaeHgDkpsD1kpG8PL3cUa tMmRoRUHVx+TmL6zG0WP1s9mmxG6bMvR0D+Mg4J8Qt/HPBZw3E7QAQjlHJMwLHjkIDBkuygO6C1qk VLUT482h8doWwssz3dOUjyPEJ4VAVksMiDNWzfZ3FNylLwYdcXmA6yFY8Dknga2py5Z6GkuDjy1Yp VI7Rcd0xbpRHSE+9sBmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZCv-00FsUA-7a; Thu, 05 Jan 2023 22:59:33 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVQn-00Dtdi-N8 for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:57:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=jGy7Bip6rJrQ+bU2mzWsmsTFx2uZ8ZiO92Ch7O+pQbo=; b=EyZmTgXNVkH/6X2pf/2sFf9ePH ZsYQpCtA5hlsV0YmfHbX+QvJJRT9LPOpnicidFf8JTpBarZDlBK43NuIyQNirgkg6qPTRzijZFObj JtbNIqMci9W6VnSO6TKt9PAHYSh2e8wcRiDI2hyqa0UkX3uSLQPx3HDiymXChwS19d+dASrRvS4wU +0dpC+rG0MiEi9BukT/gqRXNATjrOxKYTF6nBYJJbZgxRWrMssHNEZyIa15mozW3foYLBTUYHJ3c4 6J2GHfIOGv8VJVjNVo/CZgGRITmrqzJiv8ly42v6aaNERGgWdk3F2dhqQQMT3FeqZrfDOMJFaAl2G BIOoJN+w==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaG-001M2B-2T for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:06 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 9752C61A8A; Thu, 5 Jan 2023 13:47:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E6D9C43392; Thu, 5 Jan 2023 13:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926429; bh=MePNggNn2Sdy9A2QPxyvtHiIGVkS0Kpugps/y3JKzaU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CIfFNq+TUc4bgKQDXZX7LJ+AsYv5L19C+b57kSP+WCWPDnV+66EVyavxyDdnjwa2L m7JZmu95FeBZ7HP5WaYlNIWHpccm+ST8DcBStZW9hEuK+SjMaCL8c8ml4LeCuYwB8r lqTZJzXfqZwq8HyPtBdhfBQIHyHwtyTfDS3z+A95BjcBJfPk0S6gvACvIUZ1+Sq0h/ 1tknNa7twsy7amcBfF/+1PzsKpK78HVLpOwlxu/5TK7M9xsgb6N325k9s/fR212RKz oUwHFGcll88yYP3SzeJk0IIBvi1H5s9E4W9Uyu29IiedhRxyBOwjieAyB9zW7yOk/0 if3kYzrG8RESA== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH 10/27] input: remove pxa930_trkball driver Date: Thu, 5 Jan 2023 14:46:05 +0100 Message-Id: <20230105134622.254560-11-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134705_001126_DA91C4AC X-CRM114-Status: GOOD ( 15.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The pxa930 SoC support is getting removed, and no upstream board ever provided the trkball device that this driver relies on. Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/input/mouse/Kconfig | 6 - drivers/input/mouse/Makefile | 1 - drivers/input/mouse/pxa930_trkball.c | 250 ------------------ .../platform_data/mouse-pxa930_trkball.h | 11 - 4 files changed, 268 deletions(-) delete mode 100644 drivers/input/mouse/pxa930_trkball.c delete mode 100644 include/linux/platform_data/mouse-pxa930_trkball.h diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index 63c9cda555c3..32cc4c62a716 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig @@ -393,12 +393,6 @@ config MOUSE_GPIO To compile this driver as a module, choose M here: the module will be called gpio_mouse. -config MOUSE_PXA930_TRKBALL - tristate "PXA930 Trackball mouse" - depends on CPU_PXA930 || CPU_PXA935 - help - Say Y here to support PXA930 Trackball mouse. - config MOUSE_MAPLE tristate "Maple mouse (for the Dreamcast)" depends on MAPLE diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile index e49f08565076..92b3204ce84e 100644 --- a/drivers/input/mouse/Makefile +++ b/drivers/input/mouse/Makefile @@ -18,7 +18,6 @@ obj-$(CONFIG_MOUSE_MAPLE) += maplemouse.o obj-$(CONFIG_MOUSE_NAVPOINT_PXA27x) += navpoint.o obj-$(CONFIG_MOUSE_PC110PAD) += pc110pad.o obj-$(CONFIG_MOUSE_PS2) += psmouse.o -obj-$(CONFIG_MOUSE_PXA930_TRKBALL) += pxa930_trkball.o obj-$(CONFIG_MOUSE_RISCPC) += rpcmouse.o obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o obj-$(CONFIG_MOUSE_SYNAPTICS_I2C) += synaptics_i2c.o diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c deleted file mode 100644 index f04ba12dbfa8..000000000000 diff --git a/include/linux/platform_data/mouse-pxa930_trkball.h b/include/linux/platform_data/mouse-pxa930_trkball.h deleted file mode 100644 index ba0ac7a30d8c..000000000000 From patchwork Thu Jan 5 13:46:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090570 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32C51C3DA7A for ; Thu, 5 Jan 2023 21:48:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vSjhjXEJn+TQkh0JLxPxSKZQFyPm56DM/TLdRSOwch4=; b=qyL0yUdzp7OHcL jkM6+bVdsb5GQuO2nnytsEcwZsCnEr/mw+L8PWXU31wFqBjwd/CX1BJQz/TMgLYzIg8nsgVdG6DlG KSQI+6rQ7Z5uVxwhFyQ1sRHmROxiEDJV4YyDNHgS2TQZ1m4OKo/q6/VSbr30Si9xB2fOFdcvY7AP2 bSnoi9jJexLLCzMIZ5n1OAb5n60aJ/lCJHfL1JjbZJJ0ISd37SaroP9hvnl+e0Qlv4uEtLBXlV2Ny 7voy5cP/aWUxNZc2kL+6UBqbGz/vZTEOMc1wREaVPz2LgT6xNvto/JuC3elZxXR+SPaPVrienf6TV JniQicgUMUS5sChhiX6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY5P-00FGOt-K8; Thu, 05 Jan 2023 21:47:44 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDV2H-00Ddfl-1g for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:32:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=zUsqvOqHWEzyLcH4yCWUb40IkzbGdWseSQSa8B+m2WQ=; b=FTMksHWD4ZHO2M4fyzsbuJnOIy DsMH83nL7k7bJngWAz4L4ZsJZNxr5XR7BZuZf959CJnvCB27QWKwaAWThh0zfbjNiNAypG37+h7/r BpBLOt02F6siA+XA7oFtUIgGSLN/od3sOCMweXOX3ywHLDqi8/yCOmTyelg1EJv3yv5LsNkhiN8zE 3hhjTJnM9687q3k3dbCASr7u44KnmB3y6SfYpwCW68rHueBj9Ehhyy7LEHnus023efHootBi7sbWC yu9TEg6lEGeynJscZy+Naa9iGpOmZNTyEjWW3kRAy3mGT+egAA6WeD830eb6YcQJWLkM77+1Vs15f ncyNkGsg==; Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaJ-001M2V-1T for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:09 +0000 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 A0EC0B81AE0; Thu, 5 Jan 2023 13:47:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78E9FC433D2; Thu, 5 Jan 2023 13:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926431; bh=py+J7Io7igGLkvTKhQuQwnmjg68rvRYi5ZkHo5Gcwck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NNR50j4X56it5NK2HPfvo4WLzgECROMps0deXNlkrJctv0s5PCTpf3eLmbIxtaTLD uloOhvOnkqHAAtK2sx4Rc8g6IOsyWVAi5XiOFF6neO9LqqAjZo92F0LGzbSufGRAqj nY5fQlP/u5WiEgo6iFTuU/4qnySn8q7Pf6x3doe0f4UKB2obKxXi25qk/tL1tf/NM4 owV2kzbi9wlinVjGWF12sk8ZR8Gym5HyDNtHIe+nWQxhDxOKRFYF9cDoDuGfMhcrYZ MmDrTAU32HyQCUTT6b57KPnV62yiePUmdQbytuj7IK/gUJV6oMMLPMkOp4k+Sf18Uy RZ1wR4+XuCUHw== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH 11/27] input: remove pxa930_rotary keyboard driver Date: Thu, 5 Jan 2023 14:46:06 +0100 Message-Id: <20230105134622.254560-12-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134707_775728_44DBD3F7 X-CRM114-Status: GOOD ( 15.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The pxa930 platform is getting removed and no upstream machine ever defined a rotary keyboard device. Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/input/keyboard/Kconfig | 9 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/pxa930_rotary.c | 195 ------------------ .../platform_data/keyboard-pxa930_rotary.h | 21 -- 4 files changed, 226 deletions(-) delete mode 100644 drivers/input/keyboard/pxa930_rotary.c delete mode 100644 include/linux/platform_data/keyboard-pxa930_rotary.h diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 5d481847d718..d98650426dc2 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -550,15 +550,6 @@ config KEYBOARD_PXA27x To compile this driver as a module, choose M here: the module will be called pxa27x_keypad. -config KEYBOARD_PXA930_ROTARY - tristate "PXA930/PXA935 Enhanced Rotary Controller Support" - depends on CPU_PXA930 || CPU_PXA935 - help - Enable support for PXA930/PXA935 Enhanced Rotary Controller. - - To compile this driver as a module, choose M here: the - module will be called pxa930_rotary. - config KEYBOARD_PMIC8XXX tristate "Qualcomm PMIC8XXX keypad support" depends on MFD_PM8XXX diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 5ccfdf5c0222..aecef00c5d09 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@ -54,7 +54,6 @@ obj-$(CONFIG_KEYBOARD_OPENCORES) += opencores-kbd.o obj-$(CONFIG_KEYBOARD_PINEPHONE) += pinephone-keyboard.o obj-$(CONFIG_KEYBOARD_PMIC8XXX) += pmic8xxx-keypad.o obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o -obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o obj-$(CONFIG_KEYBOARD_QT1050) += qt1050.o obj-$(CONFIG_KEYBOARD_QT1070) += qt1070.o obj-$(CONFIG_KEYBOARD_QT2160) += qt2160.o diff --git a/drivers/input/keyboard/pxa930_rotary.c b/drivers/input/keyboard/pxa930_rotary.c deleted file mode 100644 index 2fe9dcfe0a6f..000000000000 diff --git a/include/linux/platform_data/keyboard-pxa930_rotary.h b/include/linux/platform_data/keyboard-pxa930_rotary.h deleted file mode 100644 index 3271aa01cbe8..000000000000 From patchwork Thu Jan 5 13:46:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090580 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 943F3C3DA7A for ; Thu, 5 Jan 2023 21:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wLRklnyGhsUH5BMrUoGnlvtKgQ81HsiGYZ6of/JSTzk=; b=EeeoJv9T8We1Km 3QaHq0XKEQdJ6EuGLWsRuKDMaj8PIp2jkIhI0MtCgQbxylyvNktkVPz+H+L/fAkC1OPTNKISGL2x8 uagWUyQugzDOcGkKH/AOdTm2IaH5PRkfq9SXZjA8BFm+jmDM71J9l8RMA4Zf7fJ+y+15vaPYzDAoo irxlH4ggA0erDDNxDJqG8UXG7Azhpqv1TLxgjq9tvs2bJ1CsygiLm7Be8s85pHzVk62mx0YMpjI8Z UG3tSR0iOtPq7V9NTsUDPgrdiC+W3qrnRWMKgsbU8ALdEecafeP2TOcCeWqq1pt7bn7YtjQ/21/8G 4YGSiFA5ZcBRTGBtO43g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYEw-00FLUT-Ew; Thu, 05 Jan 2023 21:57:35 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDV6j-00DhHF-DS for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:36:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=emDnMj3qACIkqouJBjACSteseHBqJwUxFDaHp6w5ekY=; b=qZGNB7yj94ceaoQdqjkZw3w+QO ll4+eV78AwBxCFVS67t8ry9sT7Jgb3/oruR7mGRWl7/FfjMbifQpNi1all3sdbcE9G/kJJIGQRuzC YpN/mXWtUeWkxUQWIiMeBG8MW5ke2cwQIJcbf/vc66t5vL1m3syNNGEaKZGJuVTPTWbhQK831eaU1 bPHA5YvemJBkSek5ucCvMrz22UpwaWVVNZ+/RT5dcxOUB4rZcwFlfpENnTX5Q0PQ06wxVLD4S0F6f yvBOylc9FkbsDrKU7zCOCErXjJiZ4wWKawkPtyZ7zKTgFzXRNfGNN2ANFMWqtYqQq645pjPTn6bvu 02v/WMUA==; Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaL-001M2j-2r for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:11 +0000 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 1F5E4B81AD0; Thu, 5 Jan 2023 13:47:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C30FCC433F0; Thu, 5 Jan 2023 13:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926433; bh=5PvMVJ+De8GLNJxPP8DhyDrpZdidR1+tQOfU9i8T7uE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mw2+yIKhRrAXQmrCfUNpEWl94azK5I8+iqKBydGYHk6o8kfI9128IY5wVCjdKXECL MIXqh5QuXse6XkGENWc+s0wE2bX2PGpJGRmUSQvFOssPorPiCVEYRvwiNckBiQOdMw izgrWrne5+bC2HqNibiwNwCRC2ure4/a3NKFRvo6zG2cVhwlNuAQK5nFtQ9Uz6W/F/ wWSlXfjh/uhQkTS8z4yslaNUUy8k84l3w77B+aI1g66t1xG9qDIsmjabHcucEMYI6u zStpYC6bU6u67G/oYY2WWYuUrbCl+8CQNy8g0y860hizA669dc4dmyki4HVmI8h3sj 9+iNFhARVcdCg== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Dmitry Torokhov , Mark Brown , linux-input@vger.kernel.org Subject: [PATCH 12/27] input: remove zylonite touchscreen driver Date: Thu, 5 Jan 2023 14:46:07 +0100 Message-Id: <20230105134622.254560-13-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134710_103978_3A5D6EBB X-CRM114-Status: GOOD ( 15.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The PXA zylonite platform was removed, so this driver has no remaining users. Cc: Dmitry Torokhov Cc: Mark Brown Cc: linux-input@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/input/touchscreen/Kconfig | 14 -- drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/zylonite-wm97xx.c | 220 -------------------- 3 files changed, 235 deletions(-) delete mode 100644 drivers/input/touchscreen/zylonite-wm97xx.c diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 5abb45ea1b1b..ca00f55eaf45 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -928,20 +928,6 @@ config TOUCHSCREEN_WM97XX_MAINSTONE To compile this driver as a module, choose M here: the module will be called mainstone-wm97xx. -config TOUCHSCREEN_WM97XX_ZYLONITE - tristate "Zylonite accelerated touch" - depends on TOUCHSCREEN_WM97XX && MACH_ZYLONITE - depends on SND_PXA2XX_LIB_AC97 - select TOUCHSCREEN_WM9713 - help - Say Y here for support for streaming mode with the touchscreen - on Zylonite systems. - - If unsure, say N. - - To compile this driver as a module, choose M here: the - module will be called zylonite-wm97xx. - config TOUCHSCREEN_USB_COMPOSITE tristate "USB Touchscreen Driver" depends on USB_ARCH_HAS_HCD diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 3bc2a47c489c..7053fede594e 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -107,7 +107,6 @@ wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705) += wm9705.o wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713) += wm9713.o obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o -obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_SX8654) += sx8654.o obj-$(CONFIG_TOUCHSCREEN_TPS6507X) += tps6507x-ts.o obj-$(CONFIG_TOUCHSCREEN_ZET6223) += zet6223.o diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c deleted file mode 100644 index a70fe4abe520..000000000000 From patchwork Thu Jan 5 13:46:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090659 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1855DC3DA7A for ; Thu, 5 Jan 2023 22:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=R7osa8fIH+d8+4+K/0GH1cOeZMhiUbJevtf4vM9rtfg=; b=Y+dbLNvxZJTpV6 yQ7gnH7oZVTEnUJtcKUf56/cz3RFO5OWIl7UBwPDQqkeF5M/55y5VUJR0X7Gffr1VKzoBhOn8c3LJ nCztoE/uw9CbGMTzUEcbxN1tAELf3OKoH1qqtt2KzAyxvzEuazqLCmonVAD2ThAqrALL3DlVCTSIe bVN6Ahaqmg5IbpV6rqNjbvDpqn7q3Qx1tWZg4RaUOv/CIYiMii5DYhrNnIuwxf/BluPWTS78lHDjZ 1a2YIrsuIe3Zn0NdNJbHRQyJ7JOV49805K6s6X4BU4pJ88IpVES5OBjYfl+zj8fOl2rC71XM1OsR3 OlAf/u5ffO7LnyM9xppQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZBY-00Frfy-Ua; Thu, 05 Jan 2023 22:58:09 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVQG-00DtJ6-4X for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:57:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=spXzsa/K59tTk3FHS5f5/ztxP8CqdRQPkdmCzgXPot8=; b=RLbKyUjYKQ55eRk95VutfyeYox OyFo8NiOxiVV2ozTTw2aexUqRK4W5dG+oOtbZXULy1hw9MC01QdyG1U3gZJn8GBIZcyOLV4MifwmM TDoqOy1t/am0Fxo1nmbixgToAduLt6rOtzM+GdDcNnsmMlL+IpH7WD2tc7gBzuV1E+AO0YgN3bCUX /yOZ6tiMwBCp7dnCwZr/MItIH2IggRBd8uxVlTD5QIUSALgYLLIRADM7CW7hmvUx/jhASCuIO+Efo KV4co2IeaPGh+GFcbuDJwUEjMissCdG/5ZeH7Dny6L1zsTrlO1xnGmg3wVt8GuGcjr4JiBDP5x3yW BDGC/ZYQ==; Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaN-001M30-2y for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:13 +0000 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 3F807B81AE2; Thu, 5 Jan 2023 13:47:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47080C433F1; Thu, 5 Jan 2023 13:47:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926435; bh=hn3HISdXEY51xtvJzrgO8TbVIWPbUwezVx/zrFwoZfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OOu0etm9SyEPsON530cLE3M9D98J3SXv/oR6KUshtU9XE18FvozfgoE70ywh2tbUv pz2z0yAokfqjdCZ/WxKmHbcIOhCjVr0ZaGz5uAWYNWIoJ6pgRq+348PUoX20nTJxYc IfeZtuZBRUEDGNbImoRFZ3LLnR2M3RJuYA7s+zLC4fPuIORSSI9bhHrDUBtdLsutu6 1cpoVtEJQxCmcUzLr7cA2qIrcXm+HIVgQY9NynVYJ9qqJ+/AoZdBKpKg2Chw0PyjVm ZVLKmE1pjRpXjzk9Mmz5HDcB3wF1CndfduKTM5FPC3wmYSCfwYF2Hkwu2DZNP3N/7R Yn4LhhgsSdrvQ== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Dominik Brodowski Subject: [PATCH 13/27] pcmcia: remove unused pxa/sa1100 drivers Date: Thu, 5 Jan 2023 14:46:08 +0100 Message-Id: <20230105134622.254560-14-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134712_068223_BF9A08AD X-CRM114-Status: GOOD ( 15.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann A number of boards got removed, so this code is now orphaned. Cc: Dominik Brodowski Signed-off-by: Arnd Bergmann --- drivers/pcmcia/Kconfig | 12 +-- drivers/pcmcia/Makefile | 5 - drivers/pcmcia/pxa2xx_mainstone.c | 122 ----------------------- drivers/pcmcia/sa1100_simpad.c | 115 ---------------------- drivers/pcmcia/sa1111_badge4.c | 158 ------------------------------ drivers/pcmcia/sa1111_lubbock.c | 155 ----------------------------- 6 files changed, 2 insertions(+), 565 deletions(-) delete mode 100644 drivers/pcmcia/pxa2xx_mainstone.c delete mode 100644 drivers/pcmcia/sa1100_simpad.c delete mode 100644 drivers/pcmcia/sa1111_badge4.c delete mode 100644 drivers/pcmcia/sa1111_lubbock.c diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 1525023e49b6..44c16508ef14 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -194,10 +194,8 @@ config PCMCIA_SA1111 tristate "SA1111 support" depends on ARM && SA1111 && PCMCIA select PCMCIA_SOC_COMMON - select PCMCIA_SA11XX_BASE if ARCH_SA1100 - select PCMCIA_PXA2XX if ARCH_LUBBOCK && SA1111 + select PCMCIA_SA11XX_BASE select PCMCIA_MAX1600 if ASSABET_NEPONSET - select PCMCIA_MAX1600 if ARCH_LUBBOCK && SA1111 help Say Y here to include support for SA1111-based PCMCIA or CF sockets, found on the Jornada 720, Graphicsmaster and other @@ -207,14 +205,8 @@ config PCMCIA_SA1111 config PCMCIA_PXA2XX tristate "PXA2xx support" - depends on ARM && ARCH_PXA && PCMCIA - depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ - || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ - || ARCOM_PCMCIA || ARCH_PXA_ESERIES \ - || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \ - || MACH_COLIBRI320 || MACH_H4700) + depends on ARM && ARCH_PXA && PCMCIA && PXA_SHARPSL select PCMCIA_SOC_COMMON - select PCMCIA_MAX1600 if MACH_MAINSTONE help Say Y here to include support for the PXA2xx PCMCIA controller diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index b3a2accf47af..c9d51b150682 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -36,17 +36,12 @@ obj-$(CONFIG_PCMCIA_MAX1600) += max1600.o sa1111_cs-y += sa1111_generic.o sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1111_neponset.o -sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1111_badge4.o sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1111_jornada720.o -sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += sa1111_lubbock.o sa1100_cs-y += sa1100_generic.o sa1100_cs-$(CONFIG_SA1100_COLLIE) += pxa2xx_sharpsl.o -sa1100_cs-$(CONFIG_SA1100_H3100) += sa1100_h3600.o sa1100_cs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o -sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o -pxa2xx-obj-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o pxa2xx-obj-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_base.o $(pxa2xx-obj-y) obj-$(CONFIG_PCMCIA_XXS1500) += xxs1500_ss.o diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c deleted file mode 100644 index a076e4108452..000000000000 diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c deleted file mode 100644 index 784ada5b8c4f..000000000000 diff --git a/drivers/pcmcia/sa1111_badge4.c b/drivers/pcmcia/sa1111_badge4.c deleted file mode 100644 index e76d5ba921dd..000000000000 diff --git a/drivers/pcmcia/sa1111_lubbock.c b/drivers/pcmcia/sa1111_lubbock.c deleted file mode 100644 index f1b5160cb8fa..000000000000 From patchwork Thu Jan 5 13:46:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090571 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CB575C3DA7A for ; Thu, 5 Jan 2023 21:49:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/GJ1pvAXwsm8AGj3E2bJEKVVvwueC/eFLkWhJfPAIdw=; b=O37MV/yg0PoPqI lL3ELfPuPi8g/z7QFMGaDKIFP3Jg2qAVCs+T+NGEzMCFAx296uAvto4eCQ4N0grMTGWeXV5Kll/eF rYUBkTCRO5H6eS0QSccfRUISQoegPv3tOh4HMSNov3sLyuZvLAwaYKhuAfCN0QxBqtYBUms6J/4tg uPLnfuq+XfSsdVZ5ktv1n4cK5kTQ4eztx3/kvbJanyn96co1xLLjSMWwwYdQdnnd9gJN+08UkScsf TCq8SQERNP1ajFMSpkZPYypkBaKpb0eUHtUxm1QA+EU9uCccwnr4JSr0OWG2wvG7fBAD/7j2PkXh5 zGwrWJznm+fBEAbrNniQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY6a-00FGyU-QC; Thu, 05 Jan 2023 21:48:57 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDV3g-00Depf-Ob for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:33:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=iSHVswwapq2WvDI7bhh3g9Am3wPxDSQWZhEi1Gsmd+A=; b=ezoNy0jpGP2JN9FgmKNCwM43/t aIRlbk9soLZ4kRdfRF0gvjdBUPYsNBy+XV07rl2dhCjBha8mOHXcK4DRy0tymfYUInEEhP4llBO91 lrr3D8YGenBEugDxJIaQsvQ6AXcKDeRtfsjCu8IYgo1gUcVIHmXtgjpbH404Pzd9r4v6orocxhcud RhDtgcSJLyl3MvtPtetQBRIu8oe1kTnlgi1c00JYmzAME0kN0LOq4da2Rk+WigrhH2/EahOOqKiho ckDveksch9J6RfzjnZi9L7ti7KChHNW/dmVOSka4CvbPrarzEd2pnQr+1Eg6HU8zwo56T2Lvf6/fC keE97XQQ==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaR-001M3H-1M for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:17 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 5ADCC61A8D; Thu, 5 Jan 2023 13:47:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 615CDC433EF; Thu, 5 Jan 2023 13:47:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926438; bh=q5fQna0b2+wUwPltDmolUYGF06HuBjRD0D0iAWYomeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OP6AjCLpRBdGcAkjcJuoGvOwpNugnKKQFzn0iNMsnw2NzypoLleV9nENGgeSe29E0 v0YprYjXsoOHTxZC0shUxalBcXBvaQWxRp3CbtpycvQwoEGCXGZcCwaqpg3zJcBh7M JFQC7LMBW5LFEhwt7EE9Yrql7Rz/EaEJY7TTcnhcZnRU7piNOH2twIQywYBkH3snhB rQ4KvNMQAMe8Hasyxo4JyuKKI3rSIHnfs9eZkXQtFFymdC7uZDuZDTCG+XQK5WmfC8 kMiPrPn5+URPRVOTqBkigc6R1jUHUChA5GFKm4RsYhCH8SOn6ONFTOS5FOQ77utabk 34B2mrnox9Q6w== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org Subject: [PATCH 14/27] ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable Date: Thu, 5 Jan 2023 14:46:09 +0100 Message-Id: <20230105134622.254560-15-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134715_709111_1F88A28D X-CRM114-Status: GOOD ( 16.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann When building a PXA kernel without legacy board file support, the AC97 code is not built, so none of the AC97 drivers can be used. Add a Kconfig prompt to let users turn it on, and have it enabled by default. Cc: Robert Jarzmik Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: alsa-devel@alsa-project.org Signed-off-by: Arnd Bergmann --- sound/soc/pxa/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index a045693d5bc2..2036d368c08d 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -16,7 +16,10 @@ config SND_PXA2XX_AC97 tristate config SND_PXA2XX_SOC_AC97 - tristate + tristate "SoC AC97 support for PXA2xx" + depends on SND_PXA2XX_SOC + depends on AC97_BUS=n + default y select AC97_BUS_NEW select SND_PXA2XX_LIB select SND_PXA2XX_LIB_AC97 From patchwork Thu Jan 5 13:46:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090670 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 06442C4708E for ; Thu, 5 Jan 2023 23:12:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=caI9igYJzj2GO8dsSXiuYKkbvPk/sqlxyFiI0EoTbh0=; b=jfZYwYyXu9GkP9 K7Nn+pJc0sHU9R4hkPEcKdgZrGxmPPwzGMTVuq/J5lv93hkaQOurcO5/kphU75FHRULo5rDZI+CdE kfXn1sJF3SrZqCcuXgTHjdNOO7+IGkJRC3D15qY6ErkO+1KmpImJWq45kr690eZhBZx/WIMR3nJsK Azz5hK1wNi92bRHTxWMKyP24lD4FPAFi9II9GJgXh8qDn0zv/QkY1kEaiGB8udqEP3BelpqCdJQBC Q6Gjta/SUZJSqpvR3ri34l8Rs7tu6GId3bmb38ixZVeIsN9hDlYXJCmYkL5hMWy+mlNpdFKw7GvaS Kzdhv6NaKBRKkyEhgwqw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZO7-00FzNm-CU; Thu, 05 Jan 2023 23:11:07 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVUp-00Dvp2-9Q for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 19:01:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=BG55zqzcqFEZMa8TrzZHHs4I6AMp2DUFd6XpGyOyZ88=; b=Fk18PSdWch2ZeuA/WR9E4Ifye4 m9usqRKTeaSxJ8X4iZb7Mah9PwZwQc7ZrFZrLgZYI97jYWvRq3XmyqqIkbONkeAWC6LZuIlN0dscp mSGJujCW5S5PcGB7kTbRQLPp27VjJtve7Cyvu9Uk+QGio08FbwW2HEn0a1egVxj6RwbL0E/J/GCAN g8I0YHPAyo/hALju4ot6unXwz5OeE+S4nfI8Q8QQvHYXjeeIDwMvDiv5/R9WphMHROiM3gWfDwmzt yJhSzjeWraJJDftiF+LfJsxXy/HVaV1jVxrU2VyyJRtrdneQnEfv9oqbvnCfLpXoItliHOs4E0Ghh AtfmxpNg==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaU-001M3Y-0S for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:20 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 01AC161A81; Thu, 5 Jan 2023 13:47:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47060C433D2; Thu, 5 Jan 2023 13:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926442; bh=PXqOv0LctzShAq7q8kG4dABXJIY3SUF939BAdbcjLEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ua1EpTbehUxbw/Ic9Uz2vQyvyrsKyksmt2Vyi6cGfsesz04RTE1JtjsR6+uyc2Azn 8H5rIZWotkUqE3CIPIDVSm067bcRneXSmmp1vypSuIlUOSFaypLq2giJmi/5ml5M8s 6kANTUb/T1tq3Q+oVgz84jtAU+QaaMyEEEN7Y822FWonHiGfmC1H6m6noj1gRRyvk/ bNPhkjK6FVLLAR2aGLBIZ7WgG6pC29njQXqjw/ge90WKxQazqmixXbeeXi1sX8AzeN VIM1rWPwJkSfbIlDcDy3Bwyv+lUrckDwX2L8saGzh0jxKQMY7rsxtx1YWs4V/30/Cy bCJ5Uc7cWgsWA== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Ian Molton , Ken McGuire , Marek Vasut , Mike Rapoport , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org Subject: [PATCH 15/27] ASoC: pxa: remove unused board support Date: Thu, 5 Jan 2023 14:46:10 +0100 Message-Id: <20230105134622.254560-16-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134718_640035_3C4D7DA6 X-CRM114-Status: GOOD ( 19.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann Most PXA/MMP boards were removed, so the board specific ASoC support is no longer needed, leaving only support for DT based ones, as well as the "gumstix" and "spitz" machines that may get converted to DT later. Cc: Ian Molton Cc: Ken McGuire Cc: Marek Vasut Cc: Mike Rapoport Cc: Robert Jarzmik Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: alsa-devel@alsa-project.org Signed-off-by: Arnd Bergmann --- include/linux/platform_data/asoc-palm27x.h | 9 - include/linux/platform_data/asoc-poodle.h | 16 - include/linux/platform_data/mmp_audio.h | 18 - sound/soc/pxa/Kconfig | 176 ---------- sound/soc/pxa/Makefile | 33 -- sound/soc/pxa/brownstone.c | 133 -------- sound/soc/pxa/corgi.c | 332 ------------------- sound/soc/pxa/e740_wm9705.c | 168 ---------- sound/soc/pxa/e750_wm9705.c | 147 --------- sound/soc/pxa/e800_wm9712.c | 147 --------- sound/soc/pxa/em-x270.c | 92 ------ sound/soc/pxa/hx4700.c | 207 ------------ sound/soc/pxa/magician.c | 366 --------------------- sound/soc/pxa/mioa701_wm9713.c | 201 ----------- sound/soc/pxa/mmp-pcm.c | 267 --------------- sound/soc/pxa/palm27x.c | 162 --------- sound/soc/pxa/poodle.c | 291 ---------------- sound/soc/pxa/tosa.c | 255 -------------- sound/soc/pxa/ttc-dkb.c | 143 -------- sound/soc/pxa/z2.c | 218 ------------ sound/soc/pxa/zylonite.c | 266 --------------- 21 files changed, 3647 deletions(-) delete mode 100644 include/linux/platform_data/asoc-palm27x.h delete mode 100644 include/linux/platform_data/asoc-poodle.h delete mode 100644 include/linux/platform_data/mmp_audio.h delete mode 100644 sound/soc/pxa/brownstone.c delete mode 100644 sound/soc/pxa/corgi.c delete mode 100644 sound/soc/pxa/e740_wm9705.c delete mode 100644 sound/soc/pxa/e750_wm9705.c delete mode 100644 sound/soc/pxa/e800_wm9712.c delete mode 100644 sound/soc/pxa/em-x270.c delete mode 100644 sound/soc/pxa/hx4700.c delete mode 100644 sound/soc/pxa/magician.c delete mode 100644 sound/soc/pxa/mioa701_wm9713.c delete mode 100644 sound/soc/pxa/mmp-pcm.c delete mode 100644 sound/soc/pxa/palm27x.c delete mode 100644 sound/soc/pxa/poodle.c delete mode 100644 sound/soc/pxa/tosa.c delete mode 100644 sound/soc/pxa/ttc-dkb.c delete mode 100644 sound/soc/pxa/z2.c delete mode 100644 sound/soc/pxa/zylonite.c diff --git a/include/linux/platform_data/asoc-palm27x.h b/include/linux/platform_data/asoc-palm27x.h deleted file mode 100644 index 22b69a393a57..000000000000 diff --git a/include/linux/platform_data/asoc-poodle.h b/include/linux/platform_data/asoc-poodle.h deleted file mode 100644 index 2052fad55c5c..000000000000 diff --git a/include/linux/platform_data/mmp_audio.h b/include/linux/platform_data/mmp_audio.h deleted file mode 100644 index 83428d8ee18d..000000000000 diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 2036d368c08d..e6bca9070953 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -8,10 +8,6 @@ config SND_PXA2XX_SOC the PXA2xx AC97, I2S or SSP interface. You will also need to select the audio interfaces to support below. -config SND_MMP_SOC - bool - select MMP_SRAM - config SND_PXA2XX_AC97 tristate @@ -44,15 +40,6 @@ config SND_MMP_SOC_SSPA Say Y if you want to add support for codecs attached to the MMP SSPA interface. -config SND_PXA2XX_SOC_CORGI - tristate "SoC Audio support for Sharp Zaurus SL-C7x0" - depends on SND_PXA2XX_SOC && PXA_SHARP_C7xx && I2C - select SND_PXA2XX_SOC_I2S - select SND_SOC_WM8731_I2C - help - Say Y if you want to add support for SoC audio on Sharp - Zaurus SL-C7x0 models (Corgi, Shepherd, Husky). - config SND_PXA2XX_SOC_SPITZ tristate "SoC Audio support for Sharp Zaurus SL-Cxx00" depends on SND_PXA2XX_SOC && PXA_SHARP_Cxx00 && I2C @@ -62,101 +49,6 @@ config SND_PXA2XX_SOC_SPITZ Say Y if you want to add support for SoC audio on Sharp Zaurus SL-Cxx00 models (Spitz, Borzoi and Akita). -config SND_PXA2XX_SOC_Z2 - tristate "SoC Audio support for Zipit Z2" - depends on SND_PXA2XX_SOC && MACH_ZIPIT2 && I2C - select SND_PXA2XX_SOC_I2S - select SND_SOC_WM8750 - help - Say Y if you want to add support for SoC audio on Zipit Z2. - -config SND_PXA2XX_SOC_POODLE - tristate "SoC Audio support for Poodle" - depends on SND_PXA2XX_SOC && MACH_POODLE && I2C - select SND_PXA2XX_SOC_I2S - select SND_SOC_WM8731_I2C - help - Say Y if you want to add support for SoC audio on Sharp - Zaurus SL-5600 model (Poodle). - -config SND_PXA2XX_SOC_TOSA - tristate "SoC AC97 Audio support for Tosa" - depends on SND_PXA2XX_SOC && MACH_TOSA - depends on MFD_TC6393XB - depends on AC97_BUS=n - select REGMAP - select AC97_BUS_NEW - select AC97_BUS_COMPAT - select SND_PXA2XX_SOC_AC97 - select SND_SOC_WM9712 - help - Say Y if you want to add support for SoC audio on Sharp - Zaurus SL-C6000x models (Tosa). - -config SND_PXA2XX_SOC_E740 - tristate "SoC AC97 Audio support for e740" - depends on SND_PXA2XX_SOC && MACH_E740 - depends on AC97_BUS=n - select REGMAP - select AC97_BUS_NEW - select AC97_BUS_COMPAT - select SND_SOC_WM9705 - select SND_PXA2XX_SOC_AC97 - help - Say Y if you want to add support for SoC audio on the - toshiba e740 PDA - -config SND_PXA2XX_SOC_E750 - tristate "SoC AC97 Audio support for e750" - depends on SND_PXA2XX_SOC && MACH_E750 - depends on AC97_BUS=n - select REGMAP - select SND_SOC_WM9705 - select SND_PXA2XX_SOC_AC97 - help - Say Y if you want to add support for SoC audio on the - toshiba e750 PDA - -config SND_PXA2XX_SOC_E800 - tristate "SoC AC97 Audio support for e800" - depends on SND_PXA2XX_SOC && MACH_E800 - depends on AC97_BUS=n - select REGMAP - select SND_SOC_WM9712 - select AC97_BUS_NEW - select AC97_BUS_COMPAT - select SND_PXA2XX_SOC_AC97 - help - Say Y if you want to add support for SoC audio on the - Toshiba e800 PDA - -config SND_PXA2XX_SOC_EM_X270 - tristate "SoC Audio support for CompuLab CM-X300" - depends on SND_PXA2XX_SOC && MACH_CM_X300 - depends on AC97_BUS=n - select REGMAP - select AC97_BUS_NEW - select AC97_BUS_COMPAT - select SND_PXA2XX_SOC_AC97 - select SND_SOC_WM9712 - help - Say Y if you want to add support for SoC audio on - CompuLab EM-x270, eXeda and CM-X300 machines. - -config SND_PXA2XX_SOC_PALM27X - bool "SoC Audio support for Palm T|X, T5, E2 and LifeDrive" - depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \ - MACH_PALMT5 || MACH_PALMTE2) - depends on AC97_BUS=n - select REGMAP - select AC97_BUS_NEW - select AC97_BUS_COMPAT - select SND_PXA2XX_SOC_AC97 - select SND_SOC_WM9712 - help - Say Y if you want to add support for SoC audio on - Palm T|X, T5, E2 or LifeDrive handheld computer. - config SND_PXA910_SOC tristate "SoC Audio for Marvell PXA910 chip" depends on ARCH_MMP && SND @@ -164,71 +56,3 @@ config SND_PXA910_SOC help Say Y if you want to add support for SoC audio on the Marvell PXA910 reference platform. - -config SND_SOC_TTC_DKB - tristate "SoC Audio support for TTC DKB" - depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y - select PXA_SSP - select SND_PXA_SOC_SSP - select SND_MMP_SOC - select MFD_88PM860X - select SND_SOC_88PM860X - help - Say Y if you want to add support for SoC audio on TTC DKB - - -config SND_SOC_ZYLONITE - tristate "SoC Audio support for Marvell Zylonite" - depends on SND_PXA2XX_SOC && MACH_ZYLONITE - depends on AC97_BUS=n - select AC97_BUS_NEW - select AC97_BUS_COMPAT - select SND_PXA2XX_SOC_AC97 - select REGMAP - select SND_PXA_SOC_SSP - select SND_SOC_WM9713 - help - Say Y if you want to add support for SoC audio on the - Marvell Zylonite reference platform. - -config SND_PXA2XX_SOC_HX4700 - tristate "SoC Audio support for HP iPAQ hx4700" - depends on SND_PXA2XX_SOC && MACH_H4700 && I2C - select SND_PXA2XX_SOC_I2S - select SND_SOC_AK4641 - help - Say Y if you want to add support for SoC audio on the - HP iPAQ hx4700. - -config SND_PXA2XX_SOC_MAGICIAN - tristate "SoC Audio support for HTC Magician" - depends on SND_PXA2XX_SOC && MACH_MAGICIAN && I2C - select SND_PXA2XX_SOC_I2S - select SND_PXA_SOC_SSP - select SND_SOC_UDA1380 - help - Say Y if you want to add support for SoC audio on the - HTC Magician. - -config SND_PXA2XX_SOC_MIOA701 - tristate "SoC Audio support for MIO A701" - depends on SND_PXA2XX_SOC && MACH_MIOA701 - depends on AC97_BUS=n - select REGMAP - select AC97_BUS_NEW - select AC97_BUS_COMPAT - select SND_PXA2XX_SOC_AC97 - select SND_SOC_WM9713 - help - Say Y if you want to add support for SoC audio on the - MIO A701. - -config SND_MMP_SOC_BROWNSTONE - tristate "SoC Audio support for Marvell Brownstone" - depends on SND_MMP_SOC_SSPA && MACH_BROWNSTONE && I2C - select SND_MMP_SOC - select MFD_WM8994 - select SND_SOC_WM8994 - help - Say Y if you want to add support for SoC audio on the - Marvell Brownstone reference platform. diff --git a/sound/soc/pxa/Makefile b/sound/soc/pxa/Makefile index b712eb894a61..406605fc7414 100644 --- a/sound/soc/pxa/Makefile +++ b/sound/soc/pxa/Makefile @@ -4,47 +4,14 @@ snd-soc-pxa2xx-objs := pxa2xx-pcm.o snd-soc-pxa2xx-ac97-objs := pxa2xx-ac97.o snd-soc-pxa2xx-i2s-objs := pxa2xx-i2s.o snd-soc-pxa-ssp-objs := pxa-ssp.o -snd-soc-mmp-objs := mmp-pcm.o snd-soc-mmp-sspa-objs := mmp-sspa.o obj-$(CONFIG_SND_PXA2XX_SOC) += snd-soc-pxa2xx.o obj-$(CONFIG_SND_PXA2XX_SOC_AC97) += snd-soc-pxa2xx-ac97.o obj-$(CONFIG_SND_PXA2XX_SOC_I2S) += snd-soc-pxa2xx-i2s.o obj-$(CONFIG_SND_PXA_SOC_SSP) += snd-soc-pxa-ssp.o -obj-$(CONFIG_SND_MMP_SOC) += snd-soc-mmp.o obj-$(CONFIG_SND_MMP_SOC_SSPA) += snd-soc-mmp-sspa.o # PXA Machine Support -snd-soc-corgi-objs := corgi.o -snd-soc-poodle-objs := poodle.o -snd-soc-tosa-objs := tosa.o -snd-soc-e740-objs := e740_wm9705.o -snd-soc-e750-objs := e750_wm9705.o -snd-soc-e800-objs := e800_wm9712.o snd-soc-spitz-objs := spitz.o -snd-soc-em-x270-objs := em-x270.o -snd-soc-palm27x-objs := palm27x.o -snd-soc-zylonite-objs := zylonite.o -snd-soc-hx4700-objs := hx4700.o -snd-soc-magician-objs := magician.o -snd-soc-mioa701-objs := mioa701_wm9713.o -snd-soc-z2-objs := z2.o -snd-soc-brownstone-objs := brownstone.o -snd-soc-ttc-dkb-objs := ttc-dkb.o - -obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o -obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o -obj-$(CONFIG_SND_PXA2XX_SOC_TOSA) += snd-soc-tosa.o -obj-$(CONFIG_SND_PXA2XX_SOC_E740) += snd-soc-e740.o -obj-$(CONFIG_SND_PXA2XX_SOC_E750) += snd-soc-e750.o -obj-$(CONFIG_SND_PXA2XX_SOC_E800) += snd-soc-e800.o obj-$(CONFIG_SND_PXA2XX_SOC_SPITZ) += snd-soc-spitz.o -obj-$(CONFIG_SND_PXA2XX_SOC_EM_X270) += snd-soc-em-x270.o -obj-$(CONFIG_SND_PXA2XX_SOC_PALM27X) += snd-soc-palm27x.o -obj-$(CONFIG_SND_PXA2XX_SOC_HX4700) += snd-soc-hx4700.o -obj-$(CONFIG_SND_PXA2XX_SOC_MAGICIAN) += snd-soc-magician.o -obj-$(CONFIG_SND_PXA2XX_SOC_MIOA701) += snd-soc-mioa701.o -obj-$(CONFIG_SND_PXA2XX_SOC_Z2) += snd-soc-z2.o -obj-$(CONFIG_SND_SOC_ZYLONITE) += snd-soc-zylonite.o -obj-$(CONFIG_SND_MMP_SOC_BROWNSTONE) += snd-soc-brownstone.o -obj-$(CONFIG_SND_SOC_TTC_DKB) += snd-soc-ttc-dkb.o diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c deleted file mode 100644 index f310a8e91bbf..000000000000 diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c deleted file mode 100644 index 4489d2c8b124..000000000000 diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c deleted file mode 100644 index 4e0e9b778d4c..000000000000 diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c deleted file mode 100644 index 7a1e0d8bfd11..000000000000 diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c deleted file mode 100644 index a39c494127cf..000000000000 diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c deleted file mode 100644 index b59ec22e1e7e..000000000000 diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c deleted file mode 100644 index a323ddb8fc3e..000000000000 diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c deleted file mode 100644 index b791a2ba5ce5..000000000000 diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c deleted file mode 100644 index 0fa37637eca9..000000000000 diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c deleted file mode 100644 index 99b245e3079a..000000000000 diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c deleted file mode 100644 index a2321c01c160..000000000000 diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c deleted file mode 100644 index 5fdaa477e85d..000000000000 diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c deleted file mode 100644 index 30f83cab0c32..000000000000 diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c deleted file mode 100644 index 6cc970bb2aac..000000000000 diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c deleted file mode 100644 index 020dcce1df1f..000000000000 diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c deleted file mode 100644 index bb89a53f4ab1..000000000000 From patchwork Thu Jan 5 13:46:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090485 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03323C3DA7A for ; Thu, 5 Jan 2023 21:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GUHedX8qfWmRgHLgWhrIlyZN/mI3qe9WOJNTXMdYoXE=; b=c8zPwFThTFWz01 BKXeSkYrHEqkYbFBn9zn/jLVKFfjP99kcYtdBEhycGSq57W/ghaLeU+V0PxFvnFoAjL2TJZ4SnyTY wzEUdAJvynk2ZRllT+E+YiSAMVVjmpBvJp97kt8cn+11MOYJklcb3RpQYDlH5JnjGI6JMx1NQ7CYB Fkq92wwpXVE5RM4Zrr/qAsjUiN9EjgqCfddXmcI/PqtppR7b2vkiazadLRQh42dl6VhvcGXPaZkUO u5vkyaiFYQWrj8t4yQbW9Y0jjo55XFT4crSJLWVsFFNlseLB7DApv8djLo/u05TZcuGVcYe+FFSvu /yQye1xC6iuJyFN95nXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDXY3-00Ey1H-Fz; Thu, 05 Jan 2023 21:13:15 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDUp1-00DTfo-08 for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:18:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=+dt3Z+L/fCeF1YdjQaNzRexEuNw5gOWY7BKxLMtF7Qg=; b=XmuVA1nmBUfH4sIBDSobKMPsZB sEGaTrBzmH5UV7dBwX1DpJKC1fB0J7gUtMpaCNwRzrZd7NTShXwgGL6T+760it5Q0wyEDt6Xf8tkn Xa85bRqoFU1CxsFRENyVAkT6t9r1aYbsY2vJ5KNXIcTzzw5tkG0cdTeSpDfKOQWkNtUFwv+v2tbLB zPLXrgLd02MUpfp4hZSj81ZP6hDScTEpv8scvuFj+GwqwsCbzdZCoY+poAP50NlErNz+tO13ICxj2 KtAmC7EdymsQXYk+1X3fdfZrfhXsNJqy3MOYZHq4HMnGTCJcZo+K14J9CsQfZrNTWTMUluFWoqpvE E4jqoUvw==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaW-001M3q-1p for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:22 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 781FA61A7F; Thu, 5 Jan 2023 13:47:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCDB1C433EF; Thu, 5 Jan 2023 13:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926444; bh=FJKWxab8jgdL8QRSTYPu5QbZT8XQ3r9MStsrq3HgraI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TnoemKZzlRtc4RbEDYwYrCxMaldvoq9hyvkFjNaiMs5ONNoYxKPPzSjf43HdnWHT7 Jv74JP+8X5YGEHqPaIgTm3LPX1TA5JwLc/VA8FKXaqF+4RDrdoBrQkBLP1yk2Ux1cw He4/DRqeYpjZ+mjxs6CxmaJfUgGXwaJDMCYs+GhhL35wsZ66DwI7ciwkwZOahik8kG Iu31DzXvHzbi8gD0KfPvb0wXW1fj0Hyv8+p4NN19KO9YdblTjiCKI5PiAit7Ls4IAy /gh112XMwrQWYIkRKDAtGUSYs9atY1N+eydNJENVGsRQyZO+R79V93XCTvl/d63IYp wcA2KTxneqmYQ== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Sebastian Reichel , Anton Vorontsov , linux-pm@vger.kernel.org Subject: [PATCH 16/27] power: remove pda_power supply driver Date: Thu, 5 Jan 2023 14:46:11 +0100 Message-Id: <20230105134622.254560-17-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134721_142369_A938A60E X-CRM114-Status: GOOD ( 17.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann This driver was used for a couple of Intel PXA and Samsung S3C24xx based PDAs, but all of those are now removed from the kernel, so the driver itself is no longer useful. Cc: Sebastian Reichel Cc: Anton Vorontsov Cc: linux-pm@vger.kernel.org Signed-off-by: Arnd Bergmann Acked-by: Sebastian Reichel --- Documentation/power/power_supply_class.rst | 4 +- arch/arm/mach-tegra/tegra.c | 1 - drivers/power/supply/Kconfig | 9 - drivers/power/supply/Makefile | 1 - drivers/power/supply/pda_power.c | 520 --------------------- include/linux/pda_power.h | 39 -- 6 files changed, 2 insertions(+), 572 deletions(-) delete mode 100644 drivers/power/supply/pda_power.c delete mode 100644 include/linux/pda_power.h diff --git a/Documentation/power/power_supply_class.rst b/Documentation/power/power_supply_class.rst index c04fabee0a58..da8e275a14ff 100644 --- a/Documentation/power/power_supply_class.rst +++ b/Documentation/power/power_supply_class.rst @@ -40,8 +40,8 @@ kind of power supply, and can process/present them to a user in consistent manner. Results for different power supplies and machines are also directly comparable. -See drivers/power/supply/ds2760_battery.c and drivers/power/supply/pda_power.c -for the example how to declare and handle attributes. +See drivers/power/supply/ds2760_battery.c for the example how to declare +and handle attributes. Units diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index ab5008f35803..9ef1dfa7b926 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 3c37f3a6431c..e2f8dfcdd2a9 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -28,15 +28,6 @@ config POWER_SUPPLY_HWMON Say 'Y' here if you want power supplies to have hwmon sysfs interface too. - -config PDA_POWER - tristate "Generic PDA/phone power driver" - depends on !S390 - help - Say Y here to enable generic power driver for PDAs and phones with - one or two external power supplies (AC/USB) connected to main and - backup batteries, and optional builtin charger. - config APM_POWER tristate "APM emulation for class batteries" depends on APM_EMULATION diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 55c1aae91d1d..8cb3c7f5c111 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -9,7 +9,6 @@ obj-$(CONFIG_POWER_SUPPLY) += power_supply.o obj-$(CONFIG_POWER_SUPPLY_HWMON) += power_supply_hwmon.o obj-$(CONFIG_GENERIC_ADC_BATTERY) += generic-adc-battery.o -obj-$(CONFIG_PDA_POWER) += pda_power.o obj-$(CONFIG_APM_POWER) += apm_power.o obj-$(CONFIG_AXP20X_POWER) += axp20x_usb_power.o obj-$(CONFIG_IP5XXX_POWER) += ip5xxx_power.o diff --git a/drivers/power/supply/pda_power.c b/drivers/power/supply/pda_power.c deleted file mode 100644 index 03a37fd6be27..000000000000 diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h deleted file mode 100644 index 2a69db4b60b7..000000000000 From patchwork Thu Jan 5 13:46:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090625 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7F4EFC3DA7A for ; Thu, 5 Jan 2023 22:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EtnnJG9EJ5KjQqaPM6ulc0PEmLO51HWnM+R+IIRAr38=; b=bg4diLgIviBN65 nG8SfmmQiT9BrhaEHDqmYrc/TNmYnJookQZYFhDhXN+ouRVxY/AghfHY5VV/2vtIse2k0zNP1uOFx K8/N1Q0DXe/fCgX99j1Gp4BK/63CDRoAWosO2piv+IUglERNYv+8y4C/bmBYGYdsb9JJqi0rGubAl hvtgVj13fQ5kMHhVagpHKOwR3NJnJfhXIVEIaxFYV+Fo8GJtSBtm6jyMcblcS4SnxG+p0C2AJTAgm 8bKvLa9FzZmyShTSIHMqXywmB/9OxkCJDlYML4D2dhfaCVW/xVJeZ7Y243R3BBGZZgsQQpgfHP1gC v6LDF19T+jVVdrr5zSWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYjR-00FbFZ-L3; Thu, 05 Jan 2023 22:29:06 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVGv-00DoIr-6r for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:47:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=7nG3YD6b7JonQFuWmuMmjBaNjy8M0aJlSyY0ujAEp0w=; b=XjCxYZZfHPxZLwk963jdgmFssK bCeNE35SsKNoh0eNX4MK3Uj60azQoz+YVyEUEcA4PcbkmxDUCrr3x9qYprKzqKKa741UygZS/uKnh gRyexQTdsHShorLx3w2G0sZQLwD7AuoDnKXFqsZWGqWnA8pbZNFMgbuIHKvYq0Xit+LcQg9eV4Ery Tl87f1uT7EzjlGRVmJK7VoIhq47aHonWdZG+heOzwR/bSDF591vYTBHypmIVf6SrcLJ9IiDLer1aR YA7VZVaSyjtuFMf4QuiBg72jw746fodFJjH44EUBHRS6h/w6ztoUP6lJecrJeUMW1W2NnC19k0S1U fnSmIpBw==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaZ-001M4E-20 for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:25 +0000 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 B5865B81AD7; Thu, 5 Jan 2023 13:47:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F52EC433F0; Thu, 5 Jan 2023 13:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926447; bh=ersO1VXXlu3ws/sJ8m/B71Z2PrStTpAMrvLMqntlN9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IK+36d/kRwJ3aZTNO18hBxJrEVM2hrs/c7qEUX0DXgR282A+y4QoY7/qf4rBjjDR2 SYQxJgcnTSqfUMu7NDmFPz1056m/L1oCy9u8UmfsVSQF+rsVlNNJGZvb1XYgBWl2SY Dt9/IDSOajFuu9+VbQ4NjRUKKrUxattoZnD97ThBnI8CIyDJP+HT6SUULW9wxQPthA OJ7fFf8ge2KDWTYZygnzfkwZK5BkIMYg+lHgzm8hl4RmnijCgBwpXjQSo/UC7H7nUs aS4Rd7HMKSfPs7oilNGoLprbtHsT1O/pHEOPNZhCfrLQwlD5ZOy2SP7cUAty4tWi8X Xa50CLLeYpxKQ== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Alessandro Zummo , Alexandre Belloni , linux-rtc@vger.kernel.org Subject: [PATCH 17/27] rtc: remove v3020 driver Date: Thu, 5 Jan 2023 14:46:12 +0100 Message-Id: <20230105134622.254560-18-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134723_763145_CCA47572 X-CRM114-Status: GOOD ( 17.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The v3020 RTC driver was exclusively used by the now removed cm-x300.c machine. Cc: Alessandro Zummo Cc: Alexandre Belloni Cc: linux-kernel@vger.kernel.org Cc: linux-rtc@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/rtc/Kconfig | 9 - drivers/rtc/Makefile | 1 - drivers/rtc/rtc-v3020.c | 369 ------------------------ include/linux/platform_data/rtc-v3020.h | 41 --- 4 files changed, 420 deletions(-) delete mode 100644 drivers/rtc/rtc-v3020.c delete mode 100644 include/linux/platform_data/rtc-v3020.h diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 530b4a94ed42..2ba72de0fa47 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -1212,15 +1212,6 @@ config RTC_DRV_RP5C01 This driver can also be built as a module. If so, the module will be called rtc-rp5c01. -config RTC_DRV_V3020 - tristate "EM Microelectronic V3020" - help - If you say yes here you will get support for the - EM Microelectronic v3020 RTC chip. - - This driver can also be built as a module. If so, the module - will be called rtc-v3020. - config RTC_DRV_GAMECUBE tristate "Nintendo GameCube, Wii and Wii U RTC" depends on GAMECUBE || WII || COMPILE_TEST diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index d3c042dcbc73..59eb30289335 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -176,7 +176,6 @@ obj-$(CONFIG_RTC_DRV_TI_K3) += rtc-ti-k3.o obj-$(CONFIG_RTC_DRV_TPS6586X) += rtc-tps6586x.o obj-$(CONFIG_RTC_DRV_TPS65910) += rtc-tps65910.o obj-$(CONFIG_RTC_DRV_TWL4030) += rtc-twl.o -obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o obj-$(CONFIG_RTC_DRV_VT8500) += rtc-vt8500.o obj-$(CONFIG_RTC_DRV_WILCO_EC) += rtc-wilco-ec.o obj-$(CONFIG_RTC_DRV_WM831X) += rtc-wm831x.o diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c deleted file mode 100644 index 4e8341c49f51..000000000000 diff --git a/include/linux/platform_data/rtc-v3020.h b/include/linux/platform_data/rtc-v3020.h deleted file mode 100644 index e55d82cebf80..000000000000 From patchwork Thu Jan 5 13:46:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090609 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B223DC3DA7A for ; Thu, 5 Jan 2023 22:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oDCcOan7Foy+W7iGH4+IZFg7SpWCc0JNZzPrRqPx1/I=; b=Txo1M7WIdeNV/9 vqg+WwUVgRy8RmpRPcslqUmLrsqPBMpOC8p11Nb6YGLJPDqicbUsSiqUk3Bl9S8jbiBhmh7d7yRBV NBnpqVQDNX/6nMIAgcZCA+ab02VFFFkX6J0qr6+jR4atsud3FOhDbch2wncfCgHulpOxU9hlGGf38 8DNgxGC+dgSaNmC6CwmxyhWBJPSIGIB1G87x3+genKbAyrf1FxOP6Oa0PRgRbe2wVOxrUpk/UIHK8 FsHvlmxTX+Fd9d0kXq9lGfCLTEIHUDEQMwRj3kCxhxAyPfJRsKX0SmDvzd9pcgk4Kikrv6lIpBSh/ V5rmNOVs9D3Ib2Nku4hA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYd3-00FXud-SN; Thu, 05 Jan 2023 22:22:30 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVF6-00DnLi-3J for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:45:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Z2h/8hu9lv8+v+9oNBFwsgT07W5waAbL7e8rT4VXIJo=; b=RO2RZF+6e/iYa2nSX6CLwER41D zMgtOz+Mh7WCj/jInf6nW0q7mD+i+yaSfBI9ytpLuq/Y0YmM0vL89DaHxeX46M3RRFcjOXC1zrxHx XxXJWcxd2pH+wyVc44PbFTlNzT7RxiYDYtEorMKdsDgE3KHW6R6jm/h0+KPvQd38bUxxk7hcXrtfk /4ytpJqRdmrDGqaqMDYJ9MaX6q3Q6Tolr4whlxb+7BQcXipcXX7jb7vNSXeV00mqbQU8up7fYyjn8 psQmlpuj3087jOdt8GiMTvy2qEyFh5tZlro4A6ix4HZAiIv65GbpOqIXn5A0EF2zG2MxjvSIK6JUH oPGCui0A==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQac-001M4S-0W for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:28 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id A708561A8E; Thu, 5 Jan 2023 13:47:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA95DC433D2; Thu, 5 Jan 2023 13:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926450; bh=d2eMyq0HGhLsx1LltDWv2G7RIn4/aKrP4wiNiXXsPEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BfWqQLHFhgoo16rgfAP2Sv9vMmx2kHvNdbYjrUOhNYKIvudziRsWab1f8x+tR94IE BXDa0f/HbhRq1HFpeTqNVHelI4izq/TNrzBjnGq5GcQI7EgeoSD9Z+xC3Z9cRQ9Hw9 Hs9cfJbKZSwV5Pezpru3M7hhssThbYqLSE4Ytw2N25OGK0Kq/CUOWOqhh7k4jEVbU4 9Kg52uuO/3L3Qe7KEW/uL91nMnGRuhEuj4JAgTqhoY1x1TT3+x5C/MfGMriVeCwI0E Z64laSpnN+eDO/TlyU2kP/PtNe5kZFj2muHuMu0efJirCpFkCsA942Dwi5N5uCsFZn DHFFjU9ydpd3A== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Lee Jones , Wolfram Sang , linux-mmc@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH 18/27] mfd: remove toshiba tmio drivers Date: Thu, 5 Jan 2023 14:46:13 +0100 Message-Id: <20230105134622.254560-19-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134727_011932_389B56EF X-CRM114-Status: GOOD ( 16.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann Four separate mfd drivers are in the "tmio" family, and all of them were used in now-removed PXA machines (eseries, tosa, and hx4700), so the mfd drivers and all its children can be removed as well. Cc: Lee Jones Cc: Wolfram Sang Cc: linux-kernel@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/mfd/Kconfig | 38 -- drivers/mfd/Makefile | 4 - drivers/mfd/asic3.c | 1071 ---------------------------------- drivers/mfd/t7l66xb.c | 427 -------------- drivers/mfd/tc6387xb.c | 228 -------- drivers/mfd/tc6393xb.c | 907 ---------------------------- drivers/mfd/tmio_core.c | 70 --- include/linux/mfd/asic3.h | 313 ---------- include/linux/mfd/t7l66xb.h | 29 - include/linux/mfd/tc6387xb.h | 19 - include/linux/mfd/tc6393xb.h | 53 -- include/linux/mfd/tmio.h | 5 - 12 files changed, 3164 deletions(-) delete mode 100644 drivers/mfd/asic3.c delete mode 100644 drivers/mfd/t7l66xb.c delete mode 100644 drivers/mfd/tc6387xb.c delete mode 100644 drivers/mfd/tc6393xb.c delete mode 100644 drivers/mfd/tmio_core.c delete mode 100644 include/linux/mfd/asic3.h delete mode 100644 include/linux/mfd/t7l66xb.h delete mode 100644 include/linux/mfd/tc6387xb.h delete mode 100644 include/linux/mfd/tc6393xb.h diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 2cd06e63e32f..da57ebf22630 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -300,15 +300,6 @@ config MFD_CS47L92 help Support for Cirrus Logic CS42L92, CS47L92 and CS47L93 Smart Codecs -config MFD_ASIC3 - bool "Compaq ASIC3" - depends on GPIOLIB - depends on ARM || COMPILE_TEST - select MFD_CORE - help - This driver supports the ASIC3 multifunction chip found on many - PDAs (mainly iPAQ and HTC based ones) - config PMIC_DA903X bool "Dialog Semiconductor DA9030/DA9034 PMIC Support" depends on I2C=y @@ -1795,35 +1786,6 @@ config MFD_TC3589X additional drivers must be enabled in order to use the functionality of the device. -config MFD_TMIO - bool - default n - -config MFD_T7L66XB - bool "Toshiba T7L66XB" - depends on ARM && HAVE_CLK - select MFD_CORE - select MFD_TMIO - help - Support for Toshiba Mobile IO Controller T7L66XB - -config MFD_TC6387XB - bool "Toshiba TC6387XB" - depends on ARM && HAVE_CLK - select MFD_CORE - select MFD_TMIO - help - Support for Toshiba Mobile IO Controller TC6387XB - -config MFD_TC6393XB - bool "Toshiba TC6393XB" - depends on ARM && HAVE_CLK - select GPIOLIB - select MFD_CORE - select MFD_TMIO - help - Support for Toshiba Mobile IO Controller TC6393XB - config MFD_TQMX86 tristate "TQ-Systems IO controller TQMX86" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 457471478a93..9ba9d711c492 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -9,7 +9,6 @@ obj-$(CONFIG_MFD_88PM800) += 88pm800.o 88pm80x.o obj-$(CONFIG_MFD_88PM805) += 88pm805.o 88pm80x.o obj-$(CONFIG_MFD_ACT8945A) += act8945a.o obj-$(CONFIG_MFD_SM501) += sm501.o -obj-$(CONFIG_MFD_ASIC3) += asic3.o tmio_core.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835-pm.o obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o @@ -30,9 +29,6 @@ obj-$(CONFIG_STMPE_I2C) += stmpe-i2c.o obj-$(CONFIG_STMPE_SPI) += stmpe-spi.o obj-$(CONFIG_MFD_SUN6I_PRCM) += sun6i-prcm.o obj-$(CONFIG_MFD_TC3589X) += tc3589x.o -obj-$(CONFIG_MFD_T7L66XB) += t7l66xb.o tmio_core.o -obj-$(CONFIG_MFD_TC6387XB) += tc6387xb.o tmio_core.o -obj-$(CONFIG_MFD_TC6393XB) += tc6393xb.o tmio_core.o obj-$(CONFIG_MFD_TQMX86) += tqmx86.o obj-$(CONFIG_MFD_LOCHNAGAR) += lochnagar-i2c.o diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c deleted file mode 100644 index 4fb7e35eb5ed..000000000000 diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c deleted file mode 100644 index 1d9d1d38d068..000000000000 diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c deleted file mode 100644 index 5392da6ba7b0..000000000000 diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c deleted file mode 100644 index 997bb8b5881d..000000000000 diff --git a/drivers/mfd/tmio_core.c b/drivers/mfd/tmio_core.c deleted file mode 100644 index 7ee873551482..000000000000 diff --git a/include/linux/mfd/asic3.h b/include/linux/mfd/asic3.h deleted file mode 100644 index 61e686dbaa74..000000000000 diff --git a/include/linux/mfd/t7l66xb.h b/include/linux/mfd/t7l66xb.h deleted file mode 100644 index ae3e7a5c5219..000000000000 diff --git a/include/linux/mfd/tc6387xb.h b/include/linux/mfd/tc6387xb.h deleted file mode 100644 index aacf1dcc86b9..000000000000 diff --git a/include/linux/mfd/tc6393xb.h b/include/linux/mfd/tc6393xb.h deleted file mode 100644 index d17807f2d0c9..000000000000 diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index e8bf90281ba0..eace8ea6cda0 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -84,11 +84,6 @@ /* Some controllers have a CBSY bit */ #define TMIO_MMC_HAVE_CBSY BIT(11) -int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base); -int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base); -void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state); -void tmio_core_mmc_clk_div(void __iomem *cnf, int shift, int state); - struct dma_chan; /* From patchwork Thu Jan 5 13:46:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090502 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 96BA6C3DA7A for ; Thu, 5 Jan 2023 21:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JLlzIljY/E9FGgELvLqsCK3Y+t8kkPQLtua+mugX/38=; b=wtNX93rlZk49+g swD99kuDqDBpzBiQCAsnTHdj4W731V+8lQvB3J2GRbBg5PVbGcHl5en2gmivQbaBXAzm2bhh6Ts31 OHq5q8jw3NARp06dV0OgVHWuJGnVK2zYKc7zfgdhSyWU2J+LeWy2LezeTJL8FgXPE0vsCFfF25vBG XOKlsb5SGDfXhGvmZv9AuuvObiL4qhT7XKIECjcD077hnbihG2ZMAs8kCCs9hrhdkeSUtc9Eebrhl 5TNE9l8Jx55F0fx2EUqtVX8SRm56Y8shrPkHDNZjiPxHQU6fuGRLgoPHfOT5Lfj2lAe/TCz/TcSx2 bxBLXkkJlFGizoMsRL9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDXnB-00F6d9-Mo; Thu, 05 Jan 2023 21:28:54 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDUx2-00DZVo-EL for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:26:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=czCkAhk5u7C2XRJcmg6po4mCwDDFwOaOEA+Ja4GTFjs=; b=EntqSZJsbkLbPhYTN4dURuKV/a QbikmrEJGCiU7DPN/Omjq0R2DfkIirXsCRH7dECfyxk+LmIKmfy/onvni77awyDtDRri1nuwrRyxb XYasoe0n/CVN49ETejShcCjEKSnZG0W6zvs5p7FfsFvh3SvlLz1SfKgqE2wtMNoso/dLuK57T8ALr /YB7gNiwY5G5m31uSlUNmjosKMpSNqo5U2/WiBYt8rpmLA0s4tVIxqThV7dWjzPlDAKOHsOPHotCF +fFEYQ+iAx5KECrGJCKaaElj9L1/qD6y/BGHhrXd/pBb9ZYhc8kDow36KB3CXGZjmnP4Lkzwod6uP LNb6E6hQ==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaf-001M4z-2s for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:32 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 940B861AC6; Thu, 5 Jan 2023 13:47:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E092C433F0; Thu, 5 Jan 2023 13:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926453; bh=/FS8fBmu6pkebaZatQp3ZoSENMWZyiaJpwoCDpO4hWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jm+NeQGSKbwVMEHk1yxqRUvzXRIbut8bFNcg4c6VdmR+pP28NrpHrdFqm6pn/OZQN 7X3Re7172JGOtRjUmutdHJ5nC6UL/H2z9BSBK0GSjllTTYb3BXOUurEULihRrDz17f LkXNElhBjKjYQZcWxsGC0GmA6W1MtGKqqCcwULz6p7MBV78UkZYtKlyVaADSy9dMHH LL6/d05bpTusmbbmzk3/w88r0oAlfG8BjLpFpQeKl9a0/EhjpVmGXTA/kjJzrOs/vA t2b0DVschHyxCL5qkMEPsWUv21IA7UOogug/q0dKML1/uQ/Qos44YVMSXpzLSxtIF2 3MWFFvQ3GS0YQ== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Linus Walleij , Bartosz Golaszewski , Dmitry Torokhov , Lee Jones , Jaroslav Kysela , Takashi Iwai , Marek Vasut , linux-gpio@vger.kernel.org, linux-input@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 19/27] mfd: remove ucb1400 support Date: Thu, 5 Jan 2023 14:46:14 +0100 Message-Id: <20230105134622.254560-20-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134730_349375_DD5D38FA X-CRM114-Status: GOOD ( 26.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The ucb1400 MFD driver and its gpio and touchscreen child drivers were only used on a few PXA machines that were unused for a while and are now removed. Removing these leaves the AC97 support as ALSA specific, no other drivers are now connected through this interface. Cc: Linus Walleij Cc: Bartosz Golaszewski Cc: Dmitry Torokhov Cc: Lee Jones Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Marek Vasut Cc: linux-kernel@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: linux-input@vger.kernel.org Cc: alsa-devel@alsa-project.org Signed-off-by: Arnd Bergmann Acked-by: Lee Jones --- drivers/gpio/Kconfig | 7 - drivers/gpio/Makefile | 1 - drivers/gpio/gpio-ucb1400.c | 85 ----- drivers/input/touchscreen/Kconfig | 16 - drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/ucb1400_ts.c | 458 ------------------------- drivers/mfd/Kconfig | 11 - drivers/mfd/Makefile | 1 - drivers/mfd/ucb1400_core.c | 158 --------- include/linux/ucb1400.h | 160 --------- sound/Kconfig | 1 - sound/pci/ac97/ac97_codec.c | 1 - sound/pci/ac97/ac97_patch.c | 40 --- 13 files changed, 940 deletions(-) delete mode 100644 drivers/gpio/gpio-ucb1400.c delete mode 100644 drivers/input/touchscreen/ucb1400_ts.c delete mode 100644 drivers/mfd/ucb1400_core.c delete mode 100644 include/linux/ucb1400.h diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 0148553790eb..df2dfbb2601e 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1428,13 +1428,6 @@ config GPIO_TWL6040 Say yes here to access the GPO signals of twl6040 audio chip from Texas Instruments. -config GPIO_UCB1400 - tristate "Philips UCB1400 GPIO" - depends on UCB1400_CORE - help - This enables support for the Philips UCB1400 GPIO pins. - The UCB1400 is an AC97 audio codec. - config GPIO_WHISKEY_COVE tristate "GPIO support for Whiskey Cove PMIC" depends on (X86 || COMPILE_TEST) && INTEL_SOC_PMIC_BXTWC diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 59ac21054261..c048ba003367 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -165,7 +165,6 @@ obj-$(CONFIG_GPIO_TS4900) += gpio-ts4900.o obj-$(CONFIG_GPIO_TS5500) += gpio-ts5500.o obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o obj-$(CONFIG_GPIO_TWL6040) += gpio-twl6040.o -obj-$(CONFIG_GPIO_UCB1400) += gpio-ucb1400.o obj-$(CONFIG_GPIO_UNIPHIER) += gpio-uniphier.o obj-$(CONFIG_GPIO_VF610) += gpio-vf610.o obj-$(CONFIG_GPIO_VIPERBOARD) += gpio-viperboard.o diff --git a/drivers/gpio/gpio-ucb1400.c b/drivers/gpio/gpio-ucb1400.c deleted file mode 100644 index 676adf1f198a..000000000000 diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index ca00f55eaf45..1a2049b336a6 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -827,22 +827,6 @@ config TOUCHSCREEN_TI_AM335X_TSC To compile this driver as a module, choose M here: the module will be called ti_am335x_tsc. -config TOUCHSCREEN_UCB1400 - tristate "Philips UCB1400 touchscreen" - depends on AC97_BUS - depends on UCB1400_CORE - help - This enables support for the Philips UCB1400 touchscreen interface. - The UCB1400 is an AC97 audio codec. The touchscreen interface - will be initialized only after the ALSA subsystem has been - brought up and the UCB1400 detected. You therefore have to - configure ALSA support as well (either built-in or modular, - independently of whether this driver is itself built-in or - modular) for this driver to work. - - To compile this driver as a module, choose M here: the - module will be called ucb1400_ts. - config TOUCHSCREEN_PIXCIR tristate "PIXCIR I2C touchscreens" depends on I2C diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 7053fede594e..f2fd28cc34a6 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -97,7 +97,6 @@ obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o tsc2007-y := tsc2007_core.o tsc2007-$(CONFIG_TOUCHSCREEN_TSC2007_IIO) += tsc2007_iio.o obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o -obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o obj-$(CONFIG_TOUCHSCREEN_WACOM_I2C) += wacom_i2c.o obj-$(CONFIG_TOUCHSCREEN_WDT87XX_I2C) += wdt87xx_i2c.o diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c deleted file mode 100644 index dfd3b35590c3..000000000000 diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index da57ebf22630..5ea07a65f150 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1071,17 +1071,6 @@ config PCF50633_GPIO Say yes here if you want to include support GPIO for pins on the PCF50633 chip. -config UCB1400_CORE - tristate "Philips UCB1400 Core driver" - depends on AC97_BUS - depends on GPIOLIB - help - This enables support for the Philips UCB1400 core functions. - The UCB1400 is an AC97 audio codec. - - To compile this driver as a module, choose M here: the - module will be called ucb1400_core. - config MFD_PM8XXX tristate "Qualcomm PM8xxx PMIC chips driver" depends on (ARM || HEXAGON || COMPILE_TEST) diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 9ba9d711c492..4969ea6e24f1 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -127,7 +127,6 @@ obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00-ts.o ifeq ($(CONFIG_SA1100_ASSABET),y) obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o endif -obj-$(CONFIG_UCB1400_CORE) += ucb1400_core.o obj-$(CONFIG_PMIC_DA903X) += da903x.o diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c deleted file mode 100644 index ac1d18039568..000000000000 diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h deleted file mode 100644 index 2516082cd3a9..000000000000 diff --git a/sound/Kconfig b/sound/Kconfig index e56d96d2b11c..0ddfb717b81d 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -107,7 +107,6 @@ endif # !UML endif # SOUND -# AC97_BUS is used from both sound and ucb1400 config AC97_BUS tristate help diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index ff685321f1a1..9afc5906d662 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -152,7 +152,6 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { { 0x4e534300, 0xffffffff, "LM4540,43,45,46,48", NULL, NULL }, // only guess --jk { 0x4e534331, 0xffffffff, "LM4549", NULL, NULL }, { 0x4e534350, 0xffffffff, "LM4550", patch_lm4550, NULL }, // volume wrap fix -{ 0x50534304, 0xffffffff, "UCB1400", patch_ucb1400, NULL }, { 0x53494c20, 0xffffffe0, "Si3036,8", mpatch_si3036, mpatch_si3036, AC97_MODEM_PATCH }, { 0x53544d02, 0xffffffff, "ST7597", NULL, NULL }, { 0x54524102, 0xffffffff, "TR28022", NULL, NULL }, diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 025c1666c1fc..4b5f33de70d5 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -3937,43 +3937,3 @@ static int patch_lm4550(struct snd_ac97 *ac97) ac97->res_table = lm4550_restbl; return 0; } - -/* - * UCB1400 codec (http://www.semiconductors.philips.com/acrobat_download/datasheets/UCB1400-02.pdf) - */ -static const struct snd_kcontrol_new snd_ac97_controls_ucb1400[] = { -/* enable/disable headphone driver which allows direct connection to - stereo headphone without the use of external DC blocking - capacitors */ -AC97_SINGLE("Headphone Driver", 0x6a, 6, 1, 0), -/* Filter used to compensate the DC offset is added in the ADC to remove idle - tones from the audio band. */ -AC97_SINGLE("DC Filter", 0x6a, 4, 1, 0), -/* Control smart-low-power mode feature. Allows automatic power down - of unused blocks in the ADC analog front end and the PLL. */ -AC97_SINGLE("Smart Low Power Mode", 0x6c, 4, 3, 0), -}; - -static int patch_ucb1400_specific(struct snd_ac97 * ac97) -{ - int idx, err; - for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_ucb1400); idx++) { - err = snd_ctl_add(ac97->bus->card, snd_ctl_new1(&snd_ac97_controls_ucb1400[idx], ac97)); - if (err < 0) - return err; - } - return 0; -} - -static const struct snd_ac97_build_ops patch_ucb1400_ops = { - .build_specific = patch_ucb1400_specific, -}; - -static int patch_ucb1400(struct snd_ac97 * ac97) -{ - ac97->build_ops = &patch_ucb1400_ops; - /* enable headphone driver and smart low power mode by default */ - snd_ac97_write_cache(ac97, 0x6a, 0x0050); - snd_ac97_write_cache(ac97, 0x6c, 0x0030); - return 0; -} From patchwork Thu Jan 5 13:46:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090514 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CF4BAC3DA7A for ; Thu, 5 Jan 2023 21:43:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2B4T5K0zB32cL5G18IUyiHLNQR2Bbk7cSX7gb0zEseQ=; b=i3ek1BIlUVlZNt oyq9YM+rNjO5SaeMZ1dqmpOo7Po6XLxs1X1bUkEE9I/PDlXQ+QBsDGZqr/cv1h3hSn3sAj3SD2MOZ qC5kvZ8xmqzvqsp2lRBrhFA+pkUmKPRQ2j9VeTOq22KPbFTZDbQyzS2p40s6YKFh8KJHyrNZfkbo3 G8Bzw5u9I+Xwd6EvsPafeTNig196QJIQrWT849sV3hG7vhEe8Telc1TBWzbMhvMbtnV1AYCpREDZc /dqxSkRCif7XM2uoYEeyjfx28BGMASBhvefrwNf++/eqFCUM9NhbWkpiWE4NqKrRRYxZiEsasFbfr gPX3QnfUlBpAph6xyoTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDXzw-00FDLd-Kq; Thu, 05 Jan 2023 21:42:05 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDV19-00DciS-Ck; Thu, 05 Jan 2023 18:31:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=kRXVuRpvqaphclmK+hkq1NkqgK+M2BOh8YfObS2FkKM=; b=keeb5/S/psFsc1D7GkVW39Bw3F Y/j71xs2xKdH1+qTrPfcqJRXD0fXgqrtGvy8+1ztkX0+Jc0t1CkztYkxzc9CAWkaDaYnvro3ro4DA TPudwrpu4RxdZY1sbDfi30U63gfBpvRqBpZK44Y32TamlUQVBqOIafGypMqmjP58PoufitkLGWe9D 1d852uFRyhJuJV21bBbksJQU0u0T8a4FH7G+hYeAk9hfSsaN7XYIINR47fyDo5pIbNH9PNqISVBTl Cf7mWzaJgUUEd5we8CDJKAvkcc4cmF2zYoCb0k4E45gOJ9fixUgUDqC66H7eM9fdPCX0Lfx5mvrw1 mTAYutPQ==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQai-001M5b-1S; Thu, 05 Jan 2023 13:47:34 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 2E32B61A8A; Thu, 5 Jan 2023 13:47:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D14FC433F2; Thu, 5 Jan 2023 13:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926456; bh=g5Ktac+x1WGnROCjyNkddZbbPKWiUR9G99wt906iw8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gViws4OEe4zM6qcAS0UnXS2+/1WszliXtvKxww8VZLvGh98sQBsfici0N9eZxla9K ecWwuQNy64kkQ5m+503yV7Mr4GfjC4lRogui6olzhYA8eGwpnH8YVg1pd0gqbszlsK Ia7XTX3rFDgkez3DJmAIqM/9c3XSNHvYrqHUFXFxs86MhozWMtPDAuGv2HeatyVSKa bZjXe7swuB2k1P4RI9bAHLaI6xPVBA/E44hTVo57SmRpmuR0VfV6flGWJ9FqwaGJrl mCsvt57IhfFJmTHiyTgW0ZxyaGRPbsG+TNzTgEvFCXI+KvB8tEvmaeaX802mU9+d/R fi3IctlTmQaqA== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , linux-mtd@lists.infradead.org Subject: [PATCH 20/27] mtd: remove tmio_nand driver Date: Thu, 5 Jan 2023 14:46:15 +0100 Message-Id: <20230105134622.254560-21-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134732_857027_79960092 X-CRM114-Status: GOOD ( 15.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann With the TMIO MFD drivers gone, the NAND support is also obsolete and can be removed. Cc: Miquel Raynal Cc: Richard Weinberger Cc: Vignesh Raghavendra Cc: linux-mtd@lists.infradead.org Signed-off-by: Arnd Bergmann --- drivers/mtd/nand/raw/Kconfig | 7 - drivers/mtd/nand/raw/Makefile | 1 - drivers/mtd/nand/raw/tmio_nand.c | 533 ------------------------------- 3 files changed, 541 deletions(-) delete mode 100644 drivers/mtd/nand/raw/tmio_nand.c diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 048b1c8f08ee..170f1185ddc4 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -193,13 +193,6 @@ config MTD_NAND_PASEMI Enables support for NAND Flash interface on PA Semi PWRficient based boards -config MTD_NAND_TMIO - tristate "Toshiba Mobile IO NAND controller" - depends on MFD_TMIO - help - Support for NAND flash connected to a Toshiba Mobile IO - Controller in some PDAs, including the Sharp SL6000x. - source "drivers/mtd/nand/raw/brcmnand/Kconfig" config MTD_NAND_BCM47XXNFLASH diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index fa1d00120310..917cdfb815b9 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -23,7 +23,6 @@ omap2_nand-objs := omap2.o obj-$(CONFIG_MTD_NAND_OMAP2) += omap2_nand.o obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD) += omap_elm.o obj-$(CONFIG_MTD_NAND_MARVELL) += marvell_nand.o -obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o diff --git a/drivers/mtd/nand/raw/tmio_nand.c b/drivers/mtd/nand/raw/tmio_nand.c deleted file mode 100644 index 8f1a42bf199c..000000000000 From patchwork Thu Jan 5 13:46:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090639 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E45E6C4708E for ; Thu, 5 Jan 2023 22:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KXsEftup5TDV3ekRT3sPjv/aTJnEm4TRbyVjFdE9/cw=; b=gFo6ZXPr8qNiCr Q1iOamSwPeH/sCrMyzUjwEEo7h+a40OtGGBilZ6svNuMAg2lScvN0nJBQzyr/+LZw+XfbBBU7jDkT r1QDuNX0FxAYVq1IP6GNadno3qHKYGz9mwb7ZOc3Oej0RTQKzPPAUnoiFq3ObVk+34zeJXkKUsO+F 1957GaEZKu+QAnLFufFIPLo2P7DBnirkMv0ROdAAhawA+753ajNrbsKfJlEUh9t7X5kvsMknCbuO7 Tk4pZoG5cHVgBSobuRxjvC5uR1hwyqj2r0k68Dh/JZ2EFJ5D6n3r4JVTy5/DRg+YiVUkVFAJnGLFd iP6gTCJPPHQ/3wJpas7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYuS-00FhSe-Io; Thu, 05 Jan 2023 22:40:29 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVKK-00DqAx-CL for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:50:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=MTrCUT+nzDA1MQ3UVfC4rDeL0MW+ObJ0cHFx3+YD5Cs=; b=ZlxYuadIWmeFX57QGOnRb7ipPs 9NHbkHRIgzMfBmaSlQ/LrLiTAhQYDtZqQIIfmZyV6TkXBSgk8uZtafVWjFMtYeOMYZ9gJTm5AJzVq /vGGhkpavRsthFqALmnW7dZYT3khNJ8srt1DkkTnnTYWxQriml8j8kDxBmJutEkoNNWlupGlR5nNj BKnPH5BxdJ1vMvMR8fn9uJ6xQkpWbiuQovQZ9pC1dP5afShYDiPDq+doaVkA/4ReuSJIArq5pCvvJ 0acAVXgHZ/pM7gy7FkNdPjN28sPvkbCenZwXh9hTSNTkZUpsJz+C689fJDI/AfrTS96df7nQESQ/l 4+e1xVhw==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQak-001M67-2R for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:36 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id A32DB61A8E; Thu, 5 Jan 2023 13:47:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B6BBC433D2; Thu, 5 Jan 2023 13:47:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926459; bh=0C2s8Htv8j/a9ZgxMURdUzKBZYXWV4XjhbJ2Xum7PQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TCVjnh5Np8xRhW7xrU3mVDHXFFRFK058PFVL+U8xsvba7kysjoSsO3PUkwWSRNSn+ opIXXvDuuvK5nCAKRfjJrKhzmp0yHDxRZIkspXbwxrfnC64lfDD+iDMG+ZImTv/Kcl HGvtsbJKaUGYSoY06qI02gaptaI+iP3wYqvocYBkq1puT+uYaQ+v+YUcYlOveQ5Xzi g+/H+iiLJIXDhk+3yPPfXBAQfPAq2iOLK2SQBEGJhYxz0GNDl6rAZlJoMwHMtZ++4q gxOShUc2KeTcOh8FvoEJdmlFaoTfn0PvMrGgz+g39JZEqOn7iYLiMqc9DUd2p7Au64 QuptAdBYvDekg== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Ian Molton , Ulf Hansson , Wolfram Sang , linux-mmc@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH 21/27] mmc: remove tmio_mmc driver Date: Thu, 5 Jan 2023 14:46:16 +0100 Message-Id: <20230105134622.254560-22-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134734_953840_6230C8ED X-CRM114-Status: GOOD ( 15.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann With the TMIO MFD support gone, the corresponding MMC host driver can be removed as well. The remaining tmio_mmc_core module however is still used by both the Renesas and Socionext host drivers. Cc: Ian Molton Cc: Ulf Hansson Cc: Wolfram Sang Cc: linux-mmc@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org Signed-off-by: Arnd Bergmann Acked-by: Wolfram Sang Acked-by: Ulf Hansson --- drivers/mmc/host/Kconfig | 8 -- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/tmio_mmc.c | 227 ------------------------------------ 3 files changed, 236 deletions(-) delete mode 100644 drivers/mmc/host/tmio_mmc.c diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index f0456ad4b597..e1b88b51cc80 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -655,14 +655,6 @@ config MMC_SDHCI_SPRD config MMC_TMIO_CORE tristate -config MMC_TMIO - tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support" - depends on MFD_TMIO || MFD_ASIC3 || COMPILE_TEST - select MMC_TMIO_CORE - help - This provides support for the SD/MMC cell found in TC6393XB, - T7L66XB and also HTC ASIC3 - config MMC_SDHI tristate "Renesas SDHI SD/SDIO controller support" depends on SUPERH || ARCH_RENESAS || COMPILE_TEST diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 063d87764966..b498c17cd124 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -35,7 +35,6 @@ obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o obj-$(CONFIG_MMC_SPI) += mmc_spi.o obj-$(CONFIG_MMC_SPI) += of_mmc_spi.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o -obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_core.o obj-$(CONFIG_MMC_SDHI_SYS_DMAC) += renesas_sdhi_sys_dmac.o diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c deleted file mode 100644 index 53a2ad9a24b8..000000000000 From patchwork Thu Jan 5 13:46:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090641 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E750AC3DA7A for ; Thu, 5 Jan 2023 22:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=S0LPCTBdVEB/gUfSJLQS2k8Qrh0pnXdugfjITr5HwC8=; b=xKehaEYqfdui9Q UOBlFdhS+OGNEK5/4h3thlgbnY57pZ+WP9tqUOhAevx7oP8+2x+CTn8u4RJfhJthbU3ZpAgzTR6zO DVtQmKBvo5oIcQBV0Vq1Gy0Z6HVMCoL6V64g8msi654mPs20Qvixjd2a/Yt91RvIercwFyecsHRRT WoQXOH725ouenJbYLb8hdUFINeAxRi6cEYFuu6Y05whydH0tys3BdPpNCMaNgtXRAhbsq0+z+khAF Vv+J7si+jGyWXd9vHzMsLG/Kp9ZtogcKdii+jIvmYibsP4FZPYAU026JzYfe0YJIxzzR99ihKRbla tLeD690YYrB0nXCnvS1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYxb-00FjKq-Pd; Thu, 05 Jan 2023 22:43:44 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVLx-00Dr0f-H8 for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:52:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=rNruCxgaXYOp/9N0O+2c7y//RgPC4kk89Oi9S6VGjgE=; b=kNOQ0sZzIE9hQOQGwvoXc9x1gu aJIlBsD8qRA3BWZEkMQkBk8QPInHY5Tp5xUxxUCF97VCESmYUSjTEA0EZnGtsLw2vh5DmSpOpawHE 9XQGl8WEjDB024ph010dcg5SYt9VB6s38B9jWXpGr/1h0AowgOMX5eslK04xZDDkvr1gaYqPu6X7k 80LKpwbUXuM1P3NUjJ/XkPNlRRi81Y+B6d5SZLCfrNMTR2Y2Ru590uEtXvVhJpbQRIgBs9SNNbc1+ 8Saa87F6AvP3hEdd33SPHGDpVcYIO/QDQYki6HlModHEtvW5dZUTUEFu/4ilJytKDxhQREQTjChZu alcJErww==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQan-001M6s-0N for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:39 +0000 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 7343BB81AEF; Thu, 5 Jan 2023 13:47:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E76EEC4339E; Thu, 5 Jan 2023 13:47:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926462; bh=XuR37xXrcd0/TuJKu14bocihydtY8dKg7n2lIjRAEQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gWHliiv7BJ1D6fbS5sffYcy54TkQVc1hIWKgdDAM10KEQ+3rd/ZElK61AfgX4U3iE 2lNh/DSH8aKPjOiz8+IlbNZZnhCID9xY8y2lcN4UF81DqCyIz9Bs3AsbT77WFTdHr/ 4c8N6GoQuDxqD+WLd69cuKCcDoE9y6stdYtrJD12WLbf1k32yRJ0zFUd41vSQRLOjC bNB+0/FE6fD/VJIi4lUxNFTjI5fIBUt1rd6VUMvLP07v/alzNzd8As/yEIsUWTVbM3 Z6RAnwwJB0OqQB8N0WyC6Cv7wLCbYdmcH1U2y4aAWoM7YOdnBYFlRsZP/EDpl+xUTQ hFXWYUrex7MGw== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Helge Deller , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 22/27] fbdev: remove tmiofb driver Date: Thu, 5 Jan 2023 14:46:17 +0100 Message-Id: <20230105134622.254560-23-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134737_333953_9AF84C91 X-CRM114-Status: GOOD ( 16.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann With the TMIO MFD support removed, the framebuffer driver can be removed as well. Cc: Helge Deller Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Arnd Bergmann Acked-by: Helge Deller --- drivers/video/fbdev/Kconfig | 22 - drivers/video/fbdev/Makefile | 1 - drivers/video/fbdev/tmiofb.c | 1040 ---------------------------------- 3 files changed, 1063 deletions(-) delete mode 100644 drivers/video/fbdev/tmiofb.c diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 28febf400666..3152f1a06a39 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -1871,28 +1871,6 @@ config FB_SH_MOBILE_LCDC help Frame buffer driver for the on-chip SH-Mobile LCD controller. -config FB_TMIO - tristate "Toshiba Mobile IO FrameBuffer support" - depends on FB && (MFD_TMIO || COMPILE_TEST) - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - Frame buffer driver for the Toshiba Mobile IO integrated as found - on the Sharp SL-6000 series - - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called tmiofb. If you want to compile it as a module, - say M here and read . - - If unsure, say N. - -config FB_TMIO_ACCELL - bool "tmiofb acceleration" - depends on FB_TMIO - default y - config FB_S3C tristate "Samsung S3C framebuffer support" depends on FB && HAVE_CLK && HAS_IOMEM diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index 1bb870b98848..e5206c3331d6 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -85,7 +85,6 @@ obj-$(CONFIG_FB_PXA168) += pxa168fb.o obj-$(CONFIG_PXA3XX_GCU) += pxa3xx-gcu.o obj-$(CONFIG_MMP_DISP) += mmp/ obj-$(CONFIG_FB_W100) += w100fb.o -obj-$(CONFIG_FB_TMIO) += tmiofb.o obj-$(CONFIG_FB_AU1100) += au1100fb.o obj-$(CONFIG_FB_AU1200) += au1200fb.o obj-$(CONFIG_FB_VT8500) += vt8500lcdfb.o diff --git a/drivers/video/fbdev/tmiofb.c b/drivers/video/fbdev/tmiofb.c deleted file mode 100644 index 50111966c981..000000000000 From patchwork Thu Jan 5 13:46:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090483 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 596D6C3DA7A for ; Thu, 5 Jan 2023 21:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DjQPwa1IGGba3iBkbT68ACoJTViYsQ2AyYoMU9DgMew=; b=2gKq9O4KnGgXU8 L3axRrFoojRS/Oqusv1CCIpXEFjDC7ljTgJjA7/5pNx85UOq6XwuL7SIwbrrimKown0VMdi6Rb5IN zRd3OxdlPVn506RlQSxJguz3B8+QQGn8Iz1bC2DC4h7AsKRIeJ6vtlrUadT5DxGIiPMAo8jJjiHhD uas8kaaz/B5sCTwgbFL+Hhw2bgCWD9Co7oleMiXcdJNJ2V+4swj4JKD54Jc8rrVcEHusq3ztgEqxB J+ShYXL2xLdGMfu4czfW1FMzMdAr49NQHyvTP+Lhrm/RtX87Mt4pjl6+yXuBUaNnoTUaPVujscVKh a4X7sCizs8GFyBKplcgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDXV6-00EwP2-AX; Thu, 05 Jan 2023 21:10:12 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDUoH-00DTDv-02 for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:17:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=6/33ahbCeTUfp3lVe/bZNNFSFlrBELBR0N5TftRHgRg=; b=j7YIV8jIFRLt2sEwTKqroZQyPd fx8kVf8m8YAjCU8ZJnCIs8wYLyTxpq7h/XSgcb1q36Q2zE5Jp0ddR10I2aYLv3Bch7dq1aB1yiwDu KLW2cna7yeL+juMn45eVMi3YOO84SPpzZPOF/a1xbjXVvTV9Kbf7fXj1AJFJptEvXD/IsJqdRFrIq 1/xVimko1DX6O6wq08c2o2gR8xedSccA/FhMi47xT8H9c9yy8uKlypKNda4Qx5Brq7EfLcKt8j5ZO p9WR9yYBXhrA9O69eqIIzsn/RtWyaQ718HikpKMIyf226yEIXDScQx/XsDzWnmZ7m14rOL1IVPvNf fQy8A9rQ==; Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaq-001M83-2w for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:44 +0000 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 BE04AB81AEB; Thu, 5 Jan 2023 13:47:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F226C433EF; Thu, 5 Jan 2023 13:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926464; bh=hvYlZun1V9ia6MvbkglHwpnSsKWMQMEdGZSkjARxpus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pslL6VhveSNnnvoa7GN/G2CXo4AomFZlhKE8+BqKSIwC5tmQD9zS4Y+nwwxF5BVtP lcqEtw9oqeh5GcYfq4YW2vz2b9AvXqHVrdwrM9458+wvEU/hS3EfE2zSy4kn1ryPT6 gA9yzsWM+6dP0bmIP5XU8uKQSbUXZITHxFwSlC57wcTB7yJlZyMiTtImnOGGVAD1/z kFnYmpms6I4BZnOR96m9jRbh5ZPBjjv+6ONSzRff6bdvDaLIdWhgI0Aa2xvfgkSL60 Ww1z89/t2uJslv6fWyoO57RjlrRdpd5jd1qUs12568hlG0iHgyLgnN61e3tV6ki+Wk nqokI4NmcDWIg== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Helge Deller , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 23/27] fbdev: remove w100fb driver Date: Thu, 5 Jan 2023 14:46:18 +0100 Message-Id: <20230105134622.254560-24-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134741_052440_06DD630A X-CRM114-Status: GOOD ( 17.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The w100fb was used on various PXA based pocketpc machines, all of which are now removed, so remove this dirver sd well. Cc: Helge Deller Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Arnd Bergmann --- drivers/video/fbdev/Kconfig | 17 - drivers/video/fbdev/Makefile | 1 - drivers/video/fbdev/w100fb.c | 1644 ---------------------------------- drivers/video/fbdev/w100fb.h | 924 ------------------- include/video/w100fb.h | 147 --- 5 files changed, 2733 deletions(-) delete mode 100644 drivers/video/fbdev/w100fb.c delete mode 100644 drivers/video/fbdev/w100fb.h delete mode 100644 include/video/w100fb.h diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 3152f1a06a39..2f5219cc36b4 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -1841,23 +1841,6 @@ config FB_FSL_DIU help Framebuffer driver for the Freescale SoC DIU -config FB_W100 - tristate "W100 frame buffer support" - depends on FB && HAS_IOMEM && (ARCH_PXA || COMPILE_TEST) - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. - It can also drive the w3220 chip found on iPAQ hx4700. - - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called w100fb. If you want to compile it as a module, - say M here and read . - - If unsure, say N. - config FB_SH_MOBILE_LCDC tristate "SuperH Mobile LCDC framebuffer support" depends on FB && HAVE_CLK && HAS_IOMEM diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index e5206c3331d6..e6b0ae094b8b 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -84,7 +84,6 @@ obj-$(CONFIG_FB_PXA) += pxafb.o obj-$(CONFIG_FB_PXA168) += pxa168fb.o obj-$(CONFIG_PXA3XX_GCU) += pxa3xx-gcu.o obj-$(CONFIG_MMP_DISP) += mmp/ -obj-$(CONFIG_FB_W100) += w100fb.o obj-$(CONFIG_FB_AU1100) += au1100fb.o obj-$(CONFIG_FB_AU1200) += au1200fb.o obj-$(CONFIG_FB_VT8500) += vt8500lcdfb.o diff --git a/drivers/video/fbdev/w100fb.c b/drivers/video/fbdev/w100fb.c deleted file mode 100644 index 4e641a780726..000000000000 diff --git a/drivers/video/fbdev/w100fb.h b/drivers/video/fbdev/w100fb.h deleted file mode 100644 index 52c96d155b4c..000000000000 diff --git a/include/video/w100fb.h b/include/video/w100fb.h deleted file mode 100644 index a614654d8598..000000000000 From patchwork Thu Jan 5 13:46:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090652 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9D5DC3DA7A for ; Thu, 5 Jan 2023 22:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VEJbvJFkKG9ydyxeRzOTbBSzB3iM8aehw6OA7mq/HSA=; b=w4Oe1nH3uNeYrW 7CqhUQuxr6Dtpcd6Qp1GwgBrkljnNyTrfZzLilNLVKVf0WamLrWni4pPZqIAXCsIlBYqWXX48ZdgV JurBKX2Va3KnFc4CN/pFW8as5am3M46wRS6v6Hb4mLlateEtpZt9hi6jKn1m9xd7xcP6ohqBOmqmU 32bB1VJZptSzDe23m5QN0sOczbSeCr6KdE3Y5SYDZDM2eIdKjRQhjEJ8xLX0kwCPwqNqHb4Lln97O voVzOoLDQ8bRBCYiHoYTweGHW1s6o4f+dnGg7WgA16p47yXQU5wFu80HYEUU9uVa6UtvT/uQv819I yDxmkc3psWGmdr5wCMww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZ7j-00FpJM-W4; Thu, 05 Jan 2023 22:54:12 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVPB-00Dslk-Uc for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:55:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=yuVslCfesg03EE2pGWj3NR/K8FNmn3d0HaxKMVAUwHc=; b=aK4/65PDQFrVtOgfXzNW3IK19s D+E5DThzNHRHipfTvf11ILmB5jpkM3n5mgGSUISPbXAaqmsSneM/VXl13pVz84INxcV18c5AinKQD tifQRTgXVZ7t2uN45dq9/oQBgo7QNfQtKLer2XHDkLF7RoFzqHOXPN2DVOzJ6YMKyR60tR56Ksmze 4+wW/Glm8XHFM7E78FoFNikakI2fhO6uoq90GYp0Fb7lOdgJv/PzgFudDnqYJWRkn1XavrhlK+SLP 7YTTfRzvptfANWFARijKLrhzjnUsihrCrq72CsmaEKqDZyops5/xra5xGawtxW1fKeLHcHrigxDdy SkrBxKLg==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQas-001M9k-1k for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:46 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 50FA161A95; Thu, 5 Jan 2023 13:47:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5112C433F1; Thu, 5 Jan 2023 13:47:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926467; bh=4+rvH120BWpGoGjg3AEEzrUBIcxOEWqmOQBFI731bX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sxHrsghkOYPO7e6eh6XFmq1/IOZqKAgjuX1UEwB89y0ZM6Wv8IMmrNZPbA8lnpQOk fuoJ0p1C09jXJ6+6Qn5EQ8VitAhQr+NtiQKwzMNf2kr5SRDMiYlWZpJBva8jVdHetV B6z13E94vc2kV5mMkx2S/HbXHMu2g0Sawn1KOO+T4rEuuhTpICC0bEp4JkZuYbKwSD VJhxdFN1Ninhe26fadcorrI7AfVJpmP0rwsmD0bArxsH+h950L5l9yr3b1Z/8/YnG1 TbAGpRiYsIlEaAlW/6tM/SvYDd9YMbqkl/6kcJfNaYia7peKGUnZQGLgTZ6ChvvfuN BWdRBqphYG9tg== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Paul Parsons , Pavel Machek , Lee Jones , linux-leds@vger.kernel.org Subject: [PATCH 24/27] leds: remove asic3 driver Date: Thu, 5 Jan 2023 14:46:19 +0100 Message-Id: <20230105134622.254560-25-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134742_752007_DCAC6213 X-CRM114-Status: GOOD ( 16.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann Since ASIC3 MFD driver is removed, the LED support is also obsolete. Cc: Paul Parsons Cc: Pavel Machek Cc: Lee Jones Cc: linux-leds@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/leds/Kconfig | 11 --- drivers/leds/Makefile | 1 - drivers/leds/leds-asic3.c | 177 -------------------------------------- 3 files changed, 189 deletions(-) delete mode 100644 drivers/leds/leds-asic3.c diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index be2eeb3d6fd3..9dbce09eabac 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -623,17 +623,6 @@ config LEDS_NETXBIG and 5Big Network v2 boards. The LEDs are wired to a CPLD and are controlled through a GPIO extension bus. -config LEDS_ASIC3 - bool "LED support for the HTC ASIC3" - depends on LEDS_CLASS=y - depends on MFD_ASIC3 - default y - help - This option enables support for the LEDs on the HTC ASIC3. The HTC - ASIC3 LED GPIOs are inputs, not outputs, thus the leds-gpio driver - cannot be used. This driver supports hardware blinking with an on+off - period from 62ms to 125s. Say Y to enable LEDs on the HP iPAQ hx4700. - config LEDS_TCA6507 tristate "LED Support for TCA6507 I2C chip" depends on LEDS_CLASS && I2C diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index a790c967fce9..d30395d11fd8 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -14,7 +14,6 @@ obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o obj-$(CONFIG_LEDS_AN30259A) += leds-an30259a.o obj-$(CONFIG_LEDS_APU) += leds-apu.o obj-$(CONFIG_LEDS_ARIEL) += leds-ariel.o -obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o obj-$(CONFIG_LEDS_AW2013) += leds-aw2013.o obj-$(CONFIG_LEDS_BCM6328) += leds-bcm6328.o obj-$(CONFIG_LEDS_BCM6358) += leds-bcm6358.o diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c deleted file mode 100644 index 8cbc1b8bafa5..000000000000 From patchwork Thu Jan 5 13:46:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090597 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7FA70C3DA7A for ; Thu, 5 Jan 2023 22:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=t7nqRPl96PZQF1h7mcUCXpzyUG/dvXKIUyjPOU46CAQ=; b=hGJf7pKWTfs655 GZcZosKepgokLjWPkCNGAKi/ZuuQuMwaeNkKASe2kUrOuVXj3tCVeWaqeVlo6xXCVAkOln3Kla2HI wi/RoF36cBLViwhDjGZfiMpWPGRY1+ZUujz7NIWGrZLrKhPAS5Ob8+xKfZQ9MRy17iO1LOox2mk/5 +7PegSvUmLbrOEmxzM4tnsCJdlHI3o313j1FRk4AcobOEELT901gOJYFfwdLrteSht2XSJ7SoePHz lEFJDFYd5yFzZLs3TDHav/zWIayOB1M6U3aysZdYy5xNsXm15gdVIPlA2BuTQCnWZuMtKyuEieNIR QVYg5XIthqtQ/zoqHXnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYU2-00FTH9-8X; Thu, 05 Jan 2023 22:13:11 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVCq-00Dlu2-Rp for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:43:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=iHW/9ToJ3YBmz7/TmGmpqKqBrmGq/TRvgUxzwQk5SDA=; b=MyI4kfbV0I6PMgOEQrHZHTYFUY 0gjFwgDi6GX+AMy9v5/6NMxPNWTp5gv2T+r6dl31KE+2xXI4pNh6O90kQlpqEaTb55CzL9pvhUMzi G9YWsfGad5HM7qw3YfxHwOpC9gblq0LUtnX35G4zI6tVQHd3oHWYWd30CIw6qJhQgANqGiaRRUprU lUVorckkLzO2oCh0ulEG3IbxIZZWvqgzpK0qEAEdUeyU76OIjT4DBh86Clvaj2bib/ZYkJSHDYThR sI6varb5VhyySCBUqZURuNOIg2fWM4Xq53+K1Oq8B3vaZiYprtFv3IC9KiGrPF7JGhDQLTV5Tx6tm Ic0zzjlQ==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQau-001MAY-35 for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:46 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id CDDCF61A94; Thu, 5 Jan 2023 13:47:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9444AC433F0; Thu, 5 Jan 2023 13:47:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926469; bh=d0VrXYd1VyYVae2y2CAy3hUeqsRl1cgMCNli4yO+pUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RQuGSNp/u2tEo+5T1yDVTtDX4qUoeT9odKXq04i0UiXXPygKlF3dYc6nF52cQ48Ui 1RYy6HGwyQkX9x8aYtA4C0bU9X6dpGGS0aGt63yOQdQGH1Edsn8U4MP8qKvloeGr6c HIunvU2oa6PkEoPIK+w/fOI8HnDcqM+j2EGLOZJ5wcIaELEPDpI2wyLcInGmjFZXgG G0oyEBQf3j2DhwqwyX1bRSjBH+Pjlbo9PfW0bBNAoWwIckxGmOMxiVuKPRyXYB2f1B 0MIIBuEn5jnjnzhhVO+kyti45FYgdM30mZNuNdi/HAcj4kmMqDD1rt1LnjNnUNpsZj Mh3okR/KgYpwg== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Alan Stern , Greg Kroah-Hartman , linux-usb@vger.kernel.org Subject: [PATCH 25/27] usb: remove ohci-tmio driver Date: Thu, 5 Jan 2023 14:46:20 +0100 Message-Id: <20230105134622.254560-26-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134745_251183_24F3A558 X-CRM114-Status: GOOD ( 15.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The TMIO MFD driver is getting removed, so its OHCI portion is not used any more either. Cc: Alan Stern Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/usb/host/ohci-hcd.c | 18 -- drivers/usb/host/ohci-tmio.c | 364 ----------------------------------- 2 files changed, 382 deletions(-) delete mode 100644 drivers/usb/host/ohci-tmio.c diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 0457dd9f6c19..4f9982ecfb58 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1264,11 +1264,6 @@ MODULE_LICENSE ("GPL"); #define SM501_OHCI_DRIVER ohci_hcd_sm501_driver #endif -#ifdef CONFIG_MFD_TC6393XB -#include "ohci-tmio.c" -#define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver -#endif - static int __init ohci_hcd_mod_init(void) { int retval = 0; @@ -1306,19 +1301,9 @@ static int __init ohci_hcd_mod_init(void) goto error_sm501; #endif -#ifdef TMIO_OHCI_DRIVER - retval = platform_driver_register(&TMIO_OHCI_DRIVER); - if (retval < 0) - goto error_tmio; -#endif - return retval; /* Error path */ -#ifdef TMIO_OHCI_DRIVER - platform_driver_unregister(&TMIO_OHCI_DRIVER); - error_tmio: -#endif #ifdef SM501_OHCI_DRIVER platform_driver_unregister(&SM501_OHCI_DRIVER); error_sm501: @@ -1345,9 +1330,6 @@ module_init(ohci_hcd_mod_init); static void __exit ohci_hcd_mod_exit(void) { -#ifdef TMIO_OHCI_DRIVER - platform_driver_unregister(&TMIO_OHCI_DRIVER); -#endif #ifdef SM501_OHCI_DRIVER platform_driver_unregister(&SM501_OHCI_DRIVER); #endif diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c deleted file mode 100644 index 49539b9f0e94..000000000000 From patchwork Thu Jan 5 13:46:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090651 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA571C4708E for ; Thu, 5 Jan 2023 22:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JESmNex1Yz+ieccJjjp7awuOrvEVouvnHsSBzAorTkE=; b=yxcRT9ETqNv4+H h5zthZCS2/IJ7YU1XLpuP7vqN0eM4pn9n4z5RVG+M58asnagMclzb9B0tBJHlo9OcFlY2L8gRu8Fa dvzkvtbUIoC0sW4BAYL0+BECKkvQ2aD6BH0DqEaxjA6C/sTFz1VnPI6FecNhUkba3GZCefpkYfCf3 zj6gjinWh+JHmjz0ao1LetBmMulm+5h8yWn/QVRvmCoHeWEzOGn7lwZB8Vk8P/TcjAkwH8NsWZIr8 /b9fGhvLpVqiQ3HWKQM+DWC9Qfu7VoruSZxiWR93G5Lr7R9UQ9HV8O1SnWm2JmZvFEpXOKHJLSzUv Zqs+Ncm/9aok860ad0/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZ5s-00FoEK-38; Thu, 05 Jan 2023 22:52:17 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVOc-00DsQh-9S for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:55:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=5u8+QS8w2Xtan0mtK38Xfx5B8jvunr9X5vqOreD84fg=; b=FyjaG4IdyuYS/jEt7e0c6E4g5X W3zyQrx7FWCeavYTcxj9YtEK8It1TT3ZJJSzy5UzRiRiSM6VKIxrsFgeKxRxvs2tkXtawBIV2erxt LirkT6pj3q/g3bMxg3w+IFjIG+4JVJYe7BwVmhaKn2r0SzhNcK3B++pAOgsuzulhaqdV3bcnXdFk7 aRxTbIDpcAlTRKxnqIXjrhlh6HgkMFmpFSukDAKnVsye7VEjWYRh9fDxU71BW6fpT6fATbj6HHk3n 9PhyPiCdHlWHcKoGFq3Yef8G0m/yH4igQ0iY7I53BTVuGCtltlTPvuePJAENrKz5ivMpCepI25Bj4 YlaaMezg==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQax-001MBQ-0k for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:49 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 260F261A8A; Thu, 5 Jan 2023 13:47:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D7B6C433EF; Thu, 5 Jan 2023 13:47:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926472; bh=cHw2D6c9GdFSvgGCy0oGwbsuU5djCFfJJbkfipj2g/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dv/o5jOj65aEMbPI7bEChRRKayfPxBpZtZsPsnUldfc43Y3A0DFULrsx9ZsuDR6L+ WEpCr+fbkTlHGE+Rne97ManqekzpOs8PvF8HrEzrKBtwGr33qfKE3QlRq/XVs9+Rjn +nOdKQREp4M27ws5LgW3ujF/vq9r/reu3Glj+Dz9X5WmJZKl8UCjX/F+8linAVE+A/ uUc1NPPF9DBXmYNo5Mjg7Bsh2SZniTeOQKoKGg+cUFpzIGucWYom0G0EJ1988Dnz5M 6nZD//LtPB41l2qOcHQmqEyl6zkwMuUMeHHXlW17S90/mirCtRAiTJjQT2wJQWqBZZ 1bRu5pUe/w7qw== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Evgeniy Polyakov , Szabolcs Gyurko Subject: [PATCH 26/27] w1: remove ds1wm driver Date: Thu, 5 Jan 2023 14:46:21 +0100 Message-Id: <20230105134622.254560-27-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134747_647555_6AEAA245 X-CRM114-Status: GOOD ( 13.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann This driver was used by the mfd/asic3 and mfd/htc-pasic3 drivers, but both of those are removed as part of the PXA spring cleaning, which leaves the w1 support orphaned as well. Cc: Evgeniy Polyakov Cc: Szabolcs Gyurko Signed-off-by: Arnd Bergmann --- drivers/w1/masters/Kconfig | 7 - drivers/w1/masters/Makefile | 1 - drivers/w1/masters/ds1wm.c | 675 ------------------------------------ 3 files changed, 683 deletions(-) delete mode 100644 drivers/w1/masters/ds1wm.c diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig index 24b9a8e05f64..692cac3ff0ee 100644 --- a/drivers/w1/masters/Kconfig +++ b/drivers/w1/masters/Kconfig @@ -41,13 +41,6 @@ config W1_MASTER_MXC help Say Y here to enable MXC 1-wire host -config W1_MASTER_DS1WM - tristate "Maxim DS1WM 1-wire busmaster" - help - Say Y here to enable the DS1WM 1-wire driver, such as that - in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like - hx4700. - config W1_MASTER_GPIO tristate "GPIO 1-wire busmaster" depends on GPIOLIB || COMPILE_TEST diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile index dae629b7ab49..c5d85a827e52 100644 --- a/drivers/w1/masters/Makefile +++ b/drivers/w1/masters/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.o obj-$(CONFIG_W1_MASTER_MXC) += mxc_w1.o -obj-$(CONFIG_W1_MASTER_DS1WM) += ds1wm.o obj-$(CONFIG_W1_MASTER_GPIO) += w1-gpio.o obj-$(CONFIG_HDQ_MASTER_OMAP) += omap_hdq.o obj-$(CONFIG_W1_MASTER_SGI) += sgi_w1.o diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c deleted file mode 100644 index f661695fb589..000000000000 From patchwork Thu Jan 5 13:46:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090584 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4531BC3DA7A for ; Thu, 5 Jan 2023 22:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kmtV0HwX4fk1B0reyP39I8s2FRY1UuhyLCPGYh1Hggs=; b=Pg0s8sPM1urmMS Xvu05cUt2peJq5L4Lf5vTfmgAeDLsQ7go4oopeNIK0o2lcncRGCDgWCpifOokqv7EVSE78W6t6MHj lzHQLc2Txb7B3Y+1VoDmzQMpsfzvpp4iLlrszLTPNgl63/zbod6SCPZhDgDs8Z8AUNTLuh5bPlQEf 9Fm+1r+2O1OtjOQG3pbAPxRuCv0NAufRD7xOKw1+XXC5z4Y/cgkKmePyD4PJxVTRD+VGZu6IeCLUe CN1KJHlpJgNpzhhe0aqjoGVqABxtEQTg6ElNG4AKARW/Rd1gYK1K/xSWPw+B61XGpcWNcMurkl/WH 4XaKHCKEt9MO/Xio/2CQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDYLL-00FOkQ-PY; Thu, 05 Jan 2023 22:04:12 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDV8u-00Dj3i-VD for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:39:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=RW8uf4zWIqJiIDVhfx2KnuSmq3rfr4Ut3tkrsD5dja4=; b=CTmatTzG4CdT1yjlB4qwDrQu5H TxEQctbrpzwlOKVidgLuGiDszzf+8Yj8m0VkwFjwdG0t1hiPS68iyvRTOlHor5XpAujV5B54I8b/U KqCKNeP3nmmipDHllFGA1Oy90+zIJRviOzcj/1C76qFHnB/SRgu7oIfM1C6pj4eJWBrkGauy0cQvo uDmDL0GlGahTmVCV51wo1Qxf45ZIq8Y56n8aIlYtd0OmdKC+lr3eHn5TSHLz0O1/Hqb9+hgjZkHXu 9LBLgTgkrssALymm1oMQraB0dkZE3Jltr1nOk0lNVn9fF4hqpQL4Bvbdj+zFdEa8VakmWens0/Qt3 3rXnV6Tg==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaz-001MD9-2X for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:51 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 7DFD261AAF; Thu, 5 Jan 2023 13:47:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68B0FC433F1; Thu, 5 Jan 2023 13:47:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926474; bh=QBATBldnH97j5a6wP3U8v0ZSqqSKFF/ptzvMtMvWpXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nvnVDZ2vUQM0fzq9itEWzBKAhHayYLScwyZdwppqa16XKQcyNHgYqWfR/RXQ6V+ED wg/S26ahAb0oSb9cgC51u2xkAKAmaam6yIahXRISXtILLQAo1MWg4uQG+fk4h0Mi9m 9CIMyvGlbY3dlzvKMqTIaD0NM0cQoyeq8weFcFRTyTvc2w6qCqSnbKMz9sHHgBMGCo yfJr5ZdOCIQmNaczYJGMaOcSr/sh5fwcDWbusTVKZniMnOTgtS7IVmJLJ0DqROys+w UKtyUHzuh8yYXorHO1hHCFLcEBsxEaC9EEzzyldSnGqbYI2smDTlvQvPl0rihRDSKl fERV8ww6lKz/Q== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Lee Jones , Philipp Zabel Subject: [PATCH 27/27] mfd: remove htc-pasic3 driver Date: Thu, 5 Jan 2023 14:46:22 +0100 Message-Id: <20230105134622.254560-28-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134750_159662_496D5B3B X-CRM114-Status: GOOD ( 15.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The htc-pasic3 MFD device was only used in the PXA magician machine that is now removed, so this can be recycled as well. Cc: Lee Jones Cc: Philipp Zabel Signed-off-by: Arnd Bergmann --- drivers/mfd/Kconfig | 9 -- drivers/mfd/Makefile | 2 - drivers/mfd/htc-pasic3.c | 210 --------------------------------- include/linux/mfd/htc-pasic3.h | 54 --------- 4 files changed, 275 deletions(-) delete mode 100644 drivers/mfd/htc-pasic3.c delete mode 100644 include/linux/mfd/htc-pasic3.h diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 5ea07a65f150..5c24841e5699 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -541,15 +541,6 @@ config MFD_HI655X_PMIC help Select this option to enable Hisilicon hi655x series pmic driver. -config HTC_PASIC3 - tristate "HTC PASIC3 LED/DS1WM chip support" - select MFD_CORE - help - This core driver provides register access for the LED/DS1WM - chips labeled "AIC2" and "AIC3", found on HTC Blueangel and - HTC Magician devices, respectively. Actual functionality is - handled by the leds-pasic3 and ds1wm drivers. - config MFD_INTEL_QUARK_I2C_GPIO tristate "Intel Quark MFD I2C GPIO" depends on PCI diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 4969ea6e24f1..09712495f4f4 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -17,8 +17,6 @@ obj-$(CONFIG_MFD_ENE_KB3930) += ene-kb3930.o obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o obj-$(CONFIG_MFD_GATEWORKS_GSC) += gateworks-gsc.o -obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o - obj-$(CONFIG_MFD_TI_LP873X) += lp873x.o obj-$(CONFIG_MFD_TI_LP87565) += lp87565.o obj-$(CONFIG_MFD_TI_AM335X_TSCADC) += ti_am335x_tscadc.o diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c deleted file mode 100644 index 0c46b7e64b2d..000000000000 diff --git a/include/linux/mfd/htc-pasic3.h b/include/linux/mfd/htc-pasic3.h deleted file mode 100644 index 3d3ed67bd969..000000000000