From: Arnd Bergmann <[email protected]>
Most of the legacy PXA board files were marked as unused in linux-5.19 and
can get removed in linux-6.3. There is support for pxa250/pxa270/pxa300
using devicetree already, which supports a number of boards, but progress
on converting the remaining ones has stalled over the past few years.
The two boards that are left in the tree for now are the three 'sharpsl'
variants (spitz/akita/borzoi) and the 'gumstix' family of machines.
Both of these are supported by qemu, which can be helpful for completing
the DT conversion.
Only PXA25x and PXA27x are left with full boardfile support, so PXA300
can get a lot simpler while still working with DT, and PXA310/320/93x
can be removed entirely.
A good number of drivers become impossible to select after this, so
each of these also get dropped. I'm including the driver patches in the
series here and can either merge them through the soc tree, or they can
get picked up by the individual subsystem maintainers. Since both the
platform and the drivers get removed, the order should not matter.
Note that the patches here are generated with 'git format-patch -D' and
don't contain the contents of removed files because of the significant
size (the first patch is close to a megabyte).
---
I first attempted to send this series in October, but only the
cover letter made it out at the time, not the patches. Since Robert
discovered a problem with the AC97_BUS_NEW support getting removed, and
I ran into other build issues before resending, it did not make it for
6.2 at all. I'm trying to queue up all the board removal patches now,
so am posting these properly now.
Arnd Bergmann (27):
ARM: pxa: remove unused board files
ARM: pxa: remove irda leftover
ARM: pxa: remove unused pxa3xx-ulpi
ARM: pxa: drop pxa310/pxa320/pxa93x support
ARM: pxa: prune unused device support
power: remove z2_battery driver
power: remove tosa_battery driver
ata: remove palmld pata driver
backlight: remove pxa tosa support
input: remove pxa930_trkball driver
input: remove pxa930_rotary keyboard driver
input: remove zylonite touchscreen driver
pcmcia: remove unused pxa/sa1100 drivers
ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable
ASoC: pxa: remove unused board support
power: remove pda_power supply driver
rtc: remove v3020 driver
mfd: remove toshiba tmio drivers
mfd: remove ucb1400 support
mtd: remove tmio_nand driver
mmc: remove tmio_mmc driver
fbdev: remove tmiofb driver
fbdev: remove w100fb driver
leds: remove asic3 driver
usb: remove ohci-tmio driver
w1: remove ds1wm driver
mfd: remove htc-pasic3 driver
Documentation/power/power_supply_class.rst | 4 +-
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 | 60 +-
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/devices.c | 408 ----
arch/arm/mach-pxa/devices.h | 3 -
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-pxa25x.h | 33 -
arch/arm/mach-pxa/mfp-pxa2xx.c | 4 -
arch/arm/mach-pxa/mfp-pxa300.h | 52 -
arch/arm/mach-pxa/mfp-pxa320.h | 458 -----
arch/arm/mach-pxa/mfp-pxa930.h | 495 -----
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/pm.c | 2 -
arch/arm/mach-pxa/pm.h | 10 -
arch/arm/mach-pxa/poodle.c | 484 -----
arch/arm/mach-pxa/poodle.h | 92 -
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/pxa2xx.c | 29 -
arch/arm/mach-pxa/pxa300.c | 17 +-
arch/arm/mach-pxa/pxa320.c | 88 -
arch/arm/mach-pxa/pxa320.h | 9 -
arch/arm/mach-pxa/pxa3xx-ulpi.c | 385 ----
arch/arm/mach-pxa/pxa3xx.c | 91 -
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-u2d.h | 199 --
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/spitz.c | 23 -
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 ---
arch/arm/mach-tegra/tegra.c | 1 -
drivers/ata/Kconfig | 9 -
drivers/ata/Makefile | 1 -
drivers/ata/pata_palmld.c | 137 --
drivers/clk/pxa/clk-pxa3xx.c | 22 +-
drivers/cpufreq/pxa3xx-cpufreq.c | 21 +-
drivers/gpio/Kconfig | 7 -
drivers/gpio/Makefile | 1 -
drivers/gpio/gpio-ucb1400.c | 85 -
drivers/input/keyboard/Kconfig | 9 -
drivers/input/keyboard/Makefile | 1 -
drivers/input/keyboard/pxa930_rotary.c | 195 --
drivers/input/mouse/Kconfig | 6 -
drivers/input/mouse/Makefile | 1 -
drivers/input/mouse/pxa930_trkball.c | 250 ---
drivers/input/touchscreen/Kconfig | 30 -
drivers/input/touchscreen/Makefile | 2 -
drivers/input/touchscreen/mainstone-wm97xx.c | 10 -
drivers/input/touchscreen/ucb1400_ts.c | 458 -----
drivers/input/touchscreen/zylonite-wm97xx.c | 220 ---
drivers/leds/Kconfig | 11 -
drivers/leds/Makefile | 1 -
drivers/leds/leds-asic3.c | 177 --
drivers/mfd/Kconfig | 58 -
drivers/mfd/Makefile | 7 -
drivers/mfd/asic3.c | 1071 -----------
drivers/mfd/htc-pasic3.c | 210 ---
drivers/mfd/t7l66xb.c | 427 -----
drivers/mfd/tc6387xb.c | 228 ---
drivers/mfd/tc6393xb.c | 907 ---------
drivers/mfd/tmio_core.c | 70 -
drivers/mfd/ucb1400_core.c | 158 --
drivers/mmc/host/Kconfig | 8 -
drivers/mmc/host/Makefile | 1 -
drivers/mmc/host/pxamci.c | 3 +-
drivers/mmc/host/tmio_mmc.c | 227 ---
drivers/mtd/nand/raw/Kconfig | 7 -
drivers/mtd/nand/raw/Makefile | 1 -
drivers/mtd/nand/raw/tmio_nand.c | 533 ------
drivers/pcmcia/Kconfig | 12 +-
drivers/pcmcia/Makefile | 5 -
drivers/pcmcia/pxa2xx_base.c | 14 +-
drivers/pcmcia/pxa2xx_mainstone.c | 122 --
drivers/pcmcia/sa1100_simpad.c | 115 --
drivers/pcmcia/sa1111_badge4.c | 158 --
drivers/pcmcia/sa1111_generic.c | 4 -
drivers/pcmcia/sa1111_lubbock.c | 155 --
drivers/power/supply/Kconfig | 22 -
drivers/power/supply/Makefile | 3 -
drivers/power/supply/ds2760_battery.c | 8 -
drivers/power/supply/pda_power.c | 520 ------
drivers/power/supply/tosa_battery.c | 512 -----
drivers/power/supply/z2_battery.c | 318 ----
drivers/rtc/Kconfig | 9 -
drivers/rtc/Makefile | 1 -
drivers/rtc/rtc-v3020.c | 369 ----
drivers/usb/gadget/udc/pxa25x_udc.c | 62 -
drivers/usb/host/ohci-hcd.c | 18 -
drivers/usb/host/ohci-pxa27x.c | 9 -
drivers/usb/host/ohci-tmio.c | 364 ----
drivers/video/backlight/Kconfig | 14 -
drivers/video/backlight/Makefile | 2 -
drivers/video/backlight/locomolcd.c | 10 -
drivers/video/backlight/tosa_bl.c | 172 --
drivers/video/backlight/tosa_bl.h | 8 -
drivers/video/backlight/tosa_lcd.c | 284 ---
drivers/video/fbdev/Kconfig | 39 -
drivers/video/fbdev/Makefile | 2 -
drivers/video/fbdev/tmiofb.c | 1040 -----------
drivers/video/fbdev/w100fb.c | 1644 -----------------
drivers/video/fbdev/w100fb.h | 924 ---------
drivers/w1/masters/Kconfig | 7 -
drivers/w1/masters/Makefile | 1 -
drivers/w1/masters/ds1wm.c | 675 -------
include/linux/mfd/asic3.h | 313 ----
include/linux/mfd/htc-pasic3.h | 54 -
include/linux/mfd/t7l66xb.h | 29 -
include/linux/mfd/tc6387xb.h | 19 -
include/linux/mfd/tc6393xb.h | 53 -
include/linux/mfd/tmio.h | 5 -
include/linux/pda_power.h | 39 -
include/linux/platform_data/asoc-palm27x.h | 9 -
include/linux/platform_data/asoc-poodle.h | 16 -
include/linux/platform_data/irda-pxaficp.h | 26 -
.../platform_data/keyboard-pxa930_rotary.h | 21 -
include/linux/platform_data/mmp_audio.h | 18 -
.../platform_data/mouse-pxa930_trkball.h | 11 -
include/linux/platform_data/rtc-v3020.h | 41 -
include/linux/platform_data/usb-pxa3xx-ulpi.h | 32 -
include/linux/soc/pxa/cpu.h | 93 +-
include/linux/ucb1400.h | 160 --
include/linux/z2_battery.h | 17 -
include/video/w100fb.h | 147 --
sound/Kconfig | 1 -
sound/pci/ac97/ac97_codec.c | 1 -
sound/pci/ac97/ac97_patch.c | 40 -
sound/soc/pxa/Kconfig | 181 +-
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 ---
261 files changed, 22 insertions(+), 53872 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/mfp-pxa930.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/pxa3xx-ulpi.c
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-u2d.h
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
delete mode 100644 drivers/ata/pata_palmld.c
delete mode 100644 drivers/gpio/gpio-ucb1400.c
delete mode 100644 drivers/input/keyboard/pxa930_rotary.c
delete mode 100644 drivers/input/mouse/pxa930_trkball.c
delete mode 100644 drivers/input/touchscreen/ucb1400_ts.c
delete mode 100644 drivers/input/touchscreen/zylonite-wm97xx.c
delete mode 100644 drivers/leds/leds-asic3.c
delete mode 100644 drivers/mfd/asic3.c
delete mode 100644 drivers/mfd/htc-pasic3.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 drivers/mfd/ucb1400_core.c
delete mode 100644 drivers/mmc/host/tmio_mmc.c
delete mode 100644 drivers/mtd/nand/raw/tmio_nand.c
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
delete mode 100644 drivers/power/supply/pda_power.c
delete mode 100644 drivers/power/supply/tosa_battery.c
delete mode 100644 drivers/power/supply/z2_battery.c
delete mode 100644 drivers/rtc/rtc-v3020.c
delete mode 100644 drivers/usb/host/ohci-tmio.c
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
delete mode 100644 drivers/video/fbdev/tmiofb.c
delete mode 100644 drivers/video/fbdev/w100fb.c
delete mode 100644 drivers/video/fbdev/w100fb.h
delete mode 100644 drivers/w1/masters/ds1wm.c
delete mode 100644 include/linux/mfd/asic3.h
delete mode 100644 include/linux/mfd/htc-pasic3.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
delete mode 100644 include/linux/pda_power.h
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/irda-pxaficp.h
delete mode 100644 include/linux/platform_data/keyboard-pxa930_rotary.h
delete mode 100644 include/linux/platform_data/mmp_audio.h
delete mode 100644 include/linux/platform_data/mouse-pxa930_trkball.h
delete mode 100644 include/linux/platform_data/rtc-v3020.h
delete mode 100644 include/linux/platform_data/usb-pxa3xx-ulpi.h
delete mode 100644 include/linux/ucb1400.h
delete mode 100644 include/linux/z2_battery.h
delete mode 100644 include/video/w100fb.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
--
2.39.0
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
From: Arnd Bergmann <[email protected]>
The pxa930 platform is getting removed and no upstream machine
ever defined a rotary keyboard device.
Cc: Dmitry Torokhov <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
The v3020 RTC driver was exclusively used by the now removed
cm-x300.c machine.
Cc: Alessandro Zummo <[email protected]>
Cc: Alexandre Belloni <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
The PXA tosa machine is removed, so this driver is no longer
in use.
Cc: Sebastian Reichel <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: Szabolcs Gyurko <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: Philipp Zabel <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
With the TMIO MFD support removed, the framebuffer driver can be
removed as well.
Cc: Helge Deller <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: Ken McGuire <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Mike Rapoport <[email protected]>
Cc: Robert Jarzmik <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
The PXA zylonite platform was removed, so this driver has no
remaining users.
Cc: Dmitry Torokhov <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
This was only used by the cm-x300 board, which is now gone.
Cc: Alan Stern <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
Since ASIC3 MFD driver is removed, the LED support is also
obsolete.
Cc: Paul Parsons <[email protected]>
Cc: Pavel Machek <[email protected]>
Cc: Lee Jones <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
The pxa930 SoC support is getting removed, and no upstream
board ever provided the trkball device that this driver
relies on.
Cc: Dmitry Torokhov <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
The TMIO MFD driver is getting removed, so its OHCI portion is not
used any more either.
Cc: Alan Stern <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
The PXA tosa machine was removed, so this backlight driver is no
longer needed.
Cc: Lee Jones <[email protected]>
Cc: Daniel Thompson <[email protected]>
Cc: Jingoo Han <[email protected]>
Cc: [email protected] (open list:FRAMEBUFFER LAYER)
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: Ulf Hansson <[email protected]>
Cc: Wolfram Sang <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
With the TMIO MFD drivers gone, the NAND support is also
obsolete and can be removed.
Cc: Miquel Raynal <[email protected]>
Cc: Richard Weinberger <[email protected]>
Cc: Vignesh Raghavendra <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
A number of boards got removed, so this code is now orphaned.
Cc: Dominik Brodowski <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: Anton Vorontsov <[email protected]>
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
The PXA z2 platform is gone, and this driver is now orphaned.
Cc: [email protected]
Cc: Peter Edwards <[email protected]>
Cc: Sebastian Reichel <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: Wolfram Sang <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Damien Le Moal <[email protected]>
Cc: Sergey Shtylyov <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
On Thu, Jan 05, 2023 at 02:46:20PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The TMIO MFD driver is getting removed, so its OHCI portion is not
> used any more either.
>
> Cc: Alan Stern <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> 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 <[email protected]>
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Cc: Bartosz Golaszewski <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Cc: Lee Jones <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
---
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
On Thu, Jan 05, 2023 at 02:45:58PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> This was only used by the cm-x300 board, which is now gone.
>
> Cc: Alan Stern <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> 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 <[email protected]>
On Thu, Jan 05, 2023 at 02:46:04PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The PXA tosa machine was removed, so this backlight driver is no
> longer needed.
>
> Cc: Lee Jones <[email protected]>
> Cc: Daniel Thompson <[email protected]>
> Cc: Jingoo Han <[email protected]>
> Cc: [email protected] (open list:FRAMEBUFFER LAYER)
> Signed-off-by: Arnd Bergmann <[email protected]>
OK by me ;-).
Reviewed-by: Daniel Thompson <[email protected]>
Daniel.
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 <[email protected]>
>>
>> The TMIO MFD driver is getting removed, so its OHCI portion is not
>> used any more either.
>>
>> Cc: Alan Stern <[email protected]>
>> Cc: Greg Kroah-Hartman <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Arnd Bergmann <[email protected]>
>> ---
>> 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 <[email protected]>
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
On Thu, 5 Jan 2023 at 14:47, Arnd Bergmann <[email protected]> wrote:
>
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>
> Cc: Ulf Hansson <[email protected]>
> Cc: Wolfram Sang <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
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
>
On Thu, Jan 5, 2023, at 16:01, Ulf Hansson wrote:
> On Thu, 5 Jan 2023 at 14:47, Arnd Bergmann <[email protected]> wrote:
>>
>> From: Arnd Bergmann <[email protected]>
>>
>> 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 <[email protected]>
>> Cc: Ulf Hansson <[email protected]>
>> Cc: Wolfram Sang <[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> Signed-off-by: Arnd Bergmann <[email protected]>
>
> 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
On Thu, Jan 05, 2023 at 02:46:16PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>
> Cc: Ulf Hansson <[email protected]>
> Cc: Wolfram Sang <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
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 <[email protected]>
Hi,
On Thu, Jan 05, 2023 at 02:46:11PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>
> Cc: Anton Vorontsov <[email protected]>
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
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 <[email protected]>
-- 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
>
Hi,
On Thu, Jan 05, 2023 at 02:46:02PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The PXA tosa machine is removed, so this driver is no longer
> in use.
>
> Cc: Sebastian Reichel <[email protected]>
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
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 <[email protected]>
-- 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
>
Hi,
On Thu, Jan 05, 2023 at 02:46:01PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The PXA z2 platform is gone, and this driver is now orphaned.
>
> Cc: [email protected]
> Cc: Peter Edwards <[email protected]>
> Cc: Sebastian Reichel <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
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 <[email protected]>
-- 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
>
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 <[email protected]>
>>
>> The PXA tosa machine is removed, so this driver is no longer
>> in use.
>>
>> Cc: Sebastian Reichel <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Arnd Bergmann <[email protected]>
>> ---
>
> 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 <[email protected]>
Thanks! Yes, I'll just keep it all together.
Arnd
On 1/5/23 22:46, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>
> Cc: Marek Vasut <[email protected]>
> Cc: Damien Le Moal <[email protected]>
> Cc: Sergey Shtylyov <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Damien Le Moal <[email protected]>
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
On 1/5/23 14:46, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> With the TMIO MFD support removed, the framebuffer driver can be
> removed as well.
>
> Cc: Helge Deller <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Helge Deller <[email protected]>
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
On Fri, Jan 6, 2023, at 10:47, Helge Deller wrote:
> On 1/5/23 14:46, Arnd Bergmann wrote:
>> From: Arnd Bergmann <[email protected]>
>>
>> With the TMIO MFD support removed, the framebuffer driver can be
>> removed as well.
>>
>> Cc: Helge Deller <[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> Signed-off-by: Arnd Bergmann <[email protected]>
>
> Acked-by: Helge Deller <[email protected]>
>
> 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
Hi Arnd,
[email protected] wrote on Thu, 5 Jan 2023 14:46:15 +0100:
> From: Arnd Bergmann <[email protected]>
>
> With the TMIO MFD drivers gone, the NAND support is also
> obsolete and can be removed.
>
> Cc: Miquel Raynal <[email protected]>
> Cc: Richard Weinberger <[email protected]>
> Cc: Vignesh Raghavendra <[email protected]>
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
The patch did no apply as-is, so I did the removal manually while
applying to mtd/next.
Thanks!
Miquèl
On Thu, Jan 05, 2023 at 02:46:10PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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.
Hello!
On 1/5/23 4:46 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>
> Cc: Marek Vasut <[email protected]>
> Cc: Damien Le Moal <[email protected]>
> Cc: Sergey Shtylyov <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
Reviewed-by: Sergey Shtylyov <[email protected]>
Better late than never? :-)
[...]
MBR, Sergey
On Thu, 05 Jan 2023 14:45:55 +0100, Arnd Bergmann wrote:
> Most of the legacy PXA board files were marked as unused in linux-5.19 and
> can get removed in linux-6.3. There is support for pxa250/pxa270/pxa300
> using devicetree already, which supports a number of boards, but progress
> on converting the remaining ones has stalled over the past few years.
>
> The two boards that are left in the tree for now are the three 'sharpsl'
> variants (spitz/akita/borzoi) and the 'gumstix' family of machines.
> Both of these are supported by qemu, which can be helpful for completing
> the DT conversion.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[14/27] ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable
commit: 5eab9265759e2fb042aa452931c3d06ab7ab8dae
[15/27] ASoC: pxa: remove unused board support
(no commit info)
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
On Thu, 5 Jan 2023 at 16:44, Arnd Bergmann <[email protected]> wrote:
>
> On Thu, Jan 5, 2023, at 16:01, Ulf Hansson wrote:
> > On Thu, 5 Jan 2023 at 14:47, Arnd Bergmann <[email protected]> wrote:
> >>
> >> From: Arnd Bergmann <[email protected]>
> >>
> >> 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 <[email protected]>
> >> Cc: Ulf Hansson <[email protected]>
> >> Cc: Wolfram Sang <[email protected]>
> >> Cc: [email protected]
> >> Cc: [email protected]
> >> Signed-off-by: Arnd Bergmann <[email protected]>
> >
> > 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 <[email protected]>
Kind regards
Uffe
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> Since ASIC3 MFD driver is removed, the LED support is also
> obsolete.
>
> Cc: Paul Parsons <[email protected]>
> Cc: Pavel Machek <[email protected]>
> Cc: Lee Jones <[email protected]>
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> 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 [李琼斯]
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The PXA tosa machine was removed, so this backlight driver is no
> longer needed.
>
> Cc: Lee Jones <[email protected]>
> Cc: Daniel Thompson <[email protected]>
> Cc: Jingoo Han <[email protected]>
> Cc: [email protected] (open list:FRAMEBUFFER LAYER)
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> 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 [李琼斯]
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>
> Cc: Philipp Zabel <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> 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 [李琼斯]
On Fri, Jan 20, 2023, at 15:18, Lee Jones wrote:
> On Thu, 05 Jan 2023, Arnd Bergmann wrote:
>
>> From: Arnd Bergmann <[email protected]>
>>
>> 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 <[email protected]>
>> Cc: Bartosz Golaszewski <[email protected]>
>> Cc: Dmitry Torokhov <[email protected]>
>> Cc: Lee Jones <[email protected]>
>> Cc: Jaroslav Kysela <[email protected]>
>> Cc: Takashi Iwai <[email protected]>
>> Cc: Marek Vasut <[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> Cc: [email protected]
>> Cc: [email protected]
>> Signed-off-by: Arnd Bergmann <[email protected]>
>> ---
>> 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
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>
> Cc: Bartosz Golaszewski <[email protected]>
> Cc: Dmitry Torokhov <[email protected]>
> Cc: Lee Jones <[email protected]>
> Cc: Jaroslav Kysela <[email protected]>
> Cc: Takashi Iwai <[email protected]>
> Cc: Marek Vasut <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> 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 [李琼斯]
On Thu, 05 Jan 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>
> Cc: Wolfram Sang <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> 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 [李琼斯]
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 <[email protected]>
> >>
> >> 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 <[email protected]>
> >> Cc: Bartosz Golaszewski <[email protected]>
> >> Cc: Dmitry Torokhov <[email protected]>
> >> Cc: Lee Jones <[email protected]>
> >> Cc: Jaroslav Kysela <[email protected]>
> >> Cc: Takashi Iwai <[email protected]>
> >> Cc: Marek Vasut <[email protected]>
> >> Cc: [email protected]
> >> Cc: [email protected]
> >> Cc: [email protected]
> >> Cc: [email protected]
> >> Signed-off-by: Arnd Bergmann <[email protected]>
> >> ---
> >> 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 <[email protected]>
I already applied the others.
--
Lee Jones [李琼斯]