* [PATCH 01/27] ARM: pxa: remove unused board files
[not found] <20230105134622.254560-1-arnd@kernel.org>
@ 2023-01-05 13:45 ` Arnd Bergmann
2023-01-05 15:50 ` Dmitry Baryshkov
2023-01-05 13:45 ` [PATCH 02/27] ARM: pxa: remove irda leftover Arnd Bergmann
` (25 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:45 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
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
From: Arnd Bergmann <arnd@arndb.de>
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 <ales@i-tech.si>
Cc: Ales Snuparek <snuparek@atlas.cz>
Cc: Alex Osborne <ato@meshy.org>
Cc: Alex Osborne <bobofdoom@gmail.com>
Cc: Dirk Opfer <dirk@opfer-online.de>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Ian Molton <spyro@f2s.com>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Michael Petchkovsky <mkpetch@internode.on.net>
Cc: Nick Bane <nick@cecomputing.co.uk>
Cc: Paul Parsons <lost.distance@yahoo.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Sergey Lapin <slapin@ossfans.org>
Cc: Tomas Cech <sleep_walker@suse.cz>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 <rpurdie@rpsys.net>
-S: Maintained
-
ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
M: Hans Ulli Kroll <ulli.kroll@googlemail.com>
M: Linus Walleij <linus.walleij@linaro.org>
@@ -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 <robert.jarzmik@free.fr>
-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 <ulli.kroll@googlemail.com>
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 <kernel@wantstofly.org>
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S: Maintained
-
ARM/GUMSTIX MACHINE SUPPORT
M: Steve Sakoman <sakoman@gmail.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
-ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
-M: Philipp Zabel <philipp.zabel@gmail.com>
-M: Paul Parsons <lost.distance@yahoo.com>
-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 <xuwei5@hisilicon.com>
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 <marek.vasut@gmail.com>
-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 <linusw@kernel.org>
M: Imre Kaloz <kaloz@openwrt.org>
@@ -2311,22 +2281,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
-ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
-M: Lennert Buytenhek <kernel@wantstofly.org>
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S: Maintained
-
ARM/LG1K ARCHITECTURE
M: Chanho Min <chanho.min@lge.com>
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 <kernel@wantstofly.org>
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S: Maintained
-
ARM/LPC18XX ARCHITECTURE
M: Vladimir Zapolskiy <vz@mleia.com>
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 <philipp.zabel@gmail.com>
-S: Maintained
-
ARM/Marvell Dove/MV78xx0/Orion SOC support
M: Andrew Lunn <andrew@lunn.ch>
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@ -2485,12 +2441,6 @@ F: arch/arm/boot/dts/milbeaut*
F: arch/arm/mach-milbeaut/
N: milbeaut
-ARM/MIOA701 MACHINE SUPPORT
-M: Robert Jarzmik <robert.jarzmik@free.fr>
-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 <daniel@thingy.jp>
M: Romain Perier <romain.perier@gmail.com>
@@ -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 <mkpetch@internode.on.net>
-S: Maintained
-
ARM/NOMADIK/Ux500 ARCHITECTURES
M: Linus Walleij <linus.walleij@linaro.org>
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 <marek.vasut@gmail.com>
-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 <slapin@ossfans.org>
-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 <agross@kernel.org>
M: Bjorn Andersson <andersson@kernel.org>
@@ -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 <dbaryshkov@gmail.com>
-M: Dirk Opfer <dirk@opfer-online.de>
-S: Maintained
-
ARM/TOSHIBA VISCONTI ARCHITECTURE
M: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
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 <marek.vasut@gmail.com>
-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 <marek.vasut@gmail.com>
-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 <michal.simek@xilinx.com>
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));
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-05 13:45 ` [PATCH 01/27] ARM: pxa: remove unused board files Arnd Bergmann
@ 2023-01-05 15:50 ` Dmitry Baryshkov
2023-01-05 17:05 ` Richard Purdie
0 siblings, 1 reply; 69+ messages in thread
From: Dmitry Baryshkov @ 2023-01-05 15:50 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Ales Bardorfer, Ales Snuparek,
Alex Osborne, Alex Osborne, Dirk Opfer, Ian Molton,
Lennert Buytenhek, Marek Vasut, Michael Petchkovsky, Nick Bane,
Paul Parsons, Philipp Zabel, Richard Purdie, Sergey Lapin,
Tomas Cech
чт, 5 янв. 2023 г. в 15:46, Arnd Bergmann <arnd@kernel.org>:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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.
Well, tosa also works in qemu.
Nevertheless:
Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
> Cc: Ales Bardorfer <ales@i-tech.si>
> Cc: Ales Snuparek <snuparek@atlas.cz>
> Cc: Alex Osborne <ato@meshy.org>
> Cc: Alex Osborne <bobofdoom@gmail.com>
> Cc: Dirk Opfer <dirk@opfer-online.de>
> Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> Cc: Ian Molton <spyro@f2s.com>
> Cc: Lennert Buytenhek <kernel@wantstofly.org>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Michael Petchkovsky <mkpetch@internode.on.net>
> Cc: Nick Bane <nick@cecomputing.co.uk>
> Cc: Paul Parsons <lost.distance@yahoo.com>
> Cc: Philipp Zabel <philipp.zabel@gmail.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Sergey Lapin <slapin@ossfans.org>
> Cc: Tomas Cech <sleep_walker@suse.cz>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> 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 <rpurdie@rpsys.net>
> -S: Maintained
> -
> ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
> M: Hans Ulli Kroll <ulli.kroll@googlemail.com>
> M: Linus Walleij <linus.walleij@linaro.org>
> @@ -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 <robert.jarzmik@free.fr>
> -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 <ulli.kroll@googlemail.com>
> 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 <kernel@wantstofly.org>
> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> -S: Maintained
> -
> ARM/GUMSTIX MACHINE SUPPORT
> M: Steve Sakoman <sakoman@gmail.com>
> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> S: Maintained
>
> -ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
> -M: Philipp Zabel <philipp.zabel@gmail.com>
> -M: Paul Parsons <lost.distance@yahoo.com>
> -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 <xuwei5@hisilicon.com>
> 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 <marek.vasut@gmail.com>
> -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 <linusw@kernel.org>
> M: Imre Kaloz <kaloz@openwrt.org>
> @@ -2311,22 +2281,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> S: Maintained
>
> -ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
> -M: Lennert Buytenhek <kernel@wantstofly.org>
> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> -S: Maintained
> -
> ARM/LG1K ARCHITECTURE
> M: Chanho Min <chanho.min@lge.com>
> 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 <kernel@wantstofly.org>
> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> -S: Maintained
> -
> ARM/LPC18XX ARCHITECTURE
> M: Vladimir Zapolskiy <vz@mleia.com>
> 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 <philipp.zabel@gmail.com>
> -S: Maintained
> -
> ARM/Marvell Dove/MV78xx0/Orion SOC support
> M: Andrew Lunn <andrew@lunn.ch>
> M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> @@ -2485,12 +2441,6 @@ F: arch/arm/boot/dts/milbeaut*
> F: arch/arm/mach-milbeaut/
> N: milbeaut
>
> -ARM/MIOA701 MACHINE SUPPORT
> -M: Robert Jarzmik <robert.jarzmik@free.fr>
> -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 <daniel@thingy.jp>
> M: Romain Perier <romain.perier@gmail.com>
> @@ -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 <mkpetch@internode.on.net>
> -S: Maintained
> -
> ARM/NOMADIK/Ux500 ARCHITECTURES
> M: Linus Walleij <linus.walleij@linaro.org>
> 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 <marek.vasut@gmail.com>
> -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 <slapin@ossfans.org>
> -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 <agross@kernel.org>
> M: Bjorn Andersson <andersson@kernel.org>
> @@ -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 <dbaryshkov@gmail.com>
> -M: Dirk Opfer <dirk@opfer-online.de>
> -S: Maintained
> -
> ARM/TOSHIBA VISCONTI ARCHITECTURE
> M: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> 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 <marek.vasut@gmail.com>
> -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 <marek.vasut@gmail.com>
> -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 <michal.simek@xilinx.com>
> 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));
> --
> 2.39.0
>
--
With best wishes
Dmitry
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-05 15:50 ` Dmitry Baryshkov
@ 2023-01-05 17:05 ` Richard Purdie
2023-01-05 22:16 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Richard Purdie @ 2023-01-05 17:05 UTC (permalink / raw)
To: Dmitry Baryshkov, Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Ales Bardorfer, Ales Snuparek,
Alex Osborne, Alex Osborne, Dirk Opfer, Ian Molton,
Lennert Buytenhek, Marek Vasut, Michael Petchkovsky, Nick Bane,
Paul Parsons, Philipp Zabel, Sergey Lapin, Tomas Cech
On Thu, 2023-01-05 at 17:50 +0200, Dmitry Baryshkov wrote:
> чт, 5 янв. 2023 г. в 15:46, Arnd Bergmann <arnd@kernel.org>:
> >
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > 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.
>
> Well, tosa also works in qemu.
> Nevertheless:
> Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
I'm kind of sad to see corgi at this point but it isn't really
surprising. The hardware is old/slow and likely not used by many
anymore, things have moved on and the systems ended up being heavily
kernel size footprint limited.
I'd just note that corgi (and shepherd/husky) are strongly related to
spitz/akita/borzoi, the difference is basically pxa25x vs pxa27x
processor and pin changes. We chose just to emulate one set in qemu but
the others would be relatively trivial.
tosa and poodle have much less in common with the other Zaurus devices.
I guess what I'm saying is that if spitz is remaining it might make
sense to have corgi with it.
Cheers,
Richard
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-05 17:05 ` Richard Purdie
@ 2023-01-05 22:16 ` Arnd Bergmann
2023-01-05 22:45 ` Richard Purdie
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 22:16 UTC (permalink / raw)
To: Richard Purdie, Dmitry Baryshkov, Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Ales Bardorfer, Ales Snuparek, Alex Osborne,
Alex Osborne, Dirk Opfer, Ian Molton, Lennert Buytenhek,
Marek Vasut, Michael Petchkovsky, Nick Bane, Paul Parsons,
Philipp Zabel, Sergey Lapin, Tomas Cech
On Thu, Jan 5, 2023, at 18:05, Richard Purdie wrote:
> On Thu, 2023-01-05 at 17:50 +0200, Dmitry Baryshkov wrote:
>> чт, 5 янв. 2023 г. в 15:46, Arnd Bergmann <arnd@kernel.org>:
>> >
>> > From: Arnd Bergmann <arnd@arndb.de>
>> >
>> > 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.
>>
>> Well, tosa also works in qemu.
>> Nevertheless:
>> Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
> I'm kind of sad to see corgi at this point but it isn't really
> surprising. The hardware is old/slow and likely not used by many
> anymore, things have moved on and the systems ended up being heavily
> kernel size footprint limited.
>
> I'd just note that corgi (and shepherd/husky) are strongly related to
> spitz/akita/borzoi, the difference is basically pxa25x vs pxa27x
> processor and pin changes. We chose just to emulate one set in qemu but
> the others would be relatively trivial.
>
> tosa and poodle have much less in common with the other Zaurus devices.
>
> I guess what I'm saying is that if spitz is remaining it might make
> sense to have corgi with it.
Ok, good to know, thanks for the background.
The way we came up with the list of unused boards is to
assume they are all unused unless someone asked for it
to be kept around for this time, for pretty much any reason.
I probably forgot to have you on the Cc list when we discussed
this in the past.
IIRC, nobody specifically asked about keeping either
the corgi or the spitz series, the reason for keeping it
was to have at least one handheld platform with qemu
support remain for testing, but I don't see a reason
for keeping more than one of them.
If you feel like we should keep tosa or corgi and ask
again next year, we could do that, but reworking the series
to keep tosa around would have additional side-effects
on the tmio-mmc driver that can otherwise get cleaned
up quite a bit.
In the long run, I expect we will remove all the remaining
legacy boardfiles and only keep the DT support. Ideally
if someone is motivated to convert spitz to DT, supporting
corgi the same way is also easy.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-05 22:16 ` Arnd Bergmann
@ 2023-01-05 22:45 ` Richard Purdie
2023-01-06 9:47 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Richard Purdie @ 2023-01-05 22:45 UTC (permalink / raw)
To: Arnd Bergmann, Dmitry Baryshkov, Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Ales Bardorfer, Ales Snuparek, Alex Osborne,
Alex Osborne, Dirk Opfer, Ian Molton, Lennert Buytenhek,
Marek Vasut, Michael Petchkovsky, Nick Bane, Paul Parsons,
Philipp Zabel, Sergey Lapin, Tomas Cech
On Thu, 2023-01-05 at 23:16 +0100, Arnd Bergmann wrote:
> On Thu, Jan 5, 2023, at 18:05, Richard Purdie wrote:
> > On Thu, 2023-01-05 at 17:50 +0200, Dmitry Baryshkov wrote:
> > > чт, 5 янв. 2023 г. в 15:46, Arnd Bergmann <arnd@kernel.org>:
> > > >
> > > > From: Arnd Bergmann <arnd@arndb.de>
> > > >
> > > > 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.
> > >
> > > Well, tosa also works in qemu.
> > > Nevertheless:
> > > Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> >
> > I'm kind of sad to see corgi at this point but it isn't really
> > surprising. The hardware is old/slow and likely not used by many
> > anymore, things have moved on and the systems ended up being heavily
> > kernel size footprint limited.
> >
> > I'd just note that corgi (and shepherd/husky) are strongly related to
> > spitz/akita/borzoi, the difference is basically pxa25x vs pxa27x
> > processor and pin changes. We chose just to emulate one set in qemu but
> > the others would be relatively trivial.
> >
> > tosa and poodle have much less in common with the other Zaurus devices.
> >
> > I guess what I'm saying is that if spitz is remaining it might make
> > sense to have corgi with it.
>
> Ok, good to know, thanks for the background.
>
> The way we came up with the list of unused boards is to
> assume they are all unused unless someone asked for it
> to be kept around for this time, for pretty much any reason.
> I probably forgot to have you on the Cc list when we discussed
> this in the past.
I didn't see any discussion about this until now, no.
> IIRC, nobody specifically asked about keeping either
> the corgi or the spitz series, the reason for keeping it
> was to have at least one handheld platform with qemu
> support remain for testing, but I don't see a reason
> for keeping more than one of them.
>
> If you feel like we should keep tosa or corgi and ask
> again next year, we could do that, but reworking the series
> to keep tosa around would have additional side-effects
> on the tmio-mmc driver that can otherwise get cleaned
> up quite a bit.
>
> In the long run, I expect we will remove all the remaining
> legacy boardfiles and only keep the DT support. Ideally
> if someone is motivated to convert spitz to DT, supporting
> corgi the same way is also easy.
Personally, I'm not that interested in tosa (or poodle/collie).
The other zaurus devices are interesting for me as I know the platform,
they have qemu emulation, there are set of devices which are similar
but also have differences and there were one of the original targets
for OpenEmbedded and Yocto Project. I did quite a bit of work to get
one kernel which could run on multiple devices, as best you could at
the time! I'd actually forgotten about the qemu emulation.
There is a need for better automated testing around DT in OE/YP and
this is making me wonder about a few potential ideas.
Is there any conversion to DT you can easily point at as an example of
the kinds of changes needed?
Cheers,
Richard
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-05 22:45 ` Richard Purdie
@ 2023-01-06 9:47 ` Arnd Bergmann
2023-01-06 10:06 ` Dmitry Baryshkov
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-06 9:47 UTC (permalink / raw)
To: Richard Purdie, Dmitry Baryshkov, Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Ales Bardorfer, Ales Snuparek, Alex Osborne,
Alex Osborne, Dirk Opfer, Ian Molton, Lennert Buytenhek,
Marek Vasut, Michael Petchkovsky, Nick Bane, Paul Parsons,
Philipp Zabel, Sergey Lapin, Tomas Cech, Linus Walleij,
Marc Zyngier
On Thu, Jan 5, 2023, at 23:45, Richard Purdie wrote:
> On Thu, 2023-01-05 at 23:16 +0100, Arnd Bergmann wrote:
>> On Thu, Jan 5, 2023, at 18:05, Richard Purdie wrote:
>> > On Thu, 2023-01-05 at 17:50 +0200, Dmitry Baryshkov wrote:
>>
>> In the long run, I expect we will remove all the remaining
>> legacy boardfiles and only keep the DT support. Ideally
>> if someone is motivated to convert spitz to DT, supporting
>> corgi the same way is also easy.
>
> Personally, I'm not that interested in tosa (or poodle/collie).
>
> The other zaurus devices are interesting for me as I know the platform,
> they have qemu emulation, there are set of devices which are similar
> but also have differences and there were one of the original targets
> for OpenEmbedded and Yocto Project. I did quite a bit of work to get
> one kernel which could run on multiple devices, as best you could at
> the time! I'd actually forgotten about the qemu emulation.
>
> There is a need for better automated testing around DT in OE/YP and
> this is making me wonder about a few potential ideas.
Ok
> Is there any conversion to DT you can easily point at as an example of
> the kinds of changes needed?
Robert Jarzmik and Daniel Mack worked on the conversion of the
PXA platform to DT. Daniel contributed the port for Raumfeld,
which should be complete, while Robert worked on more driver
conversions and mentioned[1] that he had converted additional
boards in the past but did not merge it upstream. They
can probably point you to whatever is missing. I would expect
the generic PXA drivers (spi, mmc, nand, i2c, audio, fb, gpio,
keypad) to basically work work a correct DT description,
while the machine specific drivers (scoop and pcmcia mainly)
will need DT support in the driver.
In addition, Linus Walleij and Marc Zyngier have both expressed
interest in keeping sa1100 (h3600, collie, assabet, jornada720)
alive, but those don't have any DT support yet and require
much more work. Also note that while you can now build a kernel
that includes support for all little-endian ARMv4T and ARMv5
machines, StrongARM machine still require a separate kernel
build.
Arnd
[1] https://lore.kernel.org/all/803778517.2279639.1667493436959.JavaMail.open-xchange@opme11oxm02aub.pom.fr.intraorange/
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-06 9:47 ` Arnd Bergmann
@ 2023-01-06 10:06 ` Dmitry Baryshkov
2023-01-08 9:06 ` Robert Jarzmik
` (2 more replies)
0 siblings, 3 replies; 69+ messages in thread
From: Dmitry Baryshkov @ 2023-01-06 10:06 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Richard Purdie, Arnd Bergmann, Robert Jarzmik, Daniel Mack,
Haojian Zhuang, linux-arm-kernel, linux-kernel, Ales Bardorfer,
Ales Snuparek, Alex Osborne, Alex Osborne, Dirk Opfer, Ian Molton,
Lennert Buytenhek, Marek Vasut, Michael Petchkovsky, Nick Bane,
Paul Parsons, Philipp Zabel, Sergey Lapin, Tomas Cech,
Linus Walleij, Marc Zyngier
пт, 6 янв. 2023 г. в 11:47, Arnd Bergmann <arnd@arndb.de>:
>
> On Thu, Jan 5, 2023, at 23:45, Richard Purdie wrote:
> > On Thu, 2023-01-05 at 23:16 +0100, Arnd Bergmann wrote:
> >> On Thu, Jan 5, 2023, at 18:05, Richard Purdie wrote:
> >> > On Thu, 2023-01-05 at 17:50 +0200, Dmitry Baryshkov wrote:
> >>
> >> In the long run, I expect we will remove all the remaining
> >> legacy boardfiles and only keep the DT support. Ideally
> >> if someone is motivated to convert spitz to DT, supporting
> >> corgi the same way is also easy.
> >
> > Personally, I'm not that interested in tosa (or poodle/collie).
I think I was one of the last devs having interest in tosa. It worked
mostly fine except the offline charging.
> >
> > The other zaurus devices are interesting for me as I know the platform,
> > they have qemu emulation, there are set of devices which are similar
> > but also have differences and there were one of the original targets
> > for OpenEmbedded and Yocto Project. I did quite a bit of work to get
> > one kernel which could run on multiple devices, as best you could at
> > the time! I'd actually forgotten about the qemu emulation.
> >
> > There is a need for better automated testing around DT in OE/YP and
> > this is making me wonder about a few potential ideas.
>
> Ok
>
> > Is there any conversion to DT you can easily point at as an example of
> > the kinds of changes needed?
>
> Robert Jarzmik and Daniel Mack worked on the conversion of the
> PXA platform to DT. Daniel contributed the port for Raumfeld,
> which should be complete, while Robert worked on more driver
> conversions and mentioned[1] that he had converted additional
> boards in the past but did not merge it upstream. They
> can probably point you to whatever is missing. I would expect
> the generic PXA drivers (spi, mmc, nand, i2c, audio, fb, gpio,
> keypad) to basically work work a correct DT description,
> while the machine specific drivers (scoop and pcmcia mainly)
> will need DT support in the driver.
>
> In addition, Linus Walleij and Marc Zyngier have both expressed
> interest in keeping sa1100 (h3600, collie, assabet, jornada720)
> alive, but those don't have any DT support yet and require
> much more work. Also note that while you can now build a kernel
> that includes support for all little-endian ARMv4T and ARMv5
> machines, StrongARM machine still require a separate kernel
> build.
I looked into converting collie to use DT several years ago. The major
problem was not in the StrongARM itself , but rather in the locomo
(platform-specific ASIC) and PCMCIA. Unfortunately I abandoned that
work ages ago. RMK didn't seem to be very interested, if I remember
correclty.
I suspect that the platforms might need to be rebootstrapped from the
ground up. This sounds like a fun project for the next Connect demo :D
BTW: collie is also supported by the qemu (in fact at some point I
mostly used qemu for debugging collie). I don't think that the LCD
emulation works, but the rest should be mostly good.
>
> Arnd
>
> [1] https://lore.kernel.org/all/803778517.2279639.1667493436959.JavaMail.open-xchange@opme11oxm02aub.pom.fr.intraorange/
--
With best wishes
Dmitry
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-06 10:06 ` Dmitry Baryshkov
@ 2023-01-08 9:06 ` Robert Jarzmik
2023-01-08 20:36 ` Linus Walleij
2023-01-08 21:05 ` Arnd Bergmann
2 siblings, 0 replies; 69+ messages in thread
From: Robert Jarzmik @ 2023-01-08 9:06 UTC (permalink / raw)
To: Richard Purdie
Cc: Arnd Bergmann, Dmitry Baryshkov, Arnd Bergmann, Robert Jarzmik,
Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Ales Bardorfer, Ales Snuparek, Alex Osborne, Alex Osborne,
Dirk Opfer, Ian Molton, Lennert Buytenhek, Marek Vasut,
Michael Petchkovsky, Nick Bane, Paul Parsons, Philipp Zabel,
Sergey Lapin, Tomas Cech, Linus Walleij, Marc Zyngier
>> > Is there any conversion to DT you can easily point at as an
>> > example of
>> > the kinds of changes needed?
Hi Richard,
There is:
https://lkml.kernel.org/lkml/20180830195941.6118-1-robert.jarzmik@free.fr/t/
This is a rather complete example of a pxa27x board working in DT
:
(audio, camera, cpufreq, sd, screen, uarts, udc, keypad).
Cheers.
--
Robert
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-06 10:06 ` Dmitry Baryshkov
2023-01-08 9:06 ` Robert Jarzmik
@ 2023-01-08 20:36 ` Linus Walleij
2023-01-08 21:05 ` Arnd Bergmann
2 siblings, 0 replies; 69+ messages in thread
From: Linus Walleij @ 2023-01-08 20:36 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Arnd Bergmann, Richard Purdie, Arnd Bergmann, Robert Jarzmik,
Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Ales Bardorfer, Ales Snuparek, Alex Osborne, Alex Osborne,
Dirk Opfer, Ian Molton, Lennert Buytenhek, Marek Vasut,
Michael Petchkovsky, Nick Bane, Paul Parsons, Philipp Zabel,
Sergey Lapin, Tomas Cech, Linus Walleij, Marc Zyngier
On Fri, Jan 6, 2023 at 11:06 AM Dmitry Baryshkov <dbaryshkov@gmail.com> wrote:
> I suspect that the platforms might need to be rebootstrapped from the
> ground up. This sounds like a fun project for the next Connect demo :D
When I converted Integrator, Gemini and IXP4xx to device tree I essentially
bootstrapped them from the ground up beginning with irqchip, timer and
UART and moved up the foodchain from there, so yes :)
It's a lot of work but also a lot of fun!
Yours,
Linus Walleij
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-06 10:06 ` Dmitry Baryshkov
2023-01-08 9:06 ` Robert Jarzmik
2023-01-08 20:36 ` Linus Walleij
@ 2023-01-08 21:05 ` Arnd Bergmann
2023-01-08 21:12 ` Dmitry Baryshkov
2 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-08 21:05 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Richard Purdie, Arnd Bergmann, Robert Jarzmik, Daniel Mack,
Haojian Zhuang, linux-arm-kernel, linux-kernel, Ales Bardorfer,
Ales Snuparek, Alex Osborne, Alex Osborne, Dirk Opfer, Ian Molton,
Lennert Buytenhek, Marek Vasut, Michael Petchkovsky, Nick Bane,
Paul Parsons, Philipp Zabel, Sergey Lapin, Tomas Cech,
Linus Walleij, Marc Zyngier
On Fri, Jan 6, 2023, at 11:06, Dmitry Baryshkov wrote:
> пт, 6 янв. 2023 г. в 11:47, Arnd Bergmann <arnd@arndb.de>:
>> > Is there any conversion to DT you can easily point at as an example of
>> > the kinds of changes needed?
>>
>> Robert Jarzmik and Daniel Mack worked on the conversion of the
>> PXA platform to DT. Daniel contributed the port for Raumfeld,
>> which should be complete, while Robert worked on more driver
>> conversions and mentioned[1] that he had converted additional
>> boards in the past but did not merge it upstream. They
>> can probably point you to whatever is missing. I would expect
>> the generic PXA drivers (spi, mmc, nand, i2c, audio, fb, gpio,
>> keypad) to basically work work a correct DT description,
>> while the machine specific drivers (scoop and pcmcia mainly)
>> will need DT support in the driver.
>>
>> In addition, Linus Walleij and Marc Zyngier have both expressed
>> interest in keeping sa1100 (h3600, collie, assabet, jornada720)
>> alive, but those don't have any DT support yet and require
>> much more work. Also note that while you can now build a kernel
>> that includes support for all little-endian ARMv4T and ARMv5
>> machines, StrongARM machine still require a separate kernel
>> build.
>
> I looked into converting collie to use DT several years ago. The major
> problem was not in the StrongARM itself , but rather in the locomo
> (platform-specific ASIC) and PCMCIA. Unfortunately I abandoned that
> work ages ago. RMK didn't seem to be very interested, if I remember
> correclty.
At least locomo and sa1111 are both private to mach-sa1100
now and no longer shared with pxa, so this should get
a little easier. When I had last looking into cleaning up
sa1100, my impression was that the main work would be converting
most of the drivers to use dynamic resources instead of
hardcoded addresses and interrupts. Looking at locomo again,
my feeling is that this could remain largely unchanged,
as the locomo downstream drivers (led, keyboard, lcd)
are already abstracted enough and locomo itself can
just be an mfd or soc driver.
> I suspect that the platforms might need to be rebootstrapped from the
> ground up. This sounds like a fun project for the next Connect demo :D
>
> BTW: collie is also supported by the qemu (in fact at some point I
> mostly used qemu for debugging collie). I don't think that the LCD
> emulation works, but the rest should be mostly good.
Good to know about the LCD. The qemu support was clearly a
strong reason for keeping this machine vs the others.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-08 21:05 ` Arnd Bergmann
@ 2023-01-08 21:12 ` Dmitry Baryshkov
2023-01-08 21:20 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Dmitry Baryshkov @ 2023-01-08 21:12 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Richard Purdie, Arnd Bergmann, Robert Jarzmik, Daniel Mack,
Haojian Zhuang, linux-arm-kernel, linux-kernel, Ales Bardorfer,
Ales Snuparek, Alex Osborne, Alex Osborne, Dirk Opfer, Ian Molton,
Lennert Buytenhek, Marek Vasut, Michael Petchkovsky, Nick Bane,
Paul Parsons, Philipp Zabel, Sergey Lapin, Tomas Cech,
Linus Walleij, Marc Zyngier
вс, 8 янв. 2023 г. в 23:05, Arnd Bergmann <arnd@arndb.de>:
>
> On Fri, Jan 6, 2023, at 11:06, Dmitry Baryshkov wrote:
> > пт, 6 янв. 2023 г. в 11:47, Arnd Bergmann <arnd@arndb.de>:
> >> > Is there any conversion to DT you can easily point at as an example of
> >> > the kinds of changes needed?
> >>
> >> Robert Jarzmik and Daniel Mack worked on the conversion of the
> >> PXA platform to DT. Daniel contributed the port for Raumfeld,
> >> which should be complete, while Robert worked on more driver
> >> conversions and mentioned[1] that he had converted additional
> >> boards in the past but did not merge it upstream. They
> >> can probably point you to whatever is missing. I would expect
> >> the generic PXA drivers (spi, mmc, nand, i2c, audio, fb, gpio,
> >> keypad) to basically work work a correct DT description,
> >> while the machine specific drivers (scoop and pcmcia mainly)
> >> will need DT support in the driver.
> >>
> >> In addition, Linus Walleij and Marc Zyngier have both expressed
> >> interest in keeping sa1100 (h3600, collie, assabet, jornada720)
> >> alive, but those don't have any DT support yet and require
> >> much more work. Also note that while you can now build a kernel
> >> that includes support for all little-endian ARMv4T and ARMv5
> >> machines, StrongARM machine still require a separate kernel
> >> build.
> >
> > I looked into converting collie to use DT several years ago. The major
> > problem was not in the StrongARM itself , but rather in the locomo
> > (platform-specific ASIC) and PCMCIA. Unfortunately I abandoned that
> > work ages ago. RMK didn't seem to be very interested, if I remember
> > correclty.
>
> At least locomo and sa1111 are both private to mach-sa1100
> now and no longer shared with pxa, so this should get
> a little easier. When I had last looking into cleaning up
> sa1100, my impression was that the main work would be converting
> most of the drivers to use dynamic resources instead of
> hardcoded addresses and interrupts. Looking at locomo again,
> my feeling is that this could remain largely unchanged,
> as the locomo downstream drivers (led, keyboard, lcd)
> are already abstracted enough and locomo itself can
> just be an mfd or soc driver.
locomo has been used on Sharp Poodle, if I'm not mistaken. And sa1111
is used on the lubbock, one of the crazy devkits.
>
> > I suspect that the platforms might need to be rebootstrapped from the
> > ground up. This sounds like a fun project for the next Connect demo :D
> >
> > BTW: collie is also supported by the qemu (in fact at some point I
> > mostly used qemu for debugging collie). I don't think that the LCD
> > emulation works, but the rest should be mostly good.
>
> Good to know about the LCD. The qemu support was clearly a
> strong reason for keeping this machine vs the others.
sa1100 LCD controller was significantly different and it used some
special format for the buffers, so I just skipped it at that point.
>
> Arnd
--
With best wishes
Dmitry
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 01/27] ARM: pxa: remove unused board files
2023-01-08 21:12 ` Dmitry Baryshkov
@ 2023-01-08 21:20 ` Arnd Bergmann
0 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-08 21:20 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Richard Purdie, Arnd Bergmann, Robert Jarzmik, Daniel Mack,
Haojian Zhuang, linux-arm-kernel, linux-kernel, Ales Bardorfer,
Ales Snuparek, Alex Osborne, Alex Osborne, Dirk Opfer, Ian Molton,
Lennert Buytenhek, Marek Vasut, Michael Petchkovsky, Nick Bane,
Paul Parsons, Philipp Zabel, Sergey Lapin, Tomas Cech,
Linus Walleij, Marc Zyngier
On Sun, Jan 8, 2023, at 22:12, Dmitry Baryshkov wrote:
> вс, 8 янв. 2023 г. в 23:05, Arnd Bergmann <arnd@arndb.de>:
>>
>> At least locomo and sa1111 are both private to mach-sa1100
>> now and no longer shared with pxa, so this should get
>> a little easier. When I had last looking into cleaning up
>> sa1100, my impression was that the main work would be converting
>> most of the drivers to use dynamic resources instead of
>> hardcoded addresses and interrupts. Looking at locomo again,
>> my feeling is that this could remain largely unchanged,
>> as the locomo downstream drivers (led, keyboard, lcd)
>> are already abstracted enough and locomo itself can
>> just be an mfd or soc driver.
>
> locomo has been used on Sharp Poodle, if I'm not mistaken. And sa1111
> is used on the lubbock, one of the crazy devkits.
Right, and both of these are on the way out.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 02/27] ARM: pxa: remove irda leftover
[not found] <20230105134622.254560-1-arnd@kernel.org>
2023-01-05 13:45 ` [PATCH 01/27] ARM: pxa: remove unused board files Arnd Bergmann
@ 2023-01-05 13:45 ` Arnd Bergmann
2023-01-05 13:45 ` [PATCH 03/27] ARM: pxa: remove unused pxa3xx-ulpi Arnd Bergmann
` (24 subsequent siblings)
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:45 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann
From: Arnd Bergmann <arnd@arndb.de>
irda support was removed a long time ago, so stop
registering the devices from the pxa machine.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 <linux/platform_data/usb-pxa3xx-ulpi.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
-#include <linux/platform_data/irda-pxaficp.h>
#include "irqs.h"
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
@@ -378,47 +377,6 @@ struct platform_device pxa_device_asoc_platform = {
.id = -1,
};
-static u64 pxaficp_dmamask = ~(u32)0;
-
-static struct resource pxa_ir_resources[] = {
- [0] = {
- .start = IRQ_STUART,
- .end = IRQ_STUART,
- .flags = IORESOURCE_IRQ,
- },
- [1] = {
- .start = IRQ_ICP,
- .end = IRQ_ICP,
- .flags = IORESOURCE_IRQ,
- },
- [3] = {
- .start = 0x40800000,
- .end = 0x4080001b,
- .flags = IORESOURCE_MEM,
- },
- [4] = {
- .start = 0x40700000,
- .end = 0x40700023,
- .flags = IORESOURCE_MEM,
- },
-};
-
-struct platform_device pxa_device_ficp = {
- .name = "pxa2xx-ir",
- .id = -1,
- .num_resources = ARRAY_SIZE(pxa_ir_resources),
- .resource = pxa_ir_resources,
- .dev = {
- .dma_mask = &pxaficp_dmamask,
- .coherent_dma_mask = 0xffffffff,
- },
-};
-
-void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)
-{
- pxa_register_device(&pxa_device_ficp, info);
-}
-
static struct resource pxa_rtc_resources[] = {
[0] = {
.start = 0x40900000,
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index 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 <linux/soc/pxa/smemc.h>
-#include <linux/platform_data/irda-pxaficp.h>
void pxa2xx_clear_reset_status(unsigned int mask)
{
@@ -26,34 +25,6 @@ void pxa2xx_clear_reset_status(unsigned int mask)
RCSR = mask;
}
-static unsigned long pxa2xx_mfp_fir[] = {
- GPIO46_FICP_RXD,
- GPIO47_FICP_TXD,
-};
-
-static unsigned long pxa2xx_mfp_sir[] = {
- GPIO46_STUART_RXD,
- GPIO47_STUART_TXD,
-};
-
-static unsigned long pxa2xx_mfp_off[] = {
- GPIO46_GPIO | MFP_LPM_DRIVE_LOW,
- GPIO47_GPIO | MFP_LPM_DRIVE_LOW,
-};
-
-void pxa2xx_transceiver_mode(struct device *dev, int mode)
-{
- if (mode & IR_OFF) {
- pxa2xx_mfp_config(pxa2xx_mfp_off, ARRAY_SIZE(pxa2xx_mfp_off));
- } else if (mode & IR_SIRMODE) {
- pxa2xx_mfp_config(pxa2xx_mfp_sir, ARRAY_SIZE(pxa2xx_mfp_sir));
- } else if (mode & IR_FIRMODE) {
- pxa2xx_mfp_config(pxa2xx_mfp_fir, ARRAY_SIZE(pxa2xx_mfp_fir));
- } else
- BUG();
-}
-EXPORT_SYMBOL_GPL(pxa2xx_transceiver_mode);
-
#define MDCNFG_DRAC2(mdcnfg) (((mdcnfg) >> 21) & 0x3)
#define MDCNFG_DRAC0(mdcnfg) (((mdcnfg) >> 5) & 0x3)
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 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 <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/video-pxafb.h>
@@ -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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 03/27] ARM: pxa: remove unused pxa3xx-ulpi
[not found] <20230105134622.254560-1-arnd@kernel.org>
2023-01-05 13:45 ` [PATCH 01/27] ARM: pxa: remove unused board files Arnd Bergmann
2023-01-05 13:45 ` [PATCH 02/27] ARM: pxa: remove irda leftover Arnd Bergmann
@ 2023-01-05 13:45 ` Arnd Bergmann
2023-01-05 14:55 ` Greg Kroah-Hartman
2023-01-05 13:45 ` [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support Arnd Bergmann
` (23 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:45 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Alan Stern, Greg Kroah-Hartman, linux-usb
From: Arnd Bergmann <arnd@arndb.de>
This was only used by the cm-x300 board, which is now gone.
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 <linux/soc/pxa/cpu.h>
#include "udc.h"
-#include <linux/platform_data/usb-pxa3xx-ulpi.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#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 <linux/of_platform.h>
#include <linux/of_gpio.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
-#include <linux/platform_data/usb-pxa3xx-ulpi.h>
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h>
#include <linux/signal.h>
@@ -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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 03/27] ARM: pxa: remove unused pxa3xx-ulpi
2023-01-05 13:45 ` [PATCH 03/27] ARM: pxa: remove unused pxa3xx-ulpi Arnd Bergmann
@ 2023-01-05 14:55 ` Greg Kroah-Hartman
0 siblings, 0 replies; 69+ messages in thread
From: Greg Kroah-Hartman @ 2023-01-05 14:55 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Alan Stern, linux-usb
On Thu, Jan 05, 2023 at 02:45:58PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> This was only used by the cm-x300 board, which is now gone.
>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-usb@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> 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
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (2 preceding siblings ...)
2023-01-05 13:45 ` [PATCH 03/27] ARM: pxa: remove unused pxa3xx-ulpi Arnd Bergmann
@ 2023-01-05 13:45 ` Arnd Bergmann
2023-01-05 14:59 ` Ulf Hansson
` (2 more replies)
2023-01-05 13:46 ` [PATCH 05/27] ARM: pxa: prune unused device support Arnd Bergmann
` (22 subsequent siblings)
26 siblings, 3 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:45 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Michael Turquette, Stephen Boyd, Rafael J. Wysocki,
Viresh Kumar, Ulf Hansson, Dominik Brodowski, linux-clk, linux-pm,
linux-mmc
From: Arnd Bergmann <arnd@arndb.de>
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 <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: linux-clk@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support
2023-01-05 13:45 ` [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support Arnd Bergmann
@ 2023-01-05 14:59 ` Ulf Hansson
2023-01-06 2:19 ` Viresh Kumar
2023-01-08 8:49 ` Robert Jarzmik
2 siblings, 0 replies; 69+ messages in thread
From: Ulf Hansson @ 2023-01-05 14:59 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Michael Turquette, Stephen Boyd,
Rafael J. Wysocki, Viresh Kumar, Dominik Brodowski, linux-clk,
linux-pm, linux-mmc
On Thu, 5 Jan 2023 at 14:46, Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> Cc: linux-clk@vger.kernel.org
> Cc: linux-pm@vger.kernel.org
> Cc: linux-mmc@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
Kind regards
Uffe
> ---
> 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
> --
> 2.39.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support
2023-01-05 13:45 ` [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support Arnd Bergmann
2023-01-05 14:59 ` Ulf Hansson
@ 2023-01-06 2:19 ` Viresh Kumar
2023-01-08 8:49 ` Robert Jarzmik
2 siblings, 0 replies; 69+ messages in thread
From: Viresh Kumar @ 2023-01-06 2:19 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Michael Turquette, Stephen Boyd,
Rafael J. Wysocki, Ulf Hansson, Dominik Brodowski, linux-clk,
linux-pm, linux-mmc
On 05-01-23, 14:45, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> Cc: linux-clk@vger.kernel.org
> Cc: linux-pm@vger.kernel.org
> Cc: linux-mmc@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/cpufreq/pxa3xx-cpufreq.c | 21 +-
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
--
viresh
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support
2023-01-05 13:45 ` [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support Arnd Bergmann
2023-01-05 14:59 ` Ulf Hansson
2023-01-06 2:19 ` Viresh Kumar
@ 2023-01-08 8:49 ` Robert Jarzmik
2023-01-08 13:40 ` Arnd Bergmann
2 siblings, 1 reply; 69+ messages in thread
From: Robert Jarzmik @ 2023-01-08 8:49 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Michael Turquette, Stephen Boyd,
Rafael J. Wysocki, Viresh Kumar, Ulf Hansson, Dominik Brodowski,
linux-clk, linux-pm, linux-mmc
Arnd Bergmann <arnd@kernel.org> writes:
> 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.
Hi Arnd,
Here you're dropping pxa variant support. For the currently
"partly" working
boards in devicetree, such a zylonite, this will break their
current support.
For example the zylonite I have which is working on DT has a
pxa310 variant.
The cm-x300, which also works in DT, has a pxa320 variant.
What these boards need is their IO mappings and cpufreq to still
work after
your serie in DT. What bothers me are the changes to :
- drivers/clk/pxa/clk-pxa3xx.c
- drivers/cpufreq/pxa3xx-cpufreq.c
Here the clock changes will probably remove the clock provided to
specific
pxa310/pxa320 drivers for example.
I don't know how you want to proceed, yet this change will break
some pxa3xx
platforms.
Cheers.
--
Robert
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support
2023-01-08 8:49 ` Robert Jarzmik
@ 2023-01-08 13:40 ` Arnd Bergmann
2023-01-09 14:18 ` Arnd Bergmann
2023-01-12 17:37 ` Robert Jarzmik
0 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-08 13:40 UTC (permalink / raw)
To: Robert Jarzmik, Arnd Bergmann
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Michael Turquette, Stephen Boyd, Rafael J . Wysocki, Viresh Kumar,
Ulf Hansson, Dominik Brodowski, linux-clk, linux-pm,
linux-mmc @ vger . kernel . org
On Sun, Jan 8, 2023, at 09:49, Robert Jarzmik wrote:
> Arnd Bergmann <arnd@kernel.org> writes:
>> 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.
>
> Hi Arnd,
>
> Here you're dropping pxa variant support. For the currently
> "partly" working boards in devicetree, such a zylonite, this
> will break their current support.
>
> For example the zylonite I have which is working on DT has a
> pxa310 variant.
> The cm-x300, which also works in DT, has a pxa320 variant.
>
> What these boards need is their IO mappings and cpufreq to still
> work after
> your serie in DT. What bothers me are the changes to :
> - drivers/clk/pxa/clk-pxa3xx.c
> - drivers/cpufreq/pxa3xx-cpufreq.c
>
> Here the clock changes will probably remove the clock provided to
> specific
> pxa310/pxa320 drivers for example.
>
> I don't know how you want to proceed, yet this change will break
> some pxa3xx platforms.
Hi Robert,
Thanks for pointing this out, I thought that I had caught
all the missing dependencies ones after you pointed out
the AC97_BUS_NEW that I fixed in patch 14.
From what I can tell, commit b5aaaa666a85 ("ARM: pxa: add
Kconfig dependencies for ATAGS based boards"), the
PXA310/PXA320 DT support became dead code because
MACH_PXA3XX_DT only selects CPU_PXA300, so if it worked
before that commit, it now needs CONFIG_UNUSED_BOARD_FILES
and CONFIG_EXPERT as well as enabling one of the legacy
board files with the corresponding chip support.
If that's all you think is missing, I can add this
trivial patch as well and rework the series to not
drop code that depends on PXA310/PXA320:
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -45,6 +45,8 @@ config MACH_PXA27X_DT
config MACH_PXA3XX_DT
bool "Support PXA3xx platforms from device tree"
select CPU_PXA300
+ select CPU_PXA310
+ select CPU_PXA320
select PINCTRL
select POWER_SUPPLY
select PXA3xx
Can you have a look at the other patches to see if there
are more removed drivers or platform bits that are currently
dead code but are actually required?
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support
2023-01-08 13:40 ` Arnd Bergmann
@ 2023-01-09 14:18 ` Arnd Bergmann
2023-01-12 17:37 ` Robert Jarzmik
1 sibling, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-09 14:18 UTC (permalink / raw)
To: Arnd Bergmann, Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Michael Turquette, Stephen Boyd, Rafael J . Wysocki, Viresh Kumar,
Ulf Hansson, Dominik Brodowski, linux-clk, linux-pm,
linux-mmc @ vger . kernel . org
On Sun, Jan 8, 2023, at 14:40, Arnd Bergmann wrote:
> On Sun, Jan 8, 2023, at 09:49, Robert Jarzmik wrote:
>> Arnd Bergmann <arnd@kernel.org> writes:
> If that's all you think is missing, I can add this
> trivial patch as well and rework the series to not
> drop code that depends on PXA310/PXA320:
>
> --- a/arch/arm/mach-pxa/Kconfig
> +++ b/arch/arm/mach-pxa/Kconfig
> @@ -45,6 +45,8 @@ config MACH_PXA27X_DT
> config MACH_PXA3XX_DT
> bool "Support PXA3xx platforms from device tree"
> select CPU_PXA300
> + select CPU_PXA310
> + select CPU_PXA320
> select PINCTRL
> select POWER_SUPPLY
> select PXA3xx
I've put this in a separate branch now and will submit
it as a bugfix along with two other patches for issues
I found while testing omap1.
I've dropped the pxa310/320 removal now, but kept
the pxa93x removal, since that has no DT support at
all and remains dead code.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support
2023-01-08 13:40 ` Arnd Bergmann
2023-01-09 14:18 ` Arnd Bergmann
@ 2023-01-12 17:37 ` Robert Jarzmik
1 sibling, 0 replies; 69+ messages in thread
From: Robert Jarzmik @ 2023-01-12 17:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Arnd Bergmann, Daniel Mack, Haojian Zhuang,
linux-arm-kernel, linux-kernel, Michael Turquette, Stephen Boyd,
Rafael J . Wysocki, Viresh Kumar, Ulf Hansson, Dominik Brodowski,
linux-clk, linux-pm, linux-mmc @ vger . kernel . org
"Arnd Bergmann" <arnd@arndb.de> writes:
> Hi Robert,
Hi Arnd,
> Thanks for pointing this out, I thought that I had caught
> all the missing dependencies ones after you pointed out
> the AC97_BUS_NEW that I fixed in patch 14.
Sorry I've not seen this one in my previous review.
> From what I can tell, commit b5aaaa666a85 ("ARM: pxa: add
> Kconfig dependencies for ATAGS based boards"), the
> PXA310/PXA320 DT support became dead code because
> MACH_PXA3XX_DT only selects CPU_PXA300, so if it worked
> before that commit, it now needs CONFIG_UNUSED_BOARD_FILES
> and CONFIG_EXPERT as well as enabling one of the legacy
> board files with the corresponding chip support.
>
> If that's all you think is missing, I can add this
> trivial patch as well and rework the series to not
> drop code that depends on PXA310/PXA320:
Yes, that would be great !
> Can you have a look at the other patches to see if there
> are more removed drivers or platform bits that are currently
> dead code but are actually required?
Yes, I've been through your whole serie and that's the
last thing I have identified. I've read carefully all the
patches now, and the whole serie looks good to me.
So with this patch and keeping the clocks and cpufreq
parts for pxa3*0, you can add everywhere my :
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Cheers.
--
Robert
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 05/27] ARM: pxa: prune unused device support
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (3 preceding siblings ...)
2023-01-05 13:45 ` [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 06/27] power: remove z2_battery driver Arnd Bergmann
` (21 subsequent siblings)
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann
From: Arnd Bergmann <arnd@arndb.de>
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 <arnd@arndb.de>
---
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 <linux/platform_data/mmc-pxamci.h>
#include "irqs.h"
#include <linux/platform_data/usb-ohci-pxa27x.h>
-#include <linux/platform_data/keypad-pxa27x.h>
-#include <linux/platform_data/media/camera-pxa.h>
-#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/mmp_dma.h>
-#include <linux/platform_data/mtd-nand-pxa3xx.h>
#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;
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 06/27] power: remove z2_battery driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (4 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 05/27] ARM: pxa: prune unused device support Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 16:35 ` Sebastian Reichel
2023-01-05 13:46 ` [PATCH 07/27] power: remove tosa_battery driver Arnd Bergmann
` (20 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, linux-pm, Peter Edwards, Sebastian Reichel
From: Arnd Bergmann <arnd@arndb.de>
The PXA z2 platform is gone, and this driver is now orphaned.
Cc: linux-pm@vger.kernel.org
Cc: Peter Edwards <sweetlilmre@gmail.com>
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 06/27] power: remove z2_battery driver
2023-01-05 13:46 ` [PATCH 06/27] power: remove z2_battery driver Arnd Bergmann
@ 2023-01-05 16:35 ` Sebastian Reichel
0 siblings, 0 replies; 69+ messages in thread
From: Sebastian Reichel @ 2023-01-05 16:35 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, linux-pm, Peter Edwards
[-- Attachment #1.1: Type: text/plain, Size: 2527 bytes --]
Hi,
On Thu, Jan 05, 2023 at 02:46:01PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The PXA z2 platform is gone, and this driver is now orphaned.
>
> Cc: linux-pm@vger.kernel.org
> Cc: Peter Edwards <sweetlilmre@gmail.com>
> Cc: Sebastian Reichel <sre@kernel.org>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
This should go through the same tree as the patch removing
arch/arm/mach-pxa/z2.c, which includes z2_battery.h removed
by this patch, so:
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-- Sebastian
> 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
> --
> 2.39.0
>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 07/27] power: remove tosa_battery driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (5 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 06/27] power: remove z2_battery driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 16:42 ` Sebastian Reichel
2023-01-05 13:46 ` [PATCH 08/27] ata: remove palmld pata driver Arnd Bergmann
` (19 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Sebastian Reichel, linux-pm
From: Arnd Bergmann <arnd@arndb.de>
The PXA tosa machine is removed, so this driver is no longer
in use.
Cc: Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 07/27] power: remove tosa_battery driver
2023-01-05 13:46 ` [PATCH 07/27] power: remove tosa_battery driver Arnd Bergmann
@ 2023-01-05 16:42 ` Sebastian Reichel
2023-01-05 17:16 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Sebastian Reichel @ 2023-01-05 16:42 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, linux-pm
[-- Attachment #1.1: Type: text/plain, Size: 2364 bytes --]
Hi,
On Thu, Jan 05, 2023 at 02:46:02PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The PXA tosa machine is removed, so this driver is no longer
> in use.
>
> Cc: Sebastian Reichel <sre@kernel.org>
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
I suppose I could queue this directly, but feel free to just
take it with the other two power-supply driver removal patches:
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-- Sebastian
> 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
> --
> 2.39.0
>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 07/27] power: remove tosa_battery driver
2023-01-05 16:42 ` Sebastian Reichel
@ 2023-01-05 17:16 ` Arnd Bergmann
0 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 17:16 UTC (permalink / raw)
To: Sebastian Reichel, Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, linux-pm
On Thu, Jan 5, 2023, at 17:42, Sebastian Reichel wrote:
> Hi,
>
> On Thu, Jan 05, 2023 at 02:46:02PM +0100, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> The PXA tosa machine is removed, so this driver is no longer
>> in use.
>>
>> Cc: Sebastian Reichel <sre@kernel.org>
>> Cc: linux-pm@vger.kernel.org
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>
> I suppose I could queue this directly, but feel free to just
> take it with the other two power-supply driver removal patches:
>
> Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Thanks! Yes, I'll just keep it all together.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 08/27] ata: remove palmld pata driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (6 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 07/27] power: remove tosa_battery driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-06 6:25 ` Damien Le Moal
2023-01-11 17:37 ` Sergey Shtylyov
2023-01-05 13:46 ` [PATCH 09/27] backlight: remove pxa tosa support Arnd Bergmann
` (18 subsequent siblings)
26 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Alessandro Zummo, Marek Vasut, Damien Le Moal,
Sergey Shtylyov, linux-ide
From: Arnd Bergmann <arnd@arndb.de>
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 <a.zummo@towertech.it>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Cc: Sergey Shtylyov <s.shtylyov@omp.ru>
Cc: linux-kernel@vger.kernel.org
Cc: linux-ide@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 08/27] ata: remove palmld pata driver
2023-01-05 13:46 ` [PATCH 08/27] ata: remove palmld pata driver Arnd Bergmann
@ 2023-01-06 6:25 ` Damien Le Moal
2023-01-11 17:37 ` Sergey Shtylyov
1 sibling, 0 replies; 69+ messages in thread
From: Damien Le Moal @ 2023-01-06 6:25 UTC (permalink / raw)
To: Arnd Bergmann, Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Alessandro Zummo, Marek Vasut, Sergey Shtylyov,
linux-ide
On 1/5/23 22:46, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <a.zummo@towertech.it>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>
> Cc: Sergey Shtylyov <s.shtylyov@omp.ru>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-ide@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Feel free to queue this through your tree. Thanks !
> ---
> 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
--
Damien Le Moal
Western Digital Research
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 08/27] ata: remove palmld pata driver
2023-01-05 13:46 ` [PATCH 08/27] ata: remove palmld pata driver Arnd Bergmann
2023-01-06 6:25 ` Damien Le Moal
@ 2023-01-11 17:37 ` Sergey Shtylyov
1 sibling, 0 replies; 69+ messages in thread
From: Sergey Shtylyov @ 2023-01-11 17:37 UTC (permalink / raw)
To: Arnd Bergmann, Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Alessandro Zummo, Marek Vasut, Damien Le Moal,
linux-ide
Hello!
On 1/5/23 4:46 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <a.zummo@towertech.it>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>
> Cc: Sergey Shtylyov <s.shtylyov@omp.ru>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-ide@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Better late than never? :-)
[...]
MBR, Sergey
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 09/27] backlight: remove pxa tosa support
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (7 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 08/27] ata: remove palmld pata driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 14:23 ` Daniel Thompson
2023-01-20 14:00 ` Lee Jones
2023-01-05 13:46 ` [PATCH 10/27] input: remove pxa930_trkball driver Arnd Bergmann
` (17 subsequent siblings)
26 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Lee Jones, Daniel Thompson, Jingoo Han,
linux-fbdev
From: Arnd Bergmann <arnd@arndb.de>
The PXA tosa machine was removed, so this backlight driver is no
longer needed.
Cc: Lee Jones <lee@kernel.org>
Cc: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 09/27] backlight: remove pxa tosa support
2023-01-05 13:46 ` [PATCH 09/27] backlight: remove pxa tosa support Arnd Bergmann
@ 2023-01-05 14:23 ` Daniel Thompson
2023-01-20 14:00 ` Lee Jones
1 sibling, 0 replies; 69+ messages in thread
From: Daniel Thompson @ 2023-01-05 14:23 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Lee Jones, Jingoo Han, linux-fbdev
On Thu, Jan 05, 2023 at 02:46:04PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The PXA tosa machine was removed, so this backlight driver is no
> longer needed.
>
> Cc: Lee Jones <lee@kernel.org>
> Cc: Daniel Thompson <daniel.thompson@linaro.org>
> Cc: Jingoo Han <jingoohan1@gmail.com>
> Cc: linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER)
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
OK by me ;-).
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Daniel.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 09/27] backlight: remove pxa tosa support
2023-01-05 13:46 ` [PATCH 09/27] backlight: remove pxa tosa support Arnd Bergmann
2023-01-05 14:23 ` Daniel Thompson
@ 2023-01-20 14:00 ` Lee Jones
1 sibling, 0 replies; 69+ messages in thread
From: Lee Jones @ 2023-01-20 14:00 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Daniel Thompson, Jingoo Han,
linux-fbdev
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The PXA tosa machine was removed, so this backlight driver is no
> longer needed.
>
> Cc: Lee Jones <lee@kernel.org>
> Cc: Daniel Thompson <daniel.thompson@linaro.org>
> Cc: Jingoo Han <jingoohan1@gmail.com>
> Cc: linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER)
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> 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
Applied, thanks
--
Lee Jones [李琼斯]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 10/27] input: remove pxa930_trkball driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (8 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 09/27] backlight: remove pxa tosa support Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 11/27] input: remove pxa930_rotary keyboard driver Arnd Bergmann
` (16 subsequent siblings)
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Dmitry Torokhov, linux-input
From: Arnd Bergmann <arnd@arndb.de>
The pxa930 SoC support is getting removed, and no upstream
board ever provided the trkball device that this driver
relies on.
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 11/27] input: remove pxa930_rotary keyboard driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (9 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 10/27] input: remove pxa930_trkball driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 12/27] input: remove zylonite touchscreen driver Arnd Bergmann
` (15 subsequent siblings)
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Dmitry Torokhov, linux-input
From: Arnd Bergmann <arnd@arndb.de>
The pxa930 platform is getting removed and no upstream machine
ever defined a rotary keyboard device.
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 12/27] input: remove zylonite touchscreen driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (10 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 11/27] input: remove pxa930_rotary keyboard driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 13/27] pcmcia: remove unused pxa/sa1100 drivers Arnd Bergmann
` (14 subsequent siblings)
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Dmitry Torokhov, Mark Brown, linux-input
From: Arnd Bergmann <arnd@arndb.de>
The PXA zylonite platform was removed, so this driver has no
remaining users.
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-input@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 13/27] pcmcia: remove unused pxa/sa1100 drivers
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (11 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 12/27] input: remove zylonite touchscreen driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 14/27] ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable Arnd Bergmann
` (13 subsequent siblings)
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Dominik Brodowski
From: Arnd Bergmann <arnd@arndb.de>
A number of boards got removed, so this code is now orphaned.
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 14/27] ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (12 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 13/27] pcmcia: remove unused pxa/sa1100 drivers Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 15/27] ASoC: pxa: remove unused board support Arnd Bergmann
` (12 subsequent siblings)
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Liam Girdwood, Mark Brown, Jaroslav Kysela,
Takashi Iwai, alsa-devel
From: Arnd Bergmann <arnd@arndb.de>
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 <robert.jarzmik@free.fr>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 15/27] ASoC: pxa: remove unused board support
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (13 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 14/27] ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-10 13:58 ` Mark Brown
2023-01-05 13:46 ` [PATCH 16/27] power: remove pda_power supply driver Arnd Bergmann
` (11 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Ian Molton, Ken McGuire, Marek Vasut,
Mike Rapoport, Liam Girdwood, Mark Brown, Jaroslav Kysela,
Takashi Iwai, alsa-devel
From: Arnd Bergmann <arnd@arndb.de>
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 <spyro@f2s.com>
Cc: Ken McGuire <kenm@desertweyr.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 15/27] ASoC: pxa: remove unused board support
2023-01-05 13:46 ` [PATCH 15/27] ASoC: pxa: remove unused board support Arnd Bergmann
@ 2023-01-10 13:58 ` Mark Brown
0 siblings, 0 replies; 69+ messages in thread
From: Mark Brown @ 2023-01-10 13:58 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Ian Molton, Ken McGuire, Marek Vasut,
Mike Rapoport, Liam Girdwood, Jaroslav Kysela, Takashi Iwai,
alsa-devel
[-- Attachment #1.1: Type: text/plain, Size: 400 bytes --]
On Thu, Jan 05, 2023 at 02:46:10PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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.
This doesn't apply against current code, please check and resend.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 16/27] power: remove pda_power supply driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (14 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 15/27] ASoC: pxa: remove unused board support Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 16:39 ` Sebastian Reichel
2023-01-05 13:46 ` [PATCH 17/27] rtc: remove v3020 driver Arnd Bergmann
` (10 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Sebastian Reichel, Anton Vorontsov, linux-pm
From: Arnd Bergmann <arnd@arndb.de>
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 <sre@kernel.org>
Cc: Anton Vorontsov <cbou@mail.ru>
Cc: linux-pm@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 <linux/of_fdt.h>
#include <linux/of.h>
#include <linux/of_platform.h>
-#include <linux/pda_power.h>
#include <linux/platform_device.h>
#include <linux/serial_8250.h>
#include <linux/slab.h>
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 16/27] power: remove pda_power supply driver
2023-01-05 13:46 ` [PATCH 16/27] power: remove pda_power supply driver Arnd Bergmann
@ 2023-01-05 16:39 ` Sebastian Reichel
0 siblings, 0 replies; 69+ messages in thread
From: Sebastian Reichel @ 2023-01-05 16:39 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Anton Vorontsov, linux-pm
[-- Attachment #1.1: Type: text/plain, Size: 3963 bytes --]
Hi,
On Thu, Jan 05, 2023 at 02:46:11PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <sre@kernel.org>
> Cc: Anton Vorontsov <cbou@mail.ru>
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
This needs to go through the same tree as the patch removing the PXA
boards, since they include pda_power.h:
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-- Sebastian
> 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 <linux/of_fdt.h>
> #include <linux/of.h>
> #include <linux/of_platform.h>
> -#include <linux/pda_power.h>
> #include <linux/platform_device.h>
> #include <linux/serial_8250.h>
> #include <linux/slab.h>
> 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
> --
> 2.39.0
>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 17/27] rtc: remove v3020 driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (15 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 16/27] power: remove pda_power supply driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 18/27] mfd: remove toshiba tmio drivers Arnd Bergmann
` (9 subsequent siblings)
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Alessandro Zummo, Alexandre Belloni, linux-rtc
From: Arnd Bergmann <arnd@arndb.de>
The v3020 RTC driver was exclusively used by the now removed
cm-x300.c machine.
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-rtc@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 18/27] mfd: remove toshiba tmio drivers
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (16 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 17/27] rtc: remove v3020 driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-20 14:55 ` Lee Jones
2023-01-05 13:46 ` [PATCH 19/27] mfd: remove ucb1400 support Arnd Bergmann
` (8 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Lee Jones, Wolfram Sang, linux-mmc,
linux-renesas-soc
From: Arnd Bergmann <arnd@arndb.de>
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 <lee@kernel.org>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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;
/*
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 18/27] mfd: remove toshiba tmio drivers
2023-01-05 13:46 ` [PATCH 18/27] mfd: remove toshiba tmio drivers Arnd Bergmann
@ 2023-01-20 14:55 ` Lee Jones
0 siblings, 0 replies; 69+ messages in thread
From: Lee Jones @ 2023-01-20 14:55 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Wolfram Sang, linux-mmc,
linux-renesas-soc
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <lee@kernel.org>
> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-renesas-soc@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> 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
Applied, thanks
--
Lee Jones [李琼斯]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 19/27] mfd: remove ucb1400 support
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (17 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 18/27] mfd: remove toshiba tmio drivers Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-20 14:18 ` Lee Jones
2023-01-05 13:46 ` [PATCH 20/27] mtd: remove tmio_nand driver Arnd Bergmann
` (7 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Linus Walleij, Bartosz Golaszewski,
Dmitry Torokhov, Lee Jones, Jaroslav Kysela, Takashi Iwai,
Marek Vasut, linux-gpio, linux-input, alsa-devel
From: Arnd Bergmann <arnd@arndb.de>
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 <linus.walleij@linaro.org>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Lee Jones <lee@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Marek Vasut <marex@denx.de>
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 <arnd@arndb.de>
---
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;
-}
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 19/27] mfd: remove ucb1400 support
2023-01-05 13:46 ` [PATCH 19/27] mfd: remove ucb1400 support Arnd Bergmann
@ 2023-01-20 14:18 ` Lee Jones
2023-01-20 14:27 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Lee Jones @ 2023-01-20 14:18 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Linus Walleij, Bartosz Golaszewski,
Dmitry Torokhov, Jaroslav Kysela, Takashi Iwai, Marek Vasut,
linux-gpio, linux-input, alsa-devel
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <linus.walleij@linaro.org>
> Cc: Bartosz Golaszewski <brgl@bgdev.pl>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Lee Jones <lee@kernel.org>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.com>
> Cc: Marek Vasut <marex@denx.de>
> 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 <arnd@arndb.de>
> ---
> 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 ---
Happy to take this with the relevant Acks.
I assume an immutable branch is necessary.
--
Lee Jones [李琼斯]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 19/27] mfd: remove ucb1400 support
2023-01-20 14:18 ` Lee Jones
@ 2023-01-20 14:27 ` Arnd Bergmann
2023-01-20 14:57 ` Lee Jones
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-20 14:27 UTC (permalink / raw)
To: Lee Jones, Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Linus Walleij, Bartosz Golaszewski, Dmitry Torokhov,
Jaroslav Kysela, Takashi Iwai, Marek Vasut,
open list:GPIO SUBSYSTEM, linux-input, alsa-devel
On Fri, Jan 20, 2023, at 15:18, Lee Jones wrote:
> On Thu, 05 Jan 2023, Arnd Bergmann wrote:
>
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> 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 <linus.walleij@linaro.org>
>> Cc: Bartosz Golaszewski <brgl@bgdev.pl>
>> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>> Cc: Lee Jones <lee@kernel.org>
>> Cc: Jaroslav Kysela <perex@perex.cz>
>> Cc: Takashi Iwai <tiwai@suse.com>
>> Cc: Marek Vasut <marex@denx.de>
>> 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 <arnd@arndb.de>
>> ---
>> 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 ---
>
> Happy to take this with the relevant Acks.
>
> I assume an immutable branch is necessary.
I actually have this and the other bits from the series
in my the soc tree already, aside from one bufix patch
that Mark Brown picked up in the ASoC tree. If it's ok
with you, I'd just leave it like this and submit
everything together.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 19/27] mfd: remove ucb1400 support
2023-01-20 14:27 ` Arnd Bergmann
@ 2023-01-20 14:57 ` Lee Jones
0 siblings, 0 replies; 69+ messages in thread
From: Lee Jones @ 2023-01-20 14:57 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Arnd Bergmann, Robert Jarzmik, Daniel Mack, Haojian Zhuang,
linux-arm-kernel, linux-kernel, Linus Walleij,
Bartosz Golaszewski, Dmitry Torokhov, Jaroslav Kysela,
Takashi Iwai, Marek Vasut, open list:GPIO SUBSYSTEM, linux-input,
alsa-devel
On Fri, 20 Jan 2023, Arnd Bergmann wrote:
> On Fri, Jan 20, 2023, at 15:18, Lee Jones wrote:
> > On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> >
> >> From: Arnd Bergmann <arnd@arndb.de>
> >>
> >> 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 <linus.walleij@linaro.org>
> >> Cc: Bartosz Golaszewski <brgl@bgdev.pl>
> >> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> >> Cc: Lee Jones <lee@kernel.org>
> >> Cc: Jaroslav Kysela <perex@perex.cz>
> >> Cc: Takashi Iwai <tiwai@suse.com>
> >> Cc: Marek Vasut <marex@denx.de>
> >> 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 <arnd@arndb.de>
> >> ---
> >> 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 ---
> >
> > Happy to take this with the relevant Acks.
> >
> > I assume an immutable branch is necessary.
>
> I actually have this and the other bits from the series
> in my the soc tree already, aside from one bufix patch
> that Mark Brown picked up in the ASoC tree. If it's ok
> with you, I'd just leave it like this and submit
> everything together.
For this one, it's fine.
Acked-by: Lee Jones <lee@kernel.org>
I already applied the others.
--
Lee Jones [李琼斯]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 20/27] mtd: remove tmio_nand driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (18 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 19/27] mfd: remove ucb1400 support Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-07 15:41 ` Miquel Raynal
2023-01-05 13:46 ` [PATCH 21/27] mmc: remove tmio_mmc driver Arnd Bergmann
` (6 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, linux-mtd
From: Arnd Bergmann <arnd@arndb.de>
With the TMIO MFD drivers gone, the NAND support is also
obsolete and can be removed.
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 20/27] mtd: remove tmio_nand driver
2023-01-05 13:46 ` [PATCH 20/27] mtd: remove tmio_nand driver Arnd Bergmann
@ 2023-01-07 15:41 ` Miquel Raynal
0 siblings, 0 replies; 69+ messages in thread
From: Miquel Raynal @ 2023-01-07 15:41 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Richard Weinberger,
Vignesh Raghavendra, linux-mtd
Hi Arnd,
arnd@kernel.org wrote on Thu, 5 Jan 2023 14:46:15 +0100:
> From: Arnd Bergmann <arnd@arndb.de>
>
> With the TMIO MFD drivers gone, the NAND support is also
> obsolete and can be removed.
>
> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Vignesh Raghavendra <vigneshr@ti.com>
> Cc: linux-mtd@lists.infradead.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
The patch did no apply as-is, so I did the removal manually while
applying to mtd/next.
Thanks!
Miquèl
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 21/27] mmc: remove tmio_mmc driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (19 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 20/27] mtd: remove tmio_nand driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 15:01 ` Ulf Hansson
2023-01-05 15:14 ` Wolfram Sang
2023-01-05 13:46 ` [PATCH 22/27] fbdev: remove tmiofb driver Arnd Bergmann
` (5 subsequent siblings)
26 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Ian Molton, Ulf Hansson, Wolfram Sang, linux-mmc,
linux-renesas-soc
From: Arnd Bergmann <arnd@arndb.de>
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 <spyro@f2s.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: linux-mmc@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 21/27] mmc: remove tmio_mmc driver
2023-01-05 13:46 ` [PATCH 21/27] mmc: remove tmio_mmc driver Arnd Bergmann
@ 2023-01-05 15:01 ` Ulf Hansson
2023-01-05 15:44 ` Arnd Bergmann
2023-01-05 15:14 ` Wolfram Sang
1 sibling, 1 reply; 69+ messages in thread
From: Ulf Hansson @ 2023-01-05 15:01 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Ian Molton, Wolfram Sang, linux-mmc,
linux-renesas-soc
On Thu, 5 Jan 2023 at 14:47, Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <spyro@f2s.com>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-renesas-soc@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
I intend to pick this up via my mmc tree, just awaiting an ack from Wolfram.
Kind regards
Uffe
> ---
> 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
> --
> 2.39.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 21/27] mmc: remove tmio_mmc driver
2023-01-05 15:01 ` Ulf Hansson
@ 2023-01-05 15:44 ` Arnd Bergmann
2023-01-16 10:48 ` Ulf Hansson
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 15:44 UTC (permalink / raw)
To: Ulf Hansson, Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Ian Molton, Wolfram Sang,
linux-mmc @ vger . kernel . org, Linux-Renesas
On Thu, Jan 5, 2023, at 16:01, Ulf Hansson wrote:
> On Thu, 5 Jan 2023 at 14:47, Arnd Bergmann <arnd@kernel.org> wrote:
>>
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> 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 <spyro@f2s.com>
>> Cc: Ulf Hansson <ulf.hansson@linaro.org>
>> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
>> Cc: linux-mmc@vger.kernel.org
>> Cc: linux-renesas-soc@vger.kernel.org
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> I intend to pick this up via my mmc tree, just awaiting an ack from Wolfram.
Actually I think it would be easier to just take this through
my tree along with the rest of the series, unless you expect
conflicts with other patches.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread* Re: [PATCH 21/27] mmc: remove tmio_mmc driver
2023-01-05 15:44 ` Arnd Bergmann
@ 2023-01-16 10:48 ` Ulf Hansson
0 siblings, 0 replies; 69+ messages in thread
From: Ulf Hansson @ 2023-01-16 10:48 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Arnd Bergmann, Robert Jarzmik, Daniel Mack, Haojian Zhuang,
linux-arm-kernel, linux-kernel, Ian Molton, Wolfram Sang,
linux-mmc @ vger . kernel . org, Linux-Renesas
On Thu, 5 Jan 2023 at 16:44, Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Thu, Jan 5, 2023, at 16:01, Ulf Hansson wrote:
> > On Thu, 5 Jan 2023 at 14:47, Arnd Bergmann <arnd@kernel.org> wrote:
> >>
> >> From: Arnd Bergmann <arnd@arndb.de>
> >>
> >> 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 <spyro@f2s.com>
> >> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> >> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
> >> Cc: linux-mmc@vger.kernel.org
> >> Cc: linux-renesas-soc@vger.kernel.org
> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >
> > I intend to pick this up via my mmc tree, just awaiting an ack from Wolfram.
>
> Actually I think it would be easier to just take this through
> my tree along with the rest of the series, unless you expect
> conflicts with other patches.
If conflicts, those should probably be easy to resolve, so please go
ahead and take your own route.
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 21/27] mmc: remove tmio_mmc driver
2023-01-05 13:46 ` [PATCH 21/27] mmc: remove tmio_mmc driver Arnd Bergmann
2023-01-05 15:01 ` Ulf Hansson
@ 2023-01-05 15:14 ` Wolfram Sang
1 sibling, 0 replies; 69+ messages in thread
From: Wolfram Sang @ 2023-01-05 15:14 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Ian Molton, Ulf Hansson, linux-mmc,
linux-renesas-soc
[-- Attachment #1.1: Type: text/plain, Size: 987 bytes --]
On Thu, Jan 05, 2023 at 02:46:16PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <spyro@f2s.com>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-renesas-soc@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
I trust Arnd's research that the driver becomes unused after the PXA
removal. I can add to it that the plain TMIO driver hasn't seen any
functional update in 10 years maybe. Most modifications were tree-wide
cleanups or adjustments because the TMIO core changed. It will be
interesting to see what cleanups can be done once this driver is gone.
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 22/27] fbdev: remove tmiofb driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (20 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 21/27] mmc: remove tmio_mmc driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-06 9:47 ` Helge Deller
2023-01-05 13:46 ` [PATCH 23/27] fbdev: remove w100fb driver Arnd Bergmann
` (4 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Helge Deller, linux-fbdev, dri-devel
From: Arnd Bergmann <arnd@arndb.de>
With the TMIO MFD support removed, the framebuffer driver can be
removed as well.
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 <file:Documentation/kbuild/modules.rst>.
-
- 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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 22/27] fbdev: remove tmiofb driver
2023-01-05 13:46 ` [PATCH 22/27] fbdev: remove tmiofb driver Arnd Bergmann
@ 2023-01-06 9:47 ` Helge Deller
2023-01-06 11:25 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Helge Deller @ 2023-01-06 9:47 UTC (permalink / raw)
To: Arnd Bergmann, Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, linux-fbdev, dri-devel
On 1/5/23 14:46, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> With the TMIO MFD support removed, the framebuffer driver can be
> removed as well.
>
> Cc: Helge Deller <deller@gmx.de>
> Cc: linux-fbdev@vger.kernel.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Helge Deller <deller@gmx.de>
Arnd, I assume you will push the whole series through the ARM tree
(which I'd prefer) ?
Helge
> ---
> 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 <file:Documentation/kbuild/modules.rst>.
> -
> - 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 22/27] fbdev: remove tmiofb driver
2023-01-06 9:47 ` Helge Deller
@ 2023-01-06 11:25 ` Arnd Bergmann
0 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-06 11:25 UTC (permalink / raw)
To: Helge Deller, Arnd Bergmann, Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
linux-fbdev, dri-devel
On Fri, Jan 6, 2023, at 10:47, Helge Deller wrote:
> On 1/5/23 14:46, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> With the TMIO MFD support removed, the framebuffer driver can be
>> removed as well.
>>
>> Cc: Helge Deller <deller@gmx.de>
>> Cc: linux-fbdev@vger.kernel.org
>> Cc: dri-devel@lists.freedesktop.org
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Acked-by: Helge Deller <deller@gmx.de>
>
> Arnd, I assume you will push the whole series through the ARM tree
> (which I'd prefer) ?
Yes, I think it's best to keep this together here.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 23/27] fbdev: remove w100fb driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (21 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 22/27] fbdev: remove tmiofb driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 24/27] leds: remove asic3 driver Arnd Bergmann
` (3 subsequent siblings)
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Helge Deller, linux-fbdev, dri-devel
From: Arnd Bergmann <arnd@arndb.de>
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 <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 <file:Documentation/kbuild/modules.rst>.
-
- 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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 24/27] leds: remove asic3 driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (22 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 23/27] fbdev: remove w100fb driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-20 14:02 ` Lee Jones
2023-01-05 13:46 ` [PATCH 25/27] usb: remove ohci-tmio driver Arnd Bergmann
` (2 subsequent siblings)
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Paul Parsons, Pavel Machek, Lee Jones, linux-leds
From: Arnd Bergmann <arnd@arndb.de>
Since ASIC3 MFD driver is removed, the LED support is also
obsolete.
Cc: Paul Parsons <lost.distance@yahoo.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Lee Jones <lee@kernel.org>
Cc: linux-leds@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 24/27] leds: remove asic3 driver
2023-01-05 13:46 ` [PATCH 24/27] leds: remove asic3 driver Arnd Bergmann
@ 2023-01-20 14:02 ` Lee Jones
0 siblings, 0 replies; 69+ messages in thread
From: Lee Jones @ 2023-01-20 14:02 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Paul Parsons, Pavel Machek,
linux-leds
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Since ASIC3 MFD driver is removed, the LED support is also
> obsolete.
>
> Cc: Paul Parsons <lost.distance@yahoo.com>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Lee Jones <lee@kernel.org>
> Cc: linux-leds@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> 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
Applied, thanks
--
Lee Jones [李琼斯]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 25/27] usb: remove ohci-tmio driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (23 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 24/27] leds: remove asic3 driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 14:55 ` Greg Kroah-Hartman
2023-01-05 13:46 ` [PATCH 26/27] w1: remove ds1wm driver Arnd Bergmann
2023-01-05 13:46 ` [PATCH 27/27] mfd: remove htc-pasic3 driver Arnd Bergmann
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Alan Stern, Greg Kroah-Hartman, linux-usb
From: Arnd Bergmann <arnd@arndb.de>
The TMIO MFD driver is getting removed, so its OHCI portion is not
used any more either.
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 25/27] usb: remove ohci-tmio driver
2023-01-05 13:46 ` [PATCH 25/27] usb: remove ohci-tmio driver Arnd Bergmann
@ 2023-01-05 14:55 ` Greg Kroah-Hartman
2023-01-05 15:03 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Greg Kroah-Hartman @ 2023-01-05 14:55 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Alan Stern, linux-usb
On Thu, Jan 05, 2023 at 02:46:20PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The TMIO MFD driver is getting removed, so its OHCI portion is not
> used any more either.
>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-usb@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> 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
I can take this through the USB tree, otherwise feel free to take it and
add:
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 25/27] usb: remove ohci-tmio driver
2023-01-05 14:55 ` Greg Kroah-Hartman
@ 2023-01-05 15:03 ` Arnd Bergmann
0 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 15:03 UTC (permalink / raw)
To: Greg Kroah-Hartman, Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Alan Stern, linux-usb
On Thu, Jan 5, 2023, at 15:55, Greg Kroah-Hartman wrote:
> On Thu, Jan 05, 2023 at 02:46:20PM +0100, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> The TMIO MFD driver is getting removed, so its OHCI portion is not
>> used any more either.
>>
>> Cc: Alan Stern <stern@rowland.harvard.edu>
>> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> Cc: linux-usb@vger.kernel.org
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> 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
>
> I can take this through the USB tree, otherwise feel free to take it and
> add:
>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Thanks!
I think it's easier to keep this together with the patches
that use the linux/mfd/tmio.h header, so I can remove
that file without getting build regressions in my tree.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 26/27] w1: remove ds1wm driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (24 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 25/27] usb: remove ohci-tmio driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 27/27] mfd: remove htc-pasic3 driver Arnd Bergmann
26 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Evgeniy Polyakov, Szabolcs Gyurko
From: Arnd Bergmann <arnd@arndb.de>
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 <zbr@ioremap.net>
Cc: Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* [PATCH 27/27] mfd: remove htc-pasic3 driver
[not found] <20230105134622.254560-1-arnd@kernel.org>
` (25 preceding siblings ...)
2023-01-05 13:46 ` [PATCH 26/27] w1: remove ds1wm driver Arnd Bergmann
@ 2023-01-05 13:46 ` Arnd Bergmann
2023-01-20 14:09 ` Lee Jones
26 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2023-01-05 13:46 UTC (permalink / raw)
To: Robert Jarzmik
Cc: Daniel Mack, Haojian Zhuang, linux-arm-kernel, linux-kernel,
Arnd Bergmann, Lee Jones, Philipp Zabel
From: Arnd Bergmann <arnd@arndb.de>
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 <lee@kernel.org>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 69+ messages in thread* Re: [PATCH 27/27] mfd: remove htc-pasic3 driver
2023-01-05 13:46 ` [PATCH 27/27] mfd: remove htc-pasic3 driver Arnd Bergmann
@ 2023-01-20 14:09 ` Lee Jones
0 siblings, 0 replies; 69+ messages in thread
From: Lee Jones @ 2023-01-20 14:09 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Robert Jarzmik, Daniel Mack, Haojian Zhuang, linux-arm-kernel,
linux-kernel, Arnd Bergmann, Philipp Zabel
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <lee@kernel.org>
> Cc: Philipp Zabel <philipp.zabel@gmail.com>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> 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
Applied, thanks
--
Lee Jones [李琼斯]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread