Hi driver maintainers,
I just posted one series with the removal of eight architectures,
see https://lkml.org/lkml/2018/3/14/505 for details, or
https://lwn.net/Articles/748074/ for more background.
These are the device drivers that go along with them. I have already
picked up the drivers for arch/metag/ into my tree, they were reviewed
earlier.
Please let me know if you have any concerns with the patch, or if you
prefer to pick up the patches in your respective trees. I created
the patches with 'git format-patch -D', so they will not apply without
manually removing those files.
For anything else, I'd keep the removal patches in my asm-generic tree
and will send a pull request for 4.17 along with the actual arch removal.
Arnd
Arnd Bergmann
edac: remove tile driver
net: tile: remove ethernet drivers
net: adi: remove blackfin ethernet drivers
net: 8390: remove m32r specific bits
net: remove cris etrax ethernet driver
net: smsc: remove m32r specific smc91x configuration
raid: remove tile specific raid6 implementation
rtc: remove tile driver
rtc: remove bfin driver
char: remove obsolete ds1302 rtc driver
char: remove tile-srom.c
char: remove blackfin OTP driver
pcmcia: remove m32r drivers
pcmcia: remove blackfin driver
ASoC: remove blackfin drivers
video/logo: remove obsolete logo files
fbdev: remove blackfin drivers
fbdev: s1d13xxxfb: remove m32r specific hacks
crypto: remove blackfin CRC driver
media: platform: remove blackfin capture driver
media: platform: remove m32r specific arv driver
cpufreq: remove blackfin driver
cpufreq: remove cris specific drivers
gpio: remove etraxfs driver
pinctrl: remove adi2/blackfin drivers
ata: remove bf54x driver
input: keyboard: remove bf54x driver
input: misc: remove blackfin rotary driver
mmc: remove bfin_sdh driver
can: remove bfin_can driver
watchdog: remove bfin_wdt driver
mtd: maps: remove bfin-async-flash driver
mtd: nand: remove bf5xx_nand driver
spi: remove blackfin related host drivers
i2c: remove bfin-twi driver
pwm: remobe pwm-bfin driver
usb: host: remove tilegx platform glue
usb: musb: remove blackfin port
usb: isp1362: remove blackfin arch glue
serial: remove cris/etrax uart drivers
serial: remove blackfin drivers
serial: remove m32r_sio driver
serial: remove tile uart driver
tty: remove bfin_jtag_comm and hvc_bfin_jtag drivers
tty: hvc: remove tile driver
staging: irda: remove bfin_sir driver
staging: iio: remove iio-trig-bfin-timer driver
.../devicetree/bindings/gpio/gpio-etraxfs.txt | 22 -
.../bindings/serial/axis,etraxfs-uart.txt | 22 -
Documentation/watchdog/watchdog-parameters.txt | 5 -
MAINTAINERS | 8 -
drivers/ata/Kconfig | 9 -
drivers/ata/Makefile | 1 -
drivers/ata/pata_bf54x.c | 1703 --------
drivers/char/Kconfig | 48 -
drivers/char/Makefile | 3 -
drivers/char/bfin-otp.c | 237 --
drivers/char/ds1302.c | 357 --
drivers/char/tile-srom.c | 475 ---
drivers/cpufreq/Makefile | 3 -
drivers/cpufreq/blackfin-cpufreq.c | 217 -
drivers/cpufreq/cris-artpec3-cpufreq.c | 93 -
drivers/cpufreq/cris-etraxfs-cpufreq.c | 92 -
drivers/crypto/Kconfig | 7 -
drivers/crypto/Makefile | 1 -
drivers/crypto/bfin_crc.c | 753 ----
drivers/crypto/bfin_crc.h | 124 -
drivers/edac/Kconfig | 8 -
drivers/edac/Makefile | 2 -
drivers/edac/tile_edac.c | 265 --
drivers/gpio/Kconfig | 9 -
drivers/gpio/Makefile | 1 -
drivers/gpio/gpio-etraxfs.c | 475 ---
drivers/i2c/busses/Kconfig | 18 -
drivers/i2c/busses/Makefile | 1 -
drivers/i2c/busses/i2c-bfin-twi.c | 737 ----
drivers/input/keyboard/Kconfig | 9 -
drivers/input/keyboard/Makefile | 1 -
drivers/input/keyboard/bf54x-keys.c | 396 --
drivers/input/misc/Kconfig | 9 -
drivers/input/misc/Makefile | 1 -
drivers/input/misc/bfin_rotary.c | 294 --
drivers/media/platform/Kconfig | 22 -
drivers/media/platform/Makefile | 4 -
drivers/media/platform/arv.c | 884 ----
drivers/media/platform/blackfin/Kconfig | 16 -
drivers/media/platform/blackfin/Makefile | 2 -
drivers/media/platform/blackfin/bfin_capture.c | 983 -----
drivers/media/platform/blackfin/ppi.c | 361 --
drivers/mmc/host/Kconfig | 19 -
drivers/mmc/host/Makefile | 1 -
drivers/mmc/host/bfin_sdh.c | 679 ----
drivers/mtd/maps/Kconfig | 10 -
drivers/mtd/maps/Makefile | 1 -
drivers/mtd/maps/bfin-async-flash.c | 196 -
drivers/mtd/nand/raw/Kconfig | 32 -
drivers/mtd/nand/raw/Makefile | 1 -
drivers/mtd/nand/raw/bf5xx_nand.c | 861 ----
drivers/net/Makefile | 1 -
drivers/net/can/Kconfig | 9 -
drivers/net/can/Makefile | 1 -
drivers/net/can/bfin_can.c | 784 ----
drivers/net/cris/Makefile | 1 -
drivers/net/cris/eth_v10.c | 1742 --------
drivers/net/ethernet/8390/Kconfig | 3 +-
drivers/net/ethernet/8390/ne.c | 23 +-
drivers/net/ethernet/Kconfig | 2 -
drivers/net/ethernet/Makefile | 2 -
drivers/net/ethernet/adi/Kconfig | 66 -
drivers/net/ethernet/adi/Makefile | 5 -
drivers/net/ethernet/adi/bfin_mac.c | 1881 ---------
drivers/net/ethernet/adi/bfin_mac.h | 104 -
drivers/net/ethernet/smsc/Kconfig | 4 +-
drivers/net/ethernet/smsc/smc91x.h | 26 -
drivers/net/ethernet/tile/Kconfig | 18 -
drivers/net/ethernet/tile/Makefile | 11 -
drivers/net/ethernet/tile/tilegx.c | 2279 -----------
drivers/net/ethernet/tile/tilepro.c | 2397 -----------
drivers/pcmcia/Kconfig | 26 -
drivers/pcmcia/Makefile | 3 -
drivers/pcmcia/bfin_cf_pcmcia.c | 316 --
drivers/pcmcia/m32r_cfc.c | 786 ----
drivers/pcmcia/m32r_cfc.h | 88 -
drivers/pcmcia/m32r_pcc.c | 763 ----
drivers/pcmcia/m32r_pcc.h | 66 -
drivers/pinctrl/Kconfig | 19 -
drivers/pinctrl/Makefile | 3 -
drivers/pinctrl/pinctrl-adi2-bf54x.c | 588 ---
drivers/pinctrl/pinctrl-adi2-bf60x.c | 517 ---
drivers/pinctrl/pinctrl-adi2.c | 1114 -----
drivers/pinctrl/pinctrl-adi2.h | 75 -
drivers/pwm/Kconfig | 9 -
drivers/pwm/Makefile | 1 -
drivers/pwm/pwm-bfin.c | 157 -
drivers/rtc/Kconfig | 17 -
drivers/rtc/Makefile | 2 -
drivers/rtc/rtc-bfin.c | 448 ---
drivers/rtc/rtc-tile.c | 143 -
drivers/spi/Kconfig | 19 -
drivers/spi/Makefile | 3 -
drivers/spi/spi-adi-v3.c | 984 -----
drivers/spi/spi-bfin-sport.c | 919 -----
drivers/spi/spi-bfin5xx.c | 1462 -------
drivers/staging/iio/Kconfig | 1 -
drivers/staging/iio/Makefile | 1 -
drivers/staging/iio/trigger/Kconfig | 19 -
drivers/staging/iio/trigger/Makefile | 5 -
drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 292 --
drivers/staging/iio/trigger/iio-trig-bfin-timer.h | 25 -
drivers/staging/irda/drivers/Kconfig | 45 -
drivers/staging/irda/drivers/Makefile | 1 -
drivers/staging/irda/drivers/bfin_sir.c | 819 ----
drivers/staging/irda/drivers/bfin_sir.h | 93 -
drivers/tty/Kconfig | 13 -
drivers/tty/Makefile | 1 -
drivers/tty/bfin_jtag_comm.c | 353 --
drivers/tty/hvc/Kconfig | 9 -
drivers/tty/hvc/Makefile | 2 -
drivers/tty/hvc/hvc_bfin_jtag.c | 104 -
drivers/tty/hvc/hvc_tile.c | 196 -
drivers/tty/serial/Kconfig | 198 -
drivers/tty/serial/Makefile | 6 -
drivers/tty/serial/bfin_sport_uart.c | 937 -----
drivers/tty/serial/bfin_sport_uart.h | 86 -
drivers/tty/serial/bfin_uart.c | 1551 -------
drivers/tty/serial/crisv10.c | 4248 --------------------
drivers/tty/serial/crisv10.h | 133 -
drivers/tty/serial/etraxfs-uart.c | 960 -----
drivers/tty/serial/m32r_sio.c | 1053 -----
drivers/tty/serial/m32r_sio_reg.h | 150 -
drivers/tty/serial/tilegx.c | 689 ----
drivers/usb/host/Kconfig | 1 +
drivers/usb/host/ehci-hcd.c | 5 -
drivers/usb/host/ehci-tilegx.c | 207 -
drivers/usb/host/isp1362.h | 44 -
drivers/usb/host/ohci-hcd.c | 18 -
drivers/usb/host/ohci-tilegx.c | 196 -
drivers/usb/musb/Kconfig | 10 +-
drivers/usb/musb/Makefile | 1 -
drivers/usb/musb/blackfin.c | 623 ---
drivers/usb/musb/blackfin.h | 81 -
drivers/usb/musb/musb_core.c | 5 -
drivers/usb/musb/musb_core.h | 30 -
drivers/usb/musb/musb_debugfs.c | 2 -
drivers/usb/musb/musb_dma.h | 11 -
drivers/usb/musb/musb_gadget.c | 35 -
drivers/usb/musb/musb_regs.h | 182 -
drivers/usb/musb/musbhsdma.c | 5 -
drivers/usb/musb/musbhsdma.h | 64 -
drivers/video/fbdev/Kconfig | 103 -
drivers/video/fbdev/Makefile | 5 -
drivers/video/fbdev/bf537-lq035.c | 891 ----
drivers/video/fbdev/bf54x-lq043fb.c | 764 ----
drivers/video/fbdev/bfin-lq035q1-fb.c | 864 ----
drivers/video/fbdev/bfin-t350mcqb-fb.c | 669 ---
drivers/video/fbdev/bfin_adv7393fb.c | 828 ----
drivers/video/fbdev/bfin_adv7393fb.h | 319 --
drivers/video/fbdev/s1d13xxxfb.c | 10 -
drivers/video/logo/Kconfig | 15 -
drivers/video/logo/Makefile | 3 -
drivers/video/logo/logo.c | 12 -
drivers/video/logo/logo_blackfin_clut224.ppm | 1127 ------
drivers/video/logo/logo_blackfin_vga16.ppm | 1127 ------
drivers/video/logo/logo_m32r_clut224.ppm | 1292 ------
drivers/watchdog/Kconfig | 17 -
drivers/watchdog/Makefile | 7 -
drivers/watchdog/bfin_wdt.c | 476 ---
include/linux/bfin_mac.h | 30 -
include/linux/linux_logo.h | 3 -
include/linux/platform_data/bfin_rotary.h | 117 -
include/linux/platform_data/pinctrl-adi2.h | 40 -
include/linux/raid/pq.h | 1 -
include/linux/usb/musb.h | 7 -
include/linux/usb/tilegx.h | 35 -
include/media/blackfin/bfin_capture.h | 39 -
include/media/blackfin/ppi.h | 94 -
lib/raid6/Makefile | 6 -
lib/raid6/algos.c | 3 -
lib/raid6/test/Makefile | 7 -
lib/raid6/tilegx.uc | 87 -
sound/soc/Kconfig | 1 -
sound/soc/Makefile | 1 -
sound/soc/blackfin/Kconfig | 205 -
sound/soc/blackfin/Makefile | 40 -
sound/soc/blackfin/bf5xx-ac97-pcm.c | 480 ---
sound/soc/blackfin/bf5xx-ac97.c | 388 --
sound/soc/blackfin/bf5xx-ac97.h | 57 -
sound/soc/blackfin/bf5xx-ad1836.c | 109 -
sound/soc/blackfin/bf5xx-ad193x.c | 131 -
sound/soc/blackfin/bf5xx-ad1980.c | 109 -
sound/soc/blackfin/bf5xx-ad73311.c | 212 -
sound/soc/blackfin/bf5xx-i2s-pcm.c | 373 --
sound/soc/blackfin/bf5xx-i2s-pcm.h | 17 -
sound/soc/blackfin/bf5xx-i2s.c | 391 --
sound/soc/blackfin/bf5xx-sport.c | 1102 -----
sound/soc/blackfin/bf5xx-sport.h | 174 -
sound/soc/blackfin/bf5xx-ssm2602.c | 126 -
sound/soc/blackfin/bf6xx-i2s.c | 239 --
sound/soc/blackfin/bf6xx-sport.c | 425 --
sound/soc/blackfin/bf6xx-sport.h | 82 -
sound/soc/blackfin/bfin-eval-adau1373.c | 173 -
sound/soc/blackfin/bfin-eval-adau1701.c | 113 -
sound/soc/blackfin/bfin-eval-adau1x61.c | 142 -
sound/soc/blackfin/bfin-eval-adau1x81.c | 129 -
sound/soc/blackfin/bfin-eval-adav80x.c | 145 -
198 files changed, 7 insertions(+), 56230 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-etraxfs.txt
delete mode 100644 Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt
delete mode 100644 drivers/ata/pata_bf54x.c
delete mode 100644 drivers/char/bfin-otp.c
delete mode 100644 drivers/char/ds1302.c
delete mode 100644 drivers/char/tile-srom.c
delete mode 100644 drivers/cpufreq/blackfin-cpufreq.c
delete mode 100644 drivers/cpufreq/cris-artpec3-cpufreq.c
delete mode 100644 drivers/cpufreq/cris-etraxfs-cpufreq.c
delete mode 100644 drivers/crypto/bfin_crc.c
delete mode 100644 drivers/crypto/bfin_crc.h
delete mode 100644 drivers/edac/tile_edac.c
delete mode 100644 drivers/gpio/gpio-etraxfs.c
delete mode 100644 drivers/i2c/busses/i2c-bfin-twi.c
delete mode 100644 drivers/input/keyboard/bf54x-keys.c
delete mode 100644 drivers/input/misc/bfin_rotary.c
delete mode 100644 drivers/media/platform/arv.c
delete mode 100644 drivers/media/platform/blackfin/Kconfig
delete mode 100644 drivers/media/platform/blackfin/Makefile
delete mode 100644 drivers/media/platform/blackfin/bfin_capture.c
delete mode 100644 drivers/media/platform/blackfin/ppi.c
delete mode 100644 drivers/mmc/host/bfin_sdh.c
delete mode 100644 drivers/mtd/maps/bfin-async-flash.c
delete mode 100644 drivers/mtd/nand/raw/bf5xx_nand.c
delete mode 100644 drivers/net/can/bfin_can.c
delete mode 100644 drivers/net/cris/Makefile
delete mode 100644 drivers/net/cris/eth_v10.c
delete mode 100644 drivers/net/ethernet/adi/Kconfig
delete mode 100644 drivers/net/ethernet/adi/Makefile
delete mode 100644 drivers/net/ethernet/adi/bfin_mac.c
delete mode 100644 drivers/net/ethernet/adi/bfin_mac.h
delete mode 100644 drivers/net/ethernet/tile/Kconfig
delete mode 100644 drivers/net/ethernet/tile/Makefile
delete mode 100644 drivers/net/ethernet/tile/tilegx.c
delete mode 100644 drivers/net/ethernet/tile/tilepro.c
delete mode 100644 drivers/pcmcia/bfin_cf_pcmcia.c
delete mode 100644 drivers/pcmcia/m32r_cfc.c
delete mode 100644 drivers/pcmcia/m32r_cfc.h
delete mode 100644 drivers/pcmcia/m32r_pcc.c
delete mode 100644 drivers/pcmcia/m32r_pcc.h
delete mode 100644 drivers/pinctrl/pinctrl-adi2-bf54x.c
delete mode 100644 drivers/pinctrl/pinctrl-adi2-bf60x.c
delete mode 100644 drivers/pinctrl/pinctrl-adi2.c
delete mode 100644 drivers/pinctrl/pinctrl-adi2.h
delete mode 100644 drivers/pwm/pwm-bfin.c
delete mode 100644 drivers/rtc/rtc-bfin.c
delete mode 100644 drivers/rtc/rtc-tile.c
delete mode 100644 drivers/spi/spi-adi-v3.c
delete mode 100644 drivers/spi/spi-bfin-sport.c
delete mode 100644 drivers/spi/spi-bfin5xx.c
delete mode 100644 drivers/staging/iio/trigger/Kconfig
delete mode 100644 drivers/staging/iio/trigger/Makefile
delete mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.c
delete mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.h
delete mode 100644 drivers/staging/irda/drivers/bfin_sir.c
delete mode 100644 drivers/staging/irda/drivers/bfin_sir.h
delete mode 100644 drivers/tty/bfin_jtag_comm.c
delete mode 100644 drivers/tty/hvc/hvc_bfin_jtag.c
delete mode 100644 drivers/tty/hvc/hvc_tile.c
delete mode 100644 drivers/tty/serial/bfin_sport_uart.c
delete mode 100644 drivers/tty/serial/bfin_sport_uart.h
delete mode 100644 drivers/tty/serial/bfin_uart.c
delete mode 100644 drivers/tty/serial/crisv10.c
delete mode 100644 drivers/tty/serial/crisv10.h
delete mode 100644 drivers/tty/serial/etraxfs-uart.c
delete mode 100644 drivers/tty/serial/m32r_sio.c
delete mode 100644 drivers/tty/serial/m32r_sio_reg.h
delete mode 100644 drivers/tty/serial/tilegx.c
delete mode 100644 drivers/usb/host/ehci-tilegx.c
delete mode 100644 drivers/usb/host/ohci-tilegx.c
delete mode 100644 drivers/usb/musb/blackfin.c
delete mode 100644 drivers/usb/musb/blackfin.h
delete mode 100644 drivers/video/fbdev/bf537-lq035.c
delete mode 100644 drivers/video/fbdev/bf54x-lq043fb.c
delete mode 100644 drivers/video/fbdev/bfin-lq035q1-fb.c
delete mode 100644 drivers/video/fbdev/bfin-t350mcqb-fb.c
delete mode 100644 drivers/video/fbdev/bfin_adv7393fb.c
delete mode 100644 drivers/video/fbdev/bfin_adv7393fb.h
delete mode 100644 drivers/video/logo/logo_blackfin_clut224.ppm
delete mode 100644 drivers/video/logo/logo_blackfin_vga16.ppm
delete mode 100644 drivers/video/logo/logo_m32r_clut224.ppm
delete mode 100644 drivers/watchdog/bfin_wdt.c
delete mode 100644 include/linux/bfin_mac.h
delete mode 100644 include/linux/platform_data/bfin_rotary.h
delete mode 100644 include/linux/platform_data/pinctrl-adi2.h
delete mode 100644 include/linux/usb/tilegx.h
delete mode 100644 include/media/blackfin/bfin_capture.h
delete mode 100644 include/media/blackfin/ppi.h
delete mode 100644 lib/raid6/tilegx.uc
delete mode 100644 sound/soc/blackfin/Kconfig
delete mode 100644 sound/soc/blackfin/Makefile
delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.c
delete mode 100644 sound/soc/blackfin/bf5xx-ac97.c
delete mode 100644 sound/soc/blackfin/bf5xx-ac97.h
delete mode 100644 sound/soc/blackfin/bf5xx-ad1836.c
delete mode 100644 sound/soc/blackfin/bf5xx-ad193x.c
delete mode 100644 sound/soc/blackfin/bf5xx-ad1980.c
delete mode 100644 sound/soc/blackfin/bf5xx-ad73311.c
delete mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.c
delete mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.h
delete mode 100644 sound/soc/blackfin/bf5xx-i2s.c
delete mode 100644 sound/soc/blackfin/bf5xx-sport.c
delete mode 100644 sound/soc/blackfin/bf5xx-sport.h
delete mode 100644 sound/soc/blackfin/bf5xx-ssm2602.c
delete mode 100644 sound/soc/blackfin/bf6xx-i2s.c
delete mode 100644 sound/soc/blackfin/bf6xx-sport.c
delete mode 100644 sound/soc/blackfin/bf6xx-sport.h
delete mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
delete mode 100644 sound/soc/blackfin/bfin-eval-adau1701.c
delete mode 100644 sound/soc/blackfin/bfin-eval-adau1x61.c
delete mode 100644 sound/soc/blackfin/bfin-eval-adau1x81.c
delete mode 100644 sound/soc/blackfin/bfin-eval-adav80x.c
--
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]
The Tile architecture is obsolete and getting removed from the kernel,
this driver appears to only be used there, and not on the ARM based
successors (Tile-Mx, BlueField), so we should remove it as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/edac/Kconfig | 8 --
drivers/edac/Makefile | 2 -
drivers/edac/tile_edac.c | 265 -----------------------------------------------
3 files changed, 275 deletions(-)
delete mode 100644 drivers/edac/tile_edac.c
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index cb4ff1cc6eb4..533122aaa091 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -317,14 +317,6 @@ config EDAC_CPC925
a companion chip to the PowerPC 970 family of
processors.
-config EDAC_TILE
- tristate "Tilera Memory Controller"
- depends on TILE
- default y
- help
- Support for error detection and correction on the
- Tilera memory controller.
-
config EDAC_HIGHBANK_MC
tristate "Highbank Memory Controller"
depends on ARCH_HIGHBANK
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index b54912eb39af..02b43a7d8c3e 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -64,8 +64,6 @@ obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o
obj-$(CONFIG_EDAC_AMD8111) += amd8111_edac.o
obj-$(CONFIG_EDAC_AMD8131) += amd8131_edac.o
-obj-$(CONFIG_EDAC_TILE) += tile_edac.o
-
obj-$(CONFIG_EDAC_HIGHBANK_MC) += highbank_mc_edac.o
obj-$(CONFIG_EDAC_HIGHBANK_L2) += highbank_l2_edac.o
diff --git a/drivers/edac/tile_edac.c b/drivers/edac/tile_edac.c
deleted file mode 100644
index 8a33a87e67f1..000000000000
--
2.9.0
The blackfin architecture is getting removed, so the bfin_mac driver
is now obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/net/ethernet/Kconfig | 1 -
drivers/net/ethernet/Makefile | 1 -
drivers/net/ethernet/adi/Kconfig | 66 --
drivers/net/ethernet/adi/Makefile | 5 -
drivers/net/ethernet/adi/bfin_mac.c | 1881 -----------------------------------
drivers/net/ethernet/adi/bfin_mac.h | 104 --
include/linux/bfin_mac.h | 30 -
7 files changed, 2088 deletions(-)
delete mode 100644 drivers/net/ethernet/adi/Kconfig
delete mode 100644 drivers/net/ethernet/adi/Makefile
delete mode 100644 drivers/net/ethernet/adi/bfin_mac.c
delete mode 100644 drivers/net/ethernet/adi/bfin_mac.h
delete mode 100644 include/linux/bfin_mac.h
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 92be1ad3df59..074d760a568b 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -34,7 +34,6 @@ source "drivers/net/ethernet/arc/Kconfig"
source "drivers/net/ethernet/atheros/Kconfig"
source "drivers/net/ethernet/aurora/Kconfig"
source "drivers/net/ethernet/cadence/Kconfig"
-source "drivers/net/ethernet/adi/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/calxeda/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index edef6069dd4b..135dae67d671 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_NET_VENDOR_ARC) += arc/
obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/
obj-$(CONFIG_NET_CADENCE) += cadence/
-obj-$(CONFIG_NET_BFIN) += adi/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_CALXEDA_XGMAC) += calxeda/
diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig
deleted file mode 100644
index 98cc8f535021..000000000000
diff --git a/drivers/net/ethernet/adi/Makefile b/drivers/net/ethernet/adi/Makefile
deleted file mode 100644
index b1fbe195d0e8..000000000000
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
deleted file mode 100644
index 7120f2b9c6ef..000000000000
diff --git a/drivers/net/ethernet/adi/bfin_mac.h b/drivers/net/ethernet/adi/bfin_mac.h
deleted file mode 100644
index 4ad5b9be3f84..000000000000
diff --git a/include/linux/bfin_mac.h b/include/linux/bfin_mac.h
deleted file mode 100644
index a69554ef8476..000000000000
--
2.9.0
The tile architecture is obsolete and getting removed. From all
I can tell, later ARM based products use a different ethernet driver,
so we should remove this one as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/net/ethernet/Kconfig | 1 -
drivers/net/ethernet/Makefile | 1 -
drivers/net/ethernet/tile/Kconfig | 18 -
drivers/net/ethernet/tile/Makefile | 11 -
drivers/net/ethernet/tile/tilegx.c | 2279 ---------------------------------
drivers/net/ethernet/tile/tilepro.c | 2397 -----------------------------------
6 files changed, 4707 deletions(-)
delete mode 100644 drivers/net/ethernet/tile/Kconfig
delete mode 100644 drivers/net/ethernet/tile/Makefile
delete mode 100644 drivers/net/ethernet/tile/tilegx.c
delete mode 100644 drivers/net/ethernet/tile/tilepro.c
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index b6cf4b6962f5..92be1ad3df59 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -176,7 +176,6 @@ source "drivers/net/ethernet/stmicro/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
source "drivers/net/ethernet/tehuti/Kconfig"
source "drivers/net/ethernet/ti/Kconfig"
-source "drivers/net/ethernet/tile/Kconfig"
source "drivers/net/ethernet/toshiba/Kconfig"
source "drivers/net/ethernet/tundra/Kconfig"
source "drivers/net/ethernet/via/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 3cdf01e96e0b..edef6069dd4b 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -88,7 +88,6 @@ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
obj-$(CONFIG_NET_VENDOR_TI) += ti/
-obj-$(CONFIG_TILE_NET) += tile/
obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/ethernet/tile/Kconfig b/drivers/net/ethernet/tile/Kconfig
deleted file mode 100644
index bdfeaf3d4fce..000000000000
diff --git a/drivers/net/ethernet/tile/Makefile b/drivers/net/ethernet/tile/Makefile
deleted file mode 100644
index 3d0ae1f07fc9..000000000000
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
deleted file mode 100644
index b3e5816a4678..000000000000
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
deleted file mode 100644
index 56d06282fbde..000000000000
--
2.9.0
The m32r architecture is getting removed, so this part can be
cleaned up as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/net/ethernet/smsc/Kconfig | 4 ++--
drivers/net/ethernet/smsc/smc91x.h | 26 --------------------------
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
index 4c2f612e4414..1c2b6663f7ce 100644
--- a/drivers/net/ethernet/smsc/Kconfig
+++ b/drivers/net/ethernet/smsc/Kconfig
@@ -37,8 +37,8 @@ config SMC91X
select CRC32
select MII
depends on !OF || GPIOLIB
- depends on ARM || ARM64 || ATARI_ETHERNAT || BLACKFIN || COLDFIRE || \
- M32R || MIPS || MN10300 || NIOS2 || SUPERH || XTENSA || H8300
+ depends on ARM || ARM64 || ATARI_ETHERNAT || COLDFIRE || \
+ MIPS || NIOS2 || SUPERH || XTENSA || H8300
---help---
This is a driver for SMC's 91x series of Ethernet chipsets,
including the SMC91C94 and the SMC91C111. Say Y if you want it
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 08b17adf0a65..b337ee97e0c0 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -144,32 +144,6 @@ static inline void _SMC_outw_align4(u16 val, void __iomem *ioaddr, int reg,
#define SMC_IRQ_FLAGS (0)
-#elif defined(CONFIG_M32R)
-
-#define SMC_CAN_USE_8BIT 0
-#define SMC_CAN_USE_16BIT 1
-#define SMC_CAN_USE_32BIT 0
-
-#define SMC_inb(a, r) inb(((u32)a) + (r))
-#define SMC_inw(a, r) inw(((u32)a) + (r))
-#define SMC_outb(v, a, r) outb(v, ((u32)a) + (r))
-#define SMC_outw(lp, v, a, r) outw(v, ((u32)a) + (r))
-#define SMC_insw(a, r, p, l) insw(((u32)a) + (r), p, l)
-#define SMC_outsw(a, r, p, l) outsw(((u32)a) + (r), p, l)
-
-#define SMC_IRQ_FLAGS (0)
-
-#define RPC_LSA_DEFAULT RPC_LED_TX_RX
-#define RPC_LSB_DEFAULT RPC_LED_100_10
-
-#elif defined(CONFIG_MN10300)
-
-/*
- * MN10300/AM33 configuration
- */
-
-#include <unit/smc91111.h>
-
#elif defined(CONFIG_ATARI)
#define SMC_CAN_USE_8BIT 1
--
2.9.0
The tile architecture is getting removed, so this driver is
no longer needed.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/rtc/Kconfig | 7 ---
drivers/rtc/Makefile | 1 -
drivers/rtc/rtc-tile.c | 143 -------------------------------------------------
3 files changed, 151 deletions(-)
delete mode 100644 drivers/rtc/rtc-tile.c
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 5457d15bbcc0..0e1413a5ba3a 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1667,13 +1667,6 @@ config RTC_DRV_TEGRA
This drive can also be built as a module. If so, the module
will be called rtc-tegra.
-config RTC_DRV_TILE
- tristate "Tilera hypervisor RTC support"
- depends on TILE
- help
- Enable support for the Linux driver side of the Tilera
- hypervisor's real-time clock interface.
-
config RTC_DRV_PUV3
tristate "PKUnity v3 RTC support"
depends on ARCH_PUV3
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index f481661a6eae..f7a4b09557a0 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -163,7 +163,6 @@ obj-$(CONFIG_RTC_DRV_SUN6I) += rtc-sun6i.o
obj-$(CONFIG_RTC_DRV_SUNXI) += rtc-sunxi.o
obj-$(CONFIG_RTC_DRV_TEGRA) += rtc-tegra.o
obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o
-obj-$(CONFIG_RTC_DRV_TILE) += rtc-tile.o
obj-$(CONFIG_RTC_DRV_TPS6586X) += rtc-tps6586x.o
obj-$(CONFIG_RTC_DRV_TPS65910) += rtc-tps65910.o
obj-$(CONFIG_RTC_DRV_TPS80031) += rtc-tps80031.o
diff --git a/drivers/rtc/rtc-tile.c b/drivers/rtc/rtc-tile.c
deleted file mode 100644
index ef1cdabf05b4..000000000000
--
2.9.0
The Tile architecture is getting removed, so we no longer need this either.
Signed-off-by: Arnd Bergmann <[email protected]>
---
include/linux/raid/pq.h | 1 -
lib/raid6/Makefile | 6 ----
lib/raid6/algos.c | 3 --
lib/raid6/test/Makefile | 7 ----
lib/raid6/tilegx.uc | 87 -------------------------------------------------
5 files changed, 104 deletions(-)
delete mode 100644 lib/raid6/tilegx.uc
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 583cdd3d49ca..a366cc314479 100644
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -105,7 +105,6 @@ extern const struct raid6_calls raid6_avx2x4;
extern const struct raid6_calls raid6_avx512x1;
extern const struct raid6_calls raid6_avx512x2;
extern const struct raid6_calls raid6_avx512x4;
-extern const struct raid6_calls raid6_tilegx8;
extern const struct raid6_calls raid6_s390vx8;
struct raid6_recov_calls {
diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile
index 4add700ddfe3..44d6b46df051 100644
--- a/lib/raid6/Makefile
+++ b/lib/raid6/Makefile
@@ -7,7 +7,6 @@ raid6_pq-y += algos.o recov.o tables.o int1.o int2.o int4.o \
raid6_pq-$(CONFIG_X86) += recov_ssse3.o recov_avx2.o mmx.o sse1.o sse2.o avx2.o avx512.o recov_avx512.o
raid6_pq-$(CONFIG_ALTIVEC) += altivec1.o altivec2.o altivec4.o altivec8.o
raid6_pq-$(CONFIG_KERNEL_MODE_NEON) += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o
-raid6_pq-$(CONFIG_TILEGX) += tilegx8.o
raid6_pq-$(CONFIG_S390) += s390vx8.o recov_s390xc.o
hostprogs-y += mktables
@@ -115,11 +114,6 @@ $(obj)/neon8.c: UNROLL := 8
$(obj)/neon8.c: $(src)/neon.uc $(src)/unroll.awk FORCE
$(call if_changed,unroll)
-targets += tilegx8.c
-$(obj)/tilegx8.c: UNROLL := 8
-$(obj)/tilegx8.c: $(src)/tilegx.uc $(src)/unroll.awk FORCE
- $(call if_changed,unroll)
-
targets += s390vx8.c
$(obj)/s390vx8.c: UNROLL := 8
$(obj)/s390vx8.c: $(src)/s390vx.uc $(src)/unroll.awk FORCE
diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index 476994723258..c65aa80d67ed 100644
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -75,9 +75,6 @@ const struct raid6_calls * const raid6_algos[] = {
&raid6_altivec4,
&raid6_altivec8,
#endif
-#if defined(CONFIG_TILEGX)
- &raid6_tilegx8,
-#endif
#if defined(CONFIG_S390)
&raid6_s390vx8,
#endif
diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile
index be1010bdc435..fabc477b1417 100644
--- a/lib/raid6/test/Makefile
+++ b/lib/raid6/test/Makefile
@@ -51,9 +51,6 @@ else
OBJS += altivec1.o altivec2.o altivec4.o altivec8.o
endif
endif
-ifeq ($(ARCH),tilegx)
-OBJS += tilegx8.o
-endif
.c.o:
$(CC) $(CFLAGS) -c -o $@ $<
@@ -116,15 +113,11 @@ int16.c: int.uc ../unroll.awk
int32.c: int.uc ../unroll.awk
$(AWK) ../unroll.awk -vN=32 < int.uc > $@
-tilegx8.c: tilegx.uc ../unroll.awk
- $(AWK) ../unroll.awk -vN=8 < tilegx.uc > $@
-
tables.c: mktables
./mktables > tables.c
clean:
rm -f *.o *.a mktables mktables.c *.uc int*.c altivec*.c neon*.c tables.c raid6test
- rm -f tilegx*.c
spotless: clean
rm -f *~
diff --git a/lib/raid6/tilegx.uc b/lib/raid6/tilegx.uc
deleted file mode 100644
index 2dd291a11264..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this one is
now obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/rtc/Kconfig | 10 --
drivers/rtc/Makefile | 1 -
drivers/rtc/rtc-bfin.c | 448 -------------------------------------------------
3 files changed, 459 deletions(-)
delete mode 100644 drivers/rtc/rtc-bfin.c
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 0e1413a5ba3a..0ab8946f69b7 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1445,16 +1445,6 @@ config RTC_DRV_AU1XXX
This driver can also be built as a module. If so, the module
will be called rtc-au1xxx.
-config RTC_DRV_BFIN
- tristate "Blackfin On-Chip RTC"
- depends on BLACKFIN && !BF561
- help
- If you say yes here you will get support for the
- Blackfin On-Chip Real Time Clock.
-
- This driver can also be built as a module. If so, the module
- will be called rtc-bfin.
-
config RTC_DRV_RS5C313
tristate "Ricoh RS5C313"
depends on SH_LANDISK
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index f7a4b09557a0..5ff2fc0c361a 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -36,7 +36,6 @@ obj-$(CONFIG_RTC_DRV_ASM9260) += rtc-asm9260.o
obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o
obj-$(CONFIG_RTC_DRV_AU1XXX) += rtc-au1xxx.o
-obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o
obj-$(CONFIG_RTC_DRV_BRCMSTB) += rtc-brcmstb-waketimer.o
obj-$(CONFIG_RTC_DRV_BQ32K) += rtc-bq32k.o
obj-$(CONFIG_RTC_DRV_BQ4802) += rtc-bq4802.o
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
deleted file mode 100644
index 15344b7c07c5..000000000000
--
2.9.0
The m32r architecture was the only user of the old-style
rtc driver for ds1302. The architecture is getting removed
now, and we have a modern driver for the same hardware in
drivers/rtc/rtc-ds1302.c, so this one won't be missed.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/char/Kconfig | 9 --
drivers/char/Makefile | 1 -
drivers/char/ds1302.c | 357 --------------------------------------------------
3 files changed, 367 deletions(-)
delete mode 100644 drivers/char/ds1302.c
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c28dca0c613d..3f9561186ad7 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -346,15 +346,6 @@ config EFI_RTC
bool "EFI Real Time Clock Services"
depends on IA64
-config DS1302
- tristate "DS1302 RTC support"
- depends on M32R && (PLAT_M32700UT || PLAT_OPSPUT)
- help
- If you say Y here and create a character special file /dev/rtc with
- major number 121 and minor number 0 using mknod ("man mknod"), you
- will get access to the real time clock (or hardware clock) built
- into your computer.
-
endif # RTC_LIB
config DTLK
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 7dc3abe66464..4a34a71fe3d7 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -26,7 +26,6 @@ obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
obj-$(CONFIG_HPET) += hpet.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
-obj-$(CONFIG_DS1302) += ds1302.o
obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
ifeq ($(CONFIG_GENERIC_NVRAM),y)
obj-$(CONFIG_NVRAM) += generic_nvram.o
diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c
deleted file mode 100644
index 8e16ad5d6d89..000000000000
--
2.9.0
The tile architecture is being removed, so we no longer need this driver.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/char/Kconfig | 11 --
drivers/char/Makefile | 1 -
drivers/char/tile-srom.c | 475 -----------------------------------------------
3 files changed, 487 deletions(-)
delete mode 100644 drivers/char/tile-srom.c
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 3f9561186ad7..c9c3c2028b0b 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -566,17 +566,6 @@ config DEVPORT
source "drivers/s390/char/Kconfig"
-config TILE_SROM
- tristate "Character-device access via hypervisor to the Tilera SPI ROM"
- depends on TILE
- default y
- ---help---
- This device provides character-level read-write access
- to the SROM, typically via the "0", "1", and "2" devices
- in /dev/srom/. The Tilera hypervisor makes the flash
- device appear much like a simple EEPROM, and knows
- how to partition a single ROM for multiple purposes.
-
source "drivers/char/xillybus/Kconfig"
endmenu
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 4a34a71fe3d7..49b7bd84fa20 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -56,6 +56,5 @@ obj-$(CONFIG_PS3_FLASH) += ps3flash.o
obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o
-obj-$(CONFIG_TILE_SROM) += tile-srom.o
obj-$(CONFIG_XILLYBUS) += xillybus/
obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o
diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c
deleted file mode 100644
index 3d4cca64b2d4..000000000000
--
2.9.0
The blackfin architecture is getting removed, so we don't
need this driver any more.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/char/Kconfig | 28 ------
drivers/char/Makefile | 1 -
drivers/char/bfin-otp.c | 237 ------------------------------------------------
3 files changed, 266 deletions(-)
delete mode 100644 drivers/char/bfin-otp.c
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c9c3c2028b0b..40947a796666 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -66,34 +66,6 @@ config TTY_PRINTK
If unsure, say N.
-config BFIN_OTP
- tristate "Blackfin On-Chip OTP Memory Support"
- depends on BLACKFIN && (BF51x || BF52x || BF54x)
- default y
- help
- If you say Y here, you will get support for a character device
- interface into the One Time Programmable memory pages that are
- stored on the Blackfin processor. This will not get you access
- to the secure memory pages however. You will need to write your
- own secure code and reader for that.
-
- To compile this driver as a module, choose M here: the module
- will be called bfin-otp.
-
- If unsure, it is safe to say Y.
-
-config BFIN_OTP_WRITE_ENABLE
- bool "Enable writing support of OTP pages"
- depends on BFIN_OTP
- default n
- help
- If you say Y here, you will enable support for writing of the
- OTP pages. This is dangerous by nature as you can only program
- the pages once, so only enable this option when you actually
- need it so as to not inadvertently clobber data.
-
- If unsure, say N.
-
config PRINTER
tristate "Parallel printer support"
depends on PARPORT
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 49b7bd84fa20..c97c768cd1dd 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_MSPEC) += mspec.o
obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o
obj-$(CONFIG_IBM_BSR) += bsr.o
obj-$(CONFIG_SGI_MBCS) += mbcs.o
-obj-$(CONFIG_BFIN_OTP) += bfin-otp.o
obj-$(CONFIG_PRINTER) += lp.o
diff --git a/drivers/char/bfin-otp.c b/drivers/char/bfin-otp.c
deleted file mode 100644
index 0584025bb0c2..000000000000
--
2.9.0
The m32r architecture is getting removed, so we can kill off the
architecture specific hacks in this driver.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/net/ethernet/8390/Kconfig | 3 +--
drivers/net/ethernet/8390/ne.c | 23 ++---------------------
2 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index fdc673484add..9fee7c83ef9f 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -87,8 +87,7 @@ config MCF8390
config NE2000
tristate "NE2000/NE1000 support"
- depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX || \
- ATARI_ETHERNEC)
+ depends on (ISA || (Q40 && m) || MACH_TX49XX || ATARI_ETHERNEC)
select CRC32
---help---
If you have a network (Ethernet) card of this type, say Y here.
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index 4cdff6e6af89..44a084b41bf0 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
@@ -99,7 +99,7 @@ MODULE_LICENSE("GPL");
that the ne2k probe is the last 8390 based probe to take place (as it
is at boot) and so the probe will get confused by any other 8390 cards.
ISA device autoprobes on a running machine are not recommended anyway. */
-#if !defined(MODULE) && (defined(CONFIG_ISA) || defined(CONFIG_M32R))
+#if !defined(MODULE) && defined(CONFIG_ISA)
/* Do we need a portlist for the ISA auto-probe ? */
#define NEEDS_PORTLIST
#endif
@@ -164,12 +164,7 @@ bad_clone_list[] __initdata = {
#define NESM_START_PG 0x40 /* First page of TX buffer */
#define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */
-#if defined(CONFIG_PLAT_MAPPI)
-# define DCR_VAL 0x4b
-#elif defined(CONFIG_PLAT_OAKS32R) || \
- defined(CONFIG_MACH_TX49XX)
-# define DCR_VAL 0x48 /* 8-bit mode */
-#elif defined(CONFIG_ATARI) /* 8-bit mode on Atari, normal on Q40 */
+#if defined(CONFIG_ATARI) /* 8-bit mode on Atari, normal on Q40 */
# define DCR_VAL (MACH_IS_ATARI ? 0x48 : 0x49)
#else
# define DCR_VAL 0x49
@@ -422,12 +417,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
stop_page = NE1SM_STOP_PG;
}
-#if defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R)
- neX000 = ((SA_prom[14] == 0x57 && SA_prom[15] == 0x57)
- || (SA_prom[14] == 0x42 && SA_prom[15] == 0x42));
-#else
neX000 = (SA_prom[14] == 0x57 && SA_prom[15] == 0x57);
-#endif
ctron = (SA_prom[0] == 0x00 && SA_prom[1] == 0x00 && SA_prom[2] == 0x1d);
copam = (SA_prom[14] == 0x49 && SA_prom[15] == 0x00);
@@ -508,18 +498,9 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
dev->base_addr = ioaddr;
-#ifdef CONFIG_PLAT_MAPPI
- outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP,
- ioaddr + E8390_CMD); /* 0x61 */
- for (i = 0; i < ETH_ALEN; i++) {
- dev->dev_addr[i] = SA_prom[i]
- = inb_p(ioaddr + EN1_PHYS_SHIFT(i));
- }
-#else
for (i = 0; i < ETH_ALEN; i++) {
dev->dev_addr[i] = SA_prom[i];
}
-#endif
pr_cont("%pM\n", dev->dev_addr);
--
2.9.0
The m32r architecture is getting removed, so these drivers
are no longer needed.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/pcmcia/Kconfig | 19 --
drivers/pcmcia/Makefile | 2 -
drivers/pcmcia/m32r_cfc.c | 786 ----------------------------------------------
drivers/pcmcia/m32r_cfc.h | 88 ------
drivers/pcmcia/m32r_pcc.c | 763 --------------------------------------------
drivers/pcmcia/m32r_pcc.h | 66 ----
6 files changed, 1724 deletions(-)
delete mode 100644 drivers/pcmcia/m32r_cfc.c
delete mode 100644 drivers/pcmcia/m32r_cfc.h
delete mode 100644 drivers/pcmcia/m32r_pcc.c
delete mode 100644 drivers/pcmcia/m32r_pcc.h
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index d3c378b4db6c..49540d13dea4 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -232,25 +232,6 @@ config PCMCIA_PROBE
bool
default y if ISA && !ARCH_SA1100 && !PARISC
-config M32R_PCC
- bool "M32R PCMCIA I/F"
- depends on M32R && CHIP_M32700 && PCMCIA
- help
- Say Y here to use the M32R PCMCIA controller.
-
-config M32R_CFC
- bool "M32R CF I/F Controller"
- depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT)
- help
- Say Y here to use the M32R CompactFlash controller.
-
-config M32R_CFC_NUM
- int "M32R CF I/F number"
- depends on M32R_CFC
- default "1" if PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT
- help
- Set the number of M32R CF slots.
-
config PCMCIA_VRC4171
tristate "NEC VRC4171 Card Controllers support"
depends on CPU_VR41XX && ISA && PCMCIA
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index e7dae16b9a43..ca361266d055 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -28,8 +28,6 @@ obj-$(CONFIG_PCMCIA_SOC_COMMON) += soc_common.o
obj-$(CONFIG_PCMCIA_SA11XX_BASE) += sa11xx_base.o
obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o
obj-$(CONFIG_PCMCIA_SA1111) += sa1111_cs.o
-obj-$(CONFIG_M32R_PCC) += m32r_pcc.o
-obj-$(CONFIG_M32R_CFC) += m32r_cfc.o
obj-$(CONFIG_PCMCIA_BCM63XX) += bcm63xx_pcmcia.o
obj-$(CONFIG_PCMCIA_VRC4171) += vrc4171_card.o
obj-$(CONFIG_PCMCIA_VRC4173) += vrc4173_cardu.o
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c
deleted file mode 100644
index 9a4940e56e2f..000000000000
diff --git a/drivers/pcmcia/m32r_cfc.h b/drivers/pcmcia/m32r_cfc.h
deleted file mode 100644
index 05fec98617d0..000000000000
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
deleted file mode 100644
index c2239a7e383a..000000000000
diff --git a/drivers/pcmcia/m32r_pcc.h b/drivers/pcmcia/m32r_pcc.h
deleted file mode 100644
index d99ad3864ff3..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this one is no
longer needed either.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/pcmcia/Kconfig | 7 -
drivers/pcmcia/Makefile | 1 -
drivers/pcmcia/bfin_cf_pcmcia.c | 316 ----------------------------------------
3 files changed, 324 deletions(-)
delete mode 100644 drivers/pcmcia/bfin_cf_pcmcia.c
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 49540d13dea4..cbbe4a285b48 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -247,13 +247,6 @@ config OMAP_CF
Say Y here to support the CompactFlash controller on OMAP.
Note that this doesn't support "True IDE" mode.
-config BFIN_CFPCMCIA
- tristate "Blackfin CompactFlash PCMCIA Driver"
- depends on PCMCIA && BLACKFIN
- help
- Say Y here to support the CompactFlash PCMCIA driver for Blackfin.
-
-
config AT91_CF
tristate "AT91 CompactFlash Controller"
depends on PCI
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index ca361266d055..f1f89ddb1bfd 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_PCMCIA_BCM63XX) += bcm63xx_pcmcia.o
obj-$(CONFIG_PCMCIA_VRC4171) += vrc4171_card.o
obj-$(CONFIG_PCMCIA_VRC4173) += vrc4173_cardu.o
obj-$(CONFIG_OMAP_CF) += omap_cf.o
-obj-$(CONFIG_BFIN_CFPCMCIA) += bfin_cf_pcmcia.o
obj-$(CONFIG_AT91_CF) += at91_cf.o
obj-$(CONFIG_ELECTRA_CF) += electra_cf.o
obj-$(CONFIG_PCMCIA_ALCHEMY_DEVBOARD) += db1xxx_ss.o
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
deleted file mode 100644
index 00a296d431ba..000000000000
--
2.9.0
The blackfin architecture is getting removed, so the ASoC drivers
are all obsolete as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
MAINTAINERS | 7 -
sound/soc/Kconfig | 1 -
sound/soc/Makefile | 1 -
sound/soc/blackfin/Kconfig | 205 ------
sound/soc/blackfin/Makefile | 40 --
sound/soc/blackfin/bf5xx-ac97-pcm.c | 480 --------------
sound/soc/blackfin/bf5xx-ac97.c | 388 -----------
sound/soc/blackfin/bf5xx-ac97.h | 57 --
sound/soc/blackfin/bf5xx-ad1836.c | 109 ---
sound/soc/blackfin/bf5xx-ad193x.c | 131 ----
sound/soc/blackfin/bf5xx-ad1980.c | 109 ---
sound/soc/blackfin/bf5xx-ad73311.c | 212 ------
sound/soc/blackfin/bf5xx-i2s-pcm.c | 373 -----------
sound/soc/blackfin/bf5xx-i2s-pcm.h | 17 -
sound/soc/blackfin/bf5xx-i2s.c | 391 -----------
sound/soc/blackfin/bf5xx-sport.c | 1102 -------------------------------
sound/soc/blackfin/bf5xx-sport.h | 174 -----
sound/soc/blackfin/bf5xx-ssm2602.c | 126 ----
sound/soc/blackfin/bf6xx-i2s.c | 239 -------
sound/soc/blackfin/bf6xx-sport.c | 425 ------------
sound/soc/blackfin/bf6xx-sport.h | 82 ---
sound/soc/blackfin/bfin-eval-adau1373.c | 173 -----
sound/soc/blackfin/bfin-eval-adau1701.c | 113 ----
sound/soc/blackfin/bfin-eval-adau1x61.c | 142 ----
sound/soc/blackfin/bfin-eval-adau1x81.c | 129 ----
sound/soc/blackfin/bfin-eval-adav80x.c | 145 ----
26 files changed, 5371 deletions(-)
delete mode 100644 sound/soc/blackfin/Kconfig
delete mode 100644 sound/soc/blackfin/Makefile
delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.c
delete mode 100644 sound/soc/blackfin/bf5xx-ac97.c
delete mode 100644 sound/soc/blackfin/bf5xx-ac97.h
delete mode 100644 sound/soc/blackfin/bf5xx-ad1836.c
delete mode 100644 sound/soc/blackfin/bf5xx-ad193x.c
delete mode 100644 sound/soc/blackfin/bf5xx-ad1980.c
delete mode 100644 sound/soc/blackfin/bf5xx-ad73311.c
delete mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.c
delete mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.h
delete mode 100644 sound/soc/blackfin/bf5xx-i2s.c
delete mode 100644 sound/soc/blackfin/bf5xx-sport.c
delete mode 100644 sound/soc/blackfin/bf5xx-sport.h
delete mode 100644 sound/soc/blackfin/bf5xx-ssm2602.c
delete mode 100644 sound/soc/blackfin/bf6xx-i2s.c
delete mode 100644 sound/soc/blackfin/bf6xx-sport.c
delete mode 100644 sound/soc/blackfin/bf6xx-sport.h
delete mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
delete mode 100644 sound/soc/blackfin/bfin-eval-adau1701.c
delete mode 100644 sound/soc/blackfin/bfin-eval-adau1x61.c
delete mode 100644 sound/soc/blackfin/bfin-eval-adau1x81.c
delete mode 100644 sound/soc/blackfin/bfin-eval-adav80x.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 64cd083b60ef..6eb7387bb1e9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -841,13 +841,6 @@ F: sound/soc/codecs/ad7*
F: sound/soc/codecs/ssm*
F: sound/soc/codecs/sigmadsp.*
-ANALOG DEVICES INC ASOC DRIVERS
-L: [email protected] (moderated for non-subscribers)
-L: [email protected] (moderated for non-subscribers)
-W: http://blackfin.uclinux.org/
-S: Supported
-F: sound/soc/blackfin/*
-
ANALOG DEVICES INC DMA DRIVERS
M: Lars-Peter Clausen <[email protected]>
W: http://ez.analog.com/community/linux-device-drivers
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 84c3582f3982..41af6b9cc350 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -45,7 +45,6 @@ source "sound/soc/amd/Kconfig"
source "sound/soc/atmel/Kconfig"
source "sound/soc/au1x/Kconfig"
source "sound/soc/bcm/Kconfig"
-source "sound/soc/blackfin/Kconfig"
source "sound/soc/cirrus/Kconfig"
source "sound/soc/davinci/Kconfig"
source "sound/soc/dwc/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 74cd1858d38b..8d92492183d2 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -29,7 +29,6 @@ obj-$(CONFIG_SND_SOC) += amd/
obj-$(CONFIG_SND_SOC) += atmel/
obj-$(CONFIG_SND_SOC) += au1x/
obj-$(CONFIG_SND_SOC) += bcm/
-obj-$(CONFIG_SND_SOC) += blackfin/
obj-$(CONFIG_SND_SOC) += cirrus/
obj-$(CONFIG_SND_SOC) += davinci/
obj-$(CONFIG_SND_SOC) += dwc/
diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig
deleted file mode 100644
index 6410aa2cc2cf..000000000000
diff --git a/sound/soc/blackfin/Makefile b/sound/soc/blackfin/Makefile
deleted file mode 100644
index ebeb6a9cedd2..000000000000
diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c
deleted file mode 100644
index 08bceb519c29..000000000000
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
deleted file mode 100644
index a040cfe29fc0..000000000000
diff --git a/sound/soc/blackfin/bf5xx-ac97.h b/sound/soc/blackfin/bf5xx-ac97.h
deleted file mode 100644
index a680fdc9bb42..000000000000
diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c
deleted file mode 100644
index 864df2616e10..000000000000
diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c
deleted file mode 100644
index 603ad1f2b9b9..000000000000
diff --git a/sound/soc/blackfin/bf5xx-ad1980.c b/sound/soc/blackfin/bf5xx-ad1980.c
deleted file mode 100644
index 0fa81a523b8a..000000000000
diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c
deleted file mode 100644
index 786bbdd96e7c..000000000000
diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c
deleted file mode 100644
index 6712b01dabd1..000000000000
diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.h b/sound/soc/blackfin/bf5xx-i2s-pcm.h
deleted file mode 100644
index 1f0435249f88..000000000000
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
deleted file mode 100644
index b69aeef6418e..000000000000
diff --git a/sound/soc/blackfin/bf5xx-sport.c b/sound/soc/blackfin/bf5xx-sport.c
deleted file mode 100644
index 9dfa1241ea66..000000000000
diff --git a/sound/soc/blackfin/bf5xx-sport.h b/sound/soc/blackfin/bf5xx-sport.h
deleted file mode 100644
index 9fc2192feb3b..000000000000
diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c
deleted file mode 100644
index 9c19ccc936e2..000000000000
diff --git a/sound/soc/blackfin/bf6xx-i2s.c b/sound/soc/blackfin/bf6xx-i2s.c
deleted file mode 100644
index 819cff149a25..000000000000
diff --git a/sound/soc/blackfin/bf6xx-sport.c b/sound/soc/blackfin/bf6xx-sport.c
deleted file mode 100644
index d2caadfe7b6d..000000000000
diff --git a/sound/soc/blackfin/bf6xx-sport.h b/sound/soc/blackfin/bf6xx-sport.h
deleted file mode 100644
index 307d193cfcef..000000000000
diff --git a/sound/soc/blackfin/bfin-eval-adau1373.c b/sound/soc/blackfin/bfin-eval-adau1373.c
deleted file mode 100644
index 64b88fdc1f6c..000000000000
diff --git a/sound/soc/blackfin/bfin-eval-adau1701.c b/sound/soc/blackfin/bfin-eval-adau1701.c
deleted file mode 100644
index 5c67f72cf9a9..000000000000
diff --git a/sound/soc/blackfin/bfin-eval-adau1x61.c b/sound/soc/blackfin/bfin-eval-adau1x61.c
deleted file mode 100644
index fddfe00c9d69..000000000000
diff --git a/sound/soc/blackfin/bfin-eval-adau1x81.c b/sound/soc/blackfin/bfin-eval-adau1x81.c
deleted file mode 100644
index 3e01cbe53fc7..000000000000
diff --git a/sound/soc/blackfin/bfin-eval-adav80x.c b/sound/soc/blackfin/bfin-eval-adav80x.c
deleted file mode 100644
index 99e5ecabdcda..000000000000
--
2.9.0
The blackfin and m32r architectures are getting removed, so it's
time to clean up the logos as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/video/logo/Kconfig | 15 -
drivers/video/logo/Makefile | 3 -
drivers/video/logo/logo.c | 12 -
drivers/video/logo/logo_blackfin_clut224.ppm | 1127 ----------------------
drivers/video/logo/logo_blackfin_vga16.ppm | 1127 ----------------------
drivers/video/logo/logo_m32r_clut224.ppm | 1292 --------------------------
include/linux/linux_logo.h | 3 -
7 files changed, 3579 deletions(-)
delete mode 100644 drivers/video/logo/logo_blackfin_clut224.ppm
delete mode 100644 drivers/video/logo/logo_blackfin_vga16.ppm
delete mode 100644 drivers/video/logo/logo_m32r_clut224.ppm
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 0037104d66ac..d1f6196c8b9a 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -27,16 +27,6 @@ config LOGO_LINUX_CLUT224
bool "Standard 224-color Linux logo"
default y
-config LOGO_BLACKFIN_VGA16
- bool "16-colour Blackfin Processor Linux logo"
- depends on BLACKFIN
- default y
-
-config LOGO_BLACKFIN_CLUT224
- bool "224-colour Blackfin Processor Linux logo"
- depends on BLACKFIN
- default y
-
config LOGO_DEC_CLUT224
bool "224-color Digital Equipment Corporation Linux logo"
depends on MACH_DECSTATION || ALPHA
@@ -77,9 +67,4 @@ config LOGO_SUPERH_CLUT224
depends on SUPERH
default y
-config LOGO_M32R_CLUT224
- bool "224-color M32R Linux logo"
- depends on M32R
- default y
-
endif # LOGO
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index 6194373ee424..228a89b9bdd1 100644
--- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile
@@ -5,8 +5,6 @@ obj-$(CONFIG_LOGO) += logo.o
obj-$(CONFIG_LOGO_LINUX_MONO) += logo_linux_mono.o
obj-$(CONFIG_LOGO_LINUX_VGA16) += logo_linux_vga16.o
obj-$(CONFIG_LOGO_LINUX_CLUT224) += logo_linux_clut224.o
-obj-$(CONFIG_LOGO_BLACKFIN_CLUT224) += logo_blackfin_clut224.o
-obj-$(CONFIG_LOGO_BLACKFIN_VGA16) += logo_blackfin_vga16.o
obj-$(CONFIG_LOGO_DEC_CLUT224) += logo_dec_clut224.o
obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o
obj-$(CONFIG_LOGO_PARISC_CLUT224) += logo_parisc_clut224.o
@@ -15,7 +13,6 @@ obj-$(CONFIG_LOGO_SUN_CLUT224) += logo_sun_clut224.o
obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
-obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index 4d50bfd13e7c..36aa050f9a21 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -63,10 +63,6 @@ const struct linux_logo * __ref fb_find_logo(int depth)
/* Generic Linux logo */
logo = &logo_linux_vga16;
#endif
-#ifdef CONFIG_LOGO_BLACKFIN_VGA16
- /* Blackfin processor logo */
- logo = &logo_blackfin_vga16;
-#endif
#ifdef CONFIG_LOGO_SUPERH_VGA16
/* SuperH Linux logo */
logo = &logo_superh_vga16;
@@ -78,10 +74,6 @@ const struct linux_logo * __ref fb_find_logo(int depth)
/* Generic Linux logo */
logo = &logo_linux_clut224;
#endif
-#ifdef CONFIG_LOGO_BLACKFIN_CLUT224
- /* Blackfin Linux logo */
- logo = &logo_blackfin_clut224;
-#endif
#ifdef CONFIG_LOGO_DEC_CLUT224
/* DEC Linux logo on MIPS/MIPS64 or ALPHA */
logo = &logo_dec_clut224;
@@ -107,10 +99,6 @@ const struct linux_logo * __ref fb_find_logo(int depth)
/* SuperH Linux logo */
logo = &logo_superh_clut224;
#endif
-#ifdef CONFIG_LOGO_M32R_CLUT224
- /* M32R Linux logo */
- logo = &logo_m32r_clut224;
-#endif
}
return logo;
}
diff --git a/drivers/video/logo/logo_blackfin_clut224.ppm b/drivers/video/logo/logo_blackfin_clut224.ppm
deleted file mode 100644
index dc9a50a14477..000000000000
diff --git a/drivers/video/logo/logo_blackfin_vga16.ppm b/drivers/video/logo/logo_blackfin_vga16.ppm
deleted file mode 100644
index 1352b02a9d93..000000000000
diff --git a/drivers/video/logo/logo_m32r_clut224.ppm b/drivers/video/logo/logo_m32r_clut224.ppm
deleted file mode 100644
index 8b2983c5a0bd..000000000000
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index 5e3581d76c7f..d4d5b93efe84 100644
--- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h
@@ -36,8 +36,6 @@ struct linux_logo {
extern const struct linux_logo logo_linux_mono;
extern const struct linux_logo logo_linux_vga16;
extern const struct linux_logo logo_linux_clut224;
-extern const struct linux_logo logo_blackfin_vga16;
-extern const struct linux_logo logo_blackfin_clut224;
extern const struct linux_logo logo_dec_clut224;
extern const struct linux_logo logo_mac_clut224;
extern const struct linux_logo logo_parisc_clut224;
@@ -46,7 +44,6 @@ extern const struct linux_logo logo_sun_clut224;
extern const struct linux_logo logo_superh_mono;
extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224;
-extern const struct linux_logo logo_m32r_clut224;
extern const struct linux_logo logo_spe_clut224;
extern const struct linux_logo *fb_find_logo(int depth);
--
2.9.0
The m32r architecture is being removed, so this is no longer needed.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/video/fbdev/s1d13xxxfb.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
index 5d6179ef0298..e04efb567b5c 100644
--- a/drivers/video/fbdev/s1d13xxxfb.c
+++ b/drivers/video/fbdev/s1d13xxxfb.c
@@ -96,18 +96,12 @@ static const struct fb_fix_screeninfo s1d13xxxfb_fix = {
static inline u8
s1d13xxxfb_readreg(struct s1d13xxxfb_par *par, u16 regno)
{
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3)
- regno=((regno & 1) ? (regno & ~1L) : (regno + 1));
-#endif
return readb(par->regs + regno);
}
static inline void
s1d13xxxfb_writereg(struct s1d13xxxfb_par *par, u16 regno, u8 value)
{
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3)
- regno=((regno & 1) ? (regno & ~1L) : (regno + 1));
-#endif
writeb(value, par->regs + regno);
}
@@ -296,11 +290,7 @@ s1d13xxxfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
dbg("s1d13xxxfb_setcolreg: pseudo %d, val %08x\n",
regno, pseudo_val);
-#if defined(CONFIG_PLAT_MAPPI)
- ((u32 *)info->pseudo_palette)[regno] = cpu_to_le16(pseudo_val);
-#else
((u32 *)info->pseudo_palette)[regno] = pseudo_val;
-#endif
break;
case FB_VISUAL_PSEUDOCOLOR:
--
2.9.0
The blackfin architecture is getting removed, this removes the
associated fbdev drivers as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/video/fbdev/Kconfig | 103 ----
drivers/video/fbdev/Makefile | 5 -
drivers/video/fbdev/bf537-lq035.c | 891 ---------------------------------
drivers/video/fbdev/bf54x-lq043fb.c | 764 ----------------------------
drivers/video/fbdev/bfin-lq035q1-fb.c | 864 --------------------------------
drivers/video/fbdev/bfin-t350mcqb-fb.c | 669 -------------------------
drivers/video/fbdev/bfin_adv7393fb.c | 828 ------------------------------
drivers/video/fbdev/bfin_adv7393fb.h | 319 ------------
8 files changed, 4443 deletions(-)
delete mode 100644 drivers/video/fbdev/bf537-lq035.c
delete mode 100644 drivers/video/fbdev/bf54x-lq043fb.c
delete mode 100644 drivers/video/fbdev/bfin-lq035q1-fb.c
delete mode 100644 drivers/video/fbdev/bfin-t350mcqb-fb.c
delete mode 100644 drivers/video/fbdev/bfin_adv7393fb.c
delete mode 100644 drivers/video/fbdev/bfin_adv7393fb.h
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 11e699f1062b..399573742487 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -580,109 +580,6 @@ config FB_VGA16
To compile this driver as a module, choose M here: the
module will be called vga16fb.
-config FB_BF54X_LQ043
- tristate "SHARP LQ043 TFT LCD (BF548 EZKIT)"
- depends on FB && (BF54x) && !BF542
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
- help
- This is the framebuffer device driver for a SHARP LQ043T1DG01 TFT LCD
-
-config FB_BFIN_T350MCQB
- tristate "Varitronix COG-T350MCQB TFT LCD display (BF527 EZKIT)"
- depends on FB && BLACKFIN
- select BFIN_GPTIMERS
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
- help
- This is the framebuffer device driver for a Varitronix VL-PS-COG-T350MCQB-01 display TFT LCD
- This display is a QVGA 320x240 24-bit RGB display interfaced by an 8-bit wide PPI
- It uses PPI[0..7] PPI_FS1, PPI_FS2 and PPI_CLK.
-
-config FB_BFIN_LQ035Q1
- tristate "SHARP LQ035Q1DH02 TFT LCD"
- depends on FB && BLACKFIN && SPI
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
- select BFIN_GPTIMERS
- help
- This is the framebuffer device driver for a SHARP LQ035Q1DH02 TFT display found on
- the Blackfin Landscape LCD EZ-Extender Card.
- This display is a QVGA 320x240 18-bit RGB display interfaced by an 16-bit wide PPI
- It uses PPI[0..15] PPI_FS1, PPI_FS2 and PPI_CLK.
-
- To compile this driver as a module, choose M here: the
- module will be called bfin-lq035q1-fb.
-
-config FB_BF537_LQ035
- tristate "SHARP LQ035 TFT LCD (BF537 STAMP)"
- depends on FB && (BF534 || BF536 || BF537) && I2C_BLACKFIN_TWI
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
- select BFIN_GPTIMERS
- help
- This is the framebuffer device for a SHARP LQ035Q7DB03 TFT LCD
- attached to a BF537.
-
- To compile this driver as a module, choose M here: the
- module will be called bf537-lq035.
-
-config FB_BFIN_7393
- tristate "Blackfin ADV7393 Video encoder"
- depends on FB && BLACKFIN
- select I2C
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
- help
- This is the framebuffer device for a ADV7393 video encoder
- attached to a Blackfin on the PPI port.
- If your Blackfin board has a ADV7393 select Y.
-
- To compile this driver as a module, choose M here: the
- module will be called bfin_adv7393fb.
-
-choice
- prompt "Video mode support"
- depends on FB_BFIN_7393
- default NTSC
-
-config NTSC
- bool 'NTSC 720x480'
-
-config PAL
- bool 'PAL 720x576'
-
-config NTSC_640x480
- bool 'NTSC 640x480 (Experimental)'
-
-config PAL_640x480
- bool 'PAL 640x480 (Experimental)'
-
-config NTSC_YCBCR
- bool 'NTSC 720x480 YCbCR input'
-
-config PAL_YCBCR
- bool 'PAL 720x576 YCbCR input'
-
-endchoice
-
-choice
- prompt "Size of ADV7393 frame buffer memory Single/Double Size"
- depends on (FB_BFIN_7393)
- default ADV7393_1XMEM
-
-config ADV7393_1XMEM
- bool 'Single'
-
-config ADV7393_2XMEM
- bool 'Double'
-endchoice
-
config FB_STI
tristate "HP STI frame buffer device support"
depends on FB && PARISC
diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
index 115961e0721b..55282a21b500 100644
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@ -136,11 +136,6 @@ obj-$(CONFIG_FB_VESA) += vesafb.o
obj-$(CONFIG_FB_EFI) += efifb.o
obj-$(CONFIG_FB_VGA16) += vga16fb.o
obj-$(CONFIG_FB_OF) += offb.o
-obj-$(CONFIG_FB_BF537_LQ035) += bf537-lq035.o
-obj-$(CONFIG_FB_BF54X_LQ043) += bf54x-lq043fb.o
-obj-$(CONFIG_FB_BFIN_LQ035Q1) += bfin-lq035q1-fb.o
-obj-$(CONFIG_FB_BFIN_T350MCQB) += bfin-t350mcqb-fb.o
-obj-$(CONFIG_FB_BFIN_7393) += bfin_adv7393fb.o
obj-$(CONFIG_FB_MX3) += mx3fb.o
obj-$(CONFIG_FB_DA8XX) += da8xx-fb.o
obj-$(CONFIG_FB_MXS) += mxsfb.o
diff --git a/drivers/video/fbdev/bf537-lq035.c b/drivers/video/fbdev/bf537-lq035.c
deleted file mode 100644
index ef29fb425122..000000000000
diff --git a/drivers/video/fbdev/bf54x-lq043fb.c b/drivers/video/fbdev/bf54x-lq043fb.c
deleted file mode 100644
index 8f1f97c75619..000000000000
diff --git a/drivers/video/fbdev/bfin-lq035q1-fb.c b/drivers/video/fbdev/bfin-lq035q1-fb.c
deleted file mode 100644
index b459354ad940..000000000000
diff --git a/drivers/video/fbdev/bfin-t350mcqb-fb.c b/drivers/video/fbdev/bfin-t350mcqb-fb.c
deleted file mode 100644
index e5ee4d9677f7..000000000000
diff --git a/drivers/video/fbdev/bfin_adv7393fb.c b/drivers/video/fbdev/bfin_adv7393fb.c
deleted file mode 100644
index 542ffaddc6ab..000000000000
diff --git a/drivers/video/fbdev/bfin_adv7393fb.h b/drivers/video/fbdev/bfin_adv7393fb.h
deleted file mode 100644
index afd0380e19e1..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this
driver won't be used any more.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/crypto/Kconfig | 7 -
drivers/crypto/Makefile | 1 -
drivers/crypto/bfin_crc.c | 753 ----------------------------------------------
drivers/crypto/bfin_crc.h | 124 --------
4 files changed, 885 deletions(-)
delete mode 100644 drivers/crypto/bfin_crc.c
delete mode 100644 drivers/crypto/bfin_crc.h
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 5c4106979cc9..d1ea1a07cecb 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -464,13 +464,6 @@ if CRYPTO_DEV_UX500
source "drivers/crypto/ux500/Kconfig"
endif # if CRYPTO_DEV_UX500
-config CRYPTO_DEV_BFIN_CRC
- tristate "Support for Blackfin CRC hardware"
- depends on BF60x
- help
- Newer Blackfin processors have CRC hardware. Select this if you
- want to use the Blackfin CRC module.
-
config CRYPTO_DEV_ATMEL_AUTHENC
tristate "Support for Atmel IPSEC/SSL hw accelerator"
depends on HAS_DMA
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index ee5ec5c94383..7ae87b4f6c8d 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -3,7 +3,6 @@ obj-$(CONFIG_CRYPTO_DEV_ATMEL_AES) += atmel-aes.o
obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA) += atmel-sha.o
obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o
obj-$(CONFIG_CRYPTO_DEV_ATMEL_ECC) += atmel-ecc.o
-obj-$(CONFIG_CRYPTO_DEV_BFIN_CRC) += bfin_crc.o
obj-$(CONFIG_CRYPTO_DEV_CAVIUM_ZIP) += cavium/
obj-$(CONFIG_CRYPTO_DEV_CCP) += ccp/
obj-$(CONFIG_CRYPTO_DEV_CCREE) += ccree/
diff --git a/drivers/crypto/bfin_crc.c b/drivers/crypto/bfin_crc.c
deleted file mode 100644
index cfc4d682d55a..000000000000
diff --git a/drivers/crypto/bfin_crc.h b/drivers/crypto/bfin_crc.h
deleted file mode 100644
index 786ef746d109..000000000000
--
2.9.0
The m32r architecture is getting removed, so this one is no longer needed.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/media/platform/Kconfig | 20 -
drivers/media/platform/Makefile | 2 -
drivers/media/platform/arv.c | 884 ----------------------------------------
3 files changed, 906 deletions(-)
delete mode 100644 drivers/media/platform/arv.c
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 2136702c95fc..c7a1cf8a1b01 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -52,26 +52,6 @@ config VIDEO_VIU
Say Y here if you want to enable VIU device on MPC5121e Rev2+.
In doubt, say N.
-config VIDEO_M32R_AR
- tristate "AR devices"
- depends on VIDEO_V4L2
- depends on M32R || COMPILE_TEST
- ---help---
- This is a video4linux driver for the Renesas AR (Artificial Retina)
- camera module.
-
-config VIDEO_M32R_AR_M64278
- tristate "AR device with color module M64278(VGA)"
- depends on PLAT_M32700UT
- select VIDEO_M32R_AR
- ---help---
- This is a video4linux driver for the Renesas AR (Artificial
- Retina) with M64278E-800 camera module.
- This module supports VGA(640x480 pixels) resolutions.
-
- To compile this driver as a module, choose M here: the
- module will be called arv.
-
config VIDEO_MUX
tristate "Video Multiplexer"
select MULTIPLEXER
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 2b07f2e2fca6..932515df4477 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -3,8 +3,6 @@
# Makefile for the video capture/playback device drivers.
#
-obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
-
obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/
diff --git a/drivers/media/platform/arv.c b/drivers/media/platform/arv.c
deleted file mode 100644
index 1e865fea803c..000000000000
--
2.9.0
The cris architecture is getting removed, including the artpec3
and etraxfs SoCs, so these cpufreq drivers are now unused.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/cpufreq/Makefile | 2 -
drivers/cpufreq/cris-artpec3-cpufreq.c | 93 ----------------------------------
drivers/cpufreq/cris-etraxfs-cpufreq.c | 92 ---------------------------------
3 files changed, 187 deletions(-)
delete mode 100644 drivers/cpufreq/cris-artpec3-cpufreq.c
delete mode 100644 drivers/cpufreq/cris-etraxfs-cpufreq.c
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 2e4495cf9aa8..8d24ade3bd02 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -102,8 +102,6 @@ obj-$(CONFIG_POWERNV_CPUFREQ) += powernv-cpufreq.o
##################################################################################
# Other platform drivers
obj-$(CONFIG_BMIPS_CPUFREQ) += bmips-cpufreq.o
-obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o
-obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o
obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o
obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
obj-$(CONFIG_LOONGSON1_CPUFREQ) += loongson1-cpufreq.o
diff --git a/drivers/cpufreq/cris-artpec3-cpufreq.c b/drivers/cpufreq/cris-artpec3-cpufreq.c
deleted file mode 100644
index 455b4fb78cba..000000000000
diff --git a/drivers/cpufreq/cris-etraxfs-cpufreq.c b/drivers/cpufreq/cris-etraxfs-cpufreq.c
deleted file mode 100644
index 4c4b5dd685e3..000000000000
--
2.9.0
On Wed, 14 Mar 2018, Arnd Bergmann wrote:
> The m32r architecture is getting removed, so this part can be
> cleaned up as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Nicolas Pitre <[email protected]>
> ---
> drivers/net/ethernet/smsc/Kconfig | 4 ++--
> drivers/net/ethernet/smsc/smc91x.h | 26 --------------------------
> 2 files changed, 2 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
> index 4c2f612e4414..1c2b6663f7ce 100644
> --- a/drivers/net/ethernet/smsc/Kconfig
> +++ b/drivers/net/ethernet/smsc/Kconfig
> @@ -37,8 +37,8 @@ config SMC91X
> select CRC32
> select MII
> depends on !OF || GPIOLIB
> - depends on ARM || ARM64 || ATARI_ETHERNAT || BLACKFIN || COLDFIRE || \
> - M32R || MIPS || MN10300 || NIOS2 || SUPERH || XTENSA || H8300
> + depends on ARM || ARM64 || ATARI_ETHERNAT || COLDFIRE || \
> + MIPS || NIOS2 || SUPERH || XTENSA || H8300
> ---help---
> This is a driver for SMC's 91x series of Ethernet chipsets,
> including the SMC91C94 and the SMC91C111. Say Y if you want it
> diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
> index 08b17adf0a65..b337ee97e0c0 100644
> --- a/drivers/net/ethernet/smsc/smc91x.h
> +++ b/drivers/net/ethernet/smsc/smc91x.h
> @@ -144,32 +144,6 @@ static inline void _SMC_outw_align4(u16 val, void __iomem *ioaddr, int reg,
>
> #define SMC_IRQ_FLAGS (0)
>
> -#elif defined(CONFIG_M32R)
> -
> -#define SMC_CAN_USE_8BIT 0
> -#define SMC_CAN_USE_16BIT 1
> -#define SMC_CAN_USE_32BIT 0
> -
> -#define SMC_inb(a, r) inb(((u32)a) + (r))
> -#define SMC_inw(a, r) inw(((u32)a) + (r))
> -#define SMC_outb(v, a, r) outb(v, ((u32)a) + (r))
> -#define SMC_outw(lp, v, a, r) outw(v, ((u32)a) + (r))
> -#define SMC_insw(a, r, p, l) insw(((u32)a) + (r), p, l)
> -#define SMC_outsw(a, r, p, l) outsw(((u32)a) + (r), p, l)
> -
> -#define SMC_IRQ_FLAGS (0)
> -
> -#define RPC_LSA_DEFAULT RPC_LED_TX_RX
> -#define RPC_LSB_DEFAULT RPC_LED_100_10
> -
> -#elif defined(CONFIG_MN10300)
> -
> -/*
> - * MN10300/AM33 configuration
> - */
> -
> -#include <unit/smc91111.h>
> -
> #elif defined(CONFIG_ATARI)
>
> #define SMC_CAN_USE_8BIT 1
> --
> 2.9.0
>
>
The cris architecture is getting removed, so we no longer need the
etraxfs driver.
Signed-off-by: Arnd Bergmann <[email protected]>
---
.../devicetree/bindings/gpio/gpio-etraxfs.txt | 22 -
drivers/gpio/Kconfig | 9 -
drivers/gpio/Makefile | 1 -
drivers/gpio/gpio-etraxfs.c | 475 ---------------------
4 files changed, 507 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-etraxfs.txt
delete mode 100644 drivers/gpio/gpio-etraxfs.c
diff --git a/Documentation/devicetree/bindings/gpio/gpio-etraxfs.txt b/Documentation/devicetree/bindings/gpio/gpio-etraxfs.txt
deleted file mode 100644
index 170194af3027..000000000000
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 6b1ee11295d5..43c85cbfb878 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -181,15 +181,6 @@ config GPIO_EP93XX
depends on ARCH_EP93XX
select GPIO_GENERIC
-config GPIO_ETRAXFS
- bool "Axis ETRAX FS General I/O"
- depends on CRIS || COMPILE_TEST
- depends on OF_GPIO
- select GPIO_GENERIC
- select GPIOLIB_IRQCHIP
- help
- Say yes here to support the GPIO controller on Axis ETRAX FS SoCs.
-
config GPIO_EXAR
tristate "Support for GPIO pins on XR17V352/354/358"
depends on SERIAL_8250_EXAR
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 5c1f087c65aa..c92c5d78bb04 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -47,7 +47,6 @@ obj-$(CONFIG_GPIO_DLN2) += gpio-dln2.o
obj-$(CONFIG_GPIO_DWAPB) += gpio-dwapb.o
obj-$(CONFIG_GPIO_EM) += gpio-em.o
obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o
-obj-$(CONFIG_GPIO_ETRAXFS) += gpio-etraxfs.o
obj-$(CONFIG_GPIO_EXAR) += gpio-exar.o
obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o
obj-$(CONFIG_GPIO_FTGPIO010) += gpio-ftgpio010.o
diff --git a/drivers/gpio/gpio-etraxfs.c b/drivers/gpio/gpio-etraxfs.c
deleted file mode 100644
index 94db1bf4bfdb..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this driver is
now obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/cpufreq/Makefile | 1 -
drivers/cpufreq/blackfin-cpufreq.c | 217 -------------------------------------
2 files changed, 218 deletions(-)
delete mode 100644 drivers/cpufreq/blackfin-cpufreq.c
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 4987227b67df..2e4495cf9aa8 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -101,7 +101,6 @@ obj-$(CONFIG_POWERNV_CPUFREQ) += powernv-cpufreq.o
##################################################################################
# Other platform drivers
-obj-$(CONFIG_BFIN_CPU_FREQ) += blackfin-cpufreq.o
obj-$(CONFIG_BMIPS_CPUFREQ) += bmips-cpufreq.o
obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o
obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o
diff --git a/drivers/cpufreq/blackfin-cpufreq.c b/drivers/cpufreq/blackfin-cpufreq.c
deleted file mode 100644
index 12e97d8a9db0..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this
driver is now obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/input/keyboard/Kconfig | 9 -
drivers/input/keyboard/Makefile | 1 -
drivers/input/keyboard/bf54x-keys.c | 396 ------------------------------------
3 files changed, 406 deletions(-)
delete mode 100644 drivers/input/keyboard/bf54x-keys.c
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 4c4ab1ced235..2b469cc47a78 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -157,15 +157,6 @@ config KEYBOARD_QT2160
This driver can also be built as a module. If so, the module
will be called qt2160.
-config KEYBOARD_BFIN
- tristate "Blackfin BF54x keypad support"
- depends on (BF54x && !BF544)
- help
- Say Y here if you want to use the BF54x keypad.
-
- To compile this driver as a module, choose M here: the
- module will be called bf54x-keys.
-
config KEYBOARD_CLPS711X
tristate "CLPS711X Keypad support"
depends on OF_GPIO && (ARCH_CLPS711X || COMPILE_TEST)
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 526e68294e6e..8fab920afa58 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o
obj-$(CONFIG_KEYBOARD_ATARI) += atakbd.o
obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o
obj-$(CONFIG_KEYBOARD_BCM) += bcm-keypad.o
-obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o
obj-$(CONFIG_KEYBOARD_CAP11XX) += cap11xx.o
obj-$(CONFIG_KEYBOARD_CLPS711X) += clps711x-keypad.o
obj-$(CONFIG_KEYBOARD_CROS_EC) += cros_ec_keyb.o
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
deleted file mode 100644
index 8a07a426f88e..000000000000
--
2.9.0
The blackfin architecture is getting removed, so these are
now obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/pinctrl/Kconfig | 19 -
drivers/pinctrl/Makefile | 3 -
drivers/pinctrl/pinctrl-adi2-bf54x.c | 588 ---------------
drivers/pinctrl/pinctrl-adi2-bf60x.c | 517 -------------
drivers/pinctrl/pinctrl-adi2.c | 1114 ----------------------------
drivers/pinctrl/pinctrl-adi2.h | 75 --
include/linux/platform_data/pinctrl-adi2.h | 40 -
7 files changed, 2356 deletions(-)
delete mode 100644 drivers/pinctrl/pinctrl-adi2-bf54x.c
delete mode 100644 drivers/pinctrl/pinctrl-adi2-bf60x.c
delete mode 100644 drivers/pinctrl/pinctrl-adi2.c
delete mode 100644 drivers/pinctrl/pinctrl-adi2.h
delete mode 100644 include/linux/platform_data/pinctrl-adi2.h
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index f5ef8201c09f..01fe8e0455a0 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -30,17 +30,6 @@ config DEBUG_PINCTRL
help
Say Y here to add some extra checks and diagnostics to PINCTRL calls.
-config PINCTRL_ADI2
- bool "ADI pin controller driver"
- depends on (BF54x || BF60x)
- depends on !GPIO_ADI
- select PINMUX
- select IRQ_DOMAIN
- help
- This is the pin controller and gpio driver for ADI BF54x, BF60x and
- future processors. This option is selected automatically when specific
- machine and arch are selected to build.
-
config PINCTRL_ARTPEC6
bool "Axis ARTPEC-6 pin controller driver"
depends on MACH_ARTPEC6
@@ -77,14 +66,6 @@ config PINCTRL_AXP209
selected.
Say yes to enable pinctrl and GPIO support for the AXP209 PMIC
-config PINCTRL_BF54x
- def_bool y if BF54x
- select PINCTRL_ADI2
-
-config PINCTRL_BF60x
- def_bool y if BF60x
- select PINCTRL_ADI2
-
config PINCTRL_AT91
bool "AT91 pinctrl driver"
depends on OF
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 6255546735ff..657332b121fb 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -8,12 +8,9 @@ obj-$(CONFIG_PINMUX) += pinmux.o
obj-$(CONFIG_PINCONF) += pinconf.o
obj-$(CONFIG_OF) += devicetree.o
obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o
-obj-$(CONFIG_PINCTRL_ADI2) += pinctrl-adi2.o
obj-$(CONFIG_PINCTRL_ARTPEC6) += pinctrl-artpec6.o
obj-$(CONFIG_PINCTRL_AS3722) += pinctrl-as3722.o
obj-$(CONFIG_PINCTRL_AXP209) += pinctrl-axp209.o
-obj-$(CONFIG_PINCTRL_BF54x) += pinctrl-adi2-bf54x.o
-obj-$(CONFIG_PINCTRL_BF60x) += pinctrl-adi2-bf60x.o
obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o
obj-$(CONFIG_PINCTRL_AT91PIO4) += pinctrl-at91-pio4.o
obj-$(CONFIG_PINCTRL_AMD) += pinctrl-amd.o
diff --git a/drivers/pinctrl/pinctrl-adi2-bf54x.c b/drivers/pinctrl/pinctrl-adi2-bf54x.c
deleted file mode 100644
index 008a29e92e56..000000000000
diff --git a/drivers/pinctrl/pinctrl-adi2-bf60x.c b/drivers/pinctrl/pinctrl-adi2-bf60x.c
deleted file mode 100644
index fcfa00821f12..000000000000
diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
deleted file mode 100644
index 094a451db2a2..000000000000
diff --git a/drivers/pinctrl/pinctrl-adi2.h b/drivers/pinctrl/pinctrl-adi2.h
deleted file mode 100644
index 3ca29738213f..000000000000
diff --git a/include/linux/platform_data/pinctrl-adi2.h b/include/linux/platform_data/pinctrl-adi2.h
deleted file mode 100644
index 8f91300617ec..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this one
is obsolete now as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/mmc/host/Kconfig | 19 --
drivers/mmc/host/Makefile | 1 -
drivers/mmc/host/bfin_sdh.c | 679 --------------------------------------------
3 files changed, 699 deletions(-)
delete mode 100644 drivers/mmc/host/bfin_sdh.c
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 620c2d90a646..b4fd5d48dd35 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -646,25 +646,6 @@ config MMC_VIA_SDMMC
If unsure, say N.
-config SDH_BFIN
- tristate "Blackfin Secure Digital Host support"
- depends on (BF54x && !BF544) || (BF51x && !BF512)
- help
- If you say yes here you will get support for the Blackfin on-chip
- Secure Digital Host interface. This includes support for MMC and
- SD cards.
-
- To compile this driver as a module, choose M here: the
- module will be called bfin_sdh.
-
- If unsure, say N.
-
-config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND
- bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround"
- depends on SDH_BFIN
- help
- If you say yes here SD-Cards may work on the EZkit.
-
config MMC_CAVIUM_OCTEON
tristate "Cavium OCTEON SD/MMC Card Interface support"
depends on CAVIUM_OCTEON_SOC
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 84cd1388abc3..f563cc0b7f93 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -43,7 +43,6 @@ obj-$(CONFIG_MMC_SDHI_SYS_DMAC) += renesas_sdhi_sys_dmac.o
obj-$(CONFIG_MMC_SDHI_INTERNAL_DMAC) += renesas_sdhi_internal_dmac.o
obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
-obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
octeon-mmc-objs := cavium.o cavium-octeon.o
obj-$(CONFIG_MMC_CAVIUM_OCTEON) += octeon-mmc.o
thunderx-mmc-objs := cavium.o cavium-thunderx.o
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
deleted file mode 100644
index 526231e38583..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this driver
is obsolete as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/ata/Kconfig | 9 -
drivers/ata/Makefile | 1 -
drivers/ata/pata_bf54x.c | 1703 ----------------------------------------------
3 files changed, 1713 deletions(-)
delete mode 100644 drivers/ata/pata_bf54x.c
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index a7120d621154..4582fa27cf37 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -549,15 +549,6 @@ config PATA_ATP867X
If unsure, say N.
-config PATA_BF54X
- tristate "Blackfin 54x ATAPI support"
- depends on BF542 || BF548 || BF549
- help
- This option enables support for the built-in ATAPI controller on
- Blackfin 54x family chips.
-
- If unsure, say N.
-
config PATA_BK3710
tristate "Palmchip BK3710 PATA support"
depends on ARCH_DAVINCI
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index f1f5a3fbc777..6dae8c985e8e 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -53,7 +53,6 @@ obj-$(CONFIG_PATA_AMD) += pata_amd.o
obj-$(CONFIG_PATA_ARTOP) += pata_artop.o
obj-$(CONFIG_PATA_ATIIXP) += pata_atiixp.o
obj-$(CONFIG_PATA_ATP867X) += pata_atp867x.o
-obj-$(CONFIG_PATA_BF54X) += pata_bf54x.o
obj-$(CONFIG_PATA_BK3710) += pata_bk3710.o
obj-$(CONFIG_PATA_CMD64X) += pata_cmd64x.o
obj-$(CONFIG_PATA_CS5520) += pata_cs5520.o
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
deleted file mode 100644
index 0e55a8da2748..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this
one is obsolete as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/input/misc/Kconfig | 9 -
drivers/input/misc/Makefile | 1 -
drivers/input/misc/bfin_rotary.c | 294 ------------------------------
include/linux/platform_data/bfin_rotary.h | 117 ------------
4 files changed, 421 deletions(-)
delete mode 100644 drivers/input/misc/bfin_rotary.c
delete mode 100644 include/linux/platform_data/bfin_rotary.h
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 6a3c753b093b..572b15fa18c2 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -655,15 +655,6 @@ config INPUT_DM355EVM
To compile this driver as a module, choose M here: the
module will be called dm355evm_keys.
-config INPUT_BFIN_ROTARY
- tristate "Blackfin Rotary support"
- depends on BF54x || BF52x
- help
- Say Y here if you want to use the Blackfin Rotary.
-
- To compile this driver as a module, choose M here: the
- module will be called bfin-rotary.
-
config INPUT_WM831X_ON
tristate "WM831X ON pin"
depends on MFD_WM831X
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 8cc58f362bb8..72cde28649e2 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_INPUT_ARIZONA_HAPTICS) += arizona-haptics.o
obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o
obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
obj-$(CONFIG_INPUT_ATMEL_CAPTOUCH) += atmel_captouch.o
-obj-$(CONFIG_INPUT_BFIN_ROTARY) += bfin_rotary.o
obj-$(CONFIG_INPUT_BMA150) += bma150.o
obj-$(CONFIG_INPUT_CM109) += cm109.o
obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
deleted file mode 100644
index 799ce3d2820e..000000000000
diff --git a/include/linux/platform_data/bfin_rotary.h b/include/linux/platform_data/bfin_rotary.h
deleted file mode 100644
index 98829370fee2..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this one is now obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/net/can/Kconfig | 9 -
drivers/net/can/Makefile | 1 -
drivers/net/can/bfin_can.c | 784 ---------------------------------------------
3 files changed, 794 deletions(-)
delete mode 100644 drivers/net/can/bfin_can.c
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index ac4ff394bc56..2cb75988b328 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -88,15 +88,6 @@ config CAN_AT91
This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
and AT91SAM9X5 processors.
-config CAN_BFIN
- depends on BF534 || BF536 || BF537 || BF538 || BF539 || BF54x
- tristate "Analog Devices Blackfin on-chip CAN"
- ---help---
- Driver for the Analog Devices Blackfin on-chip CAN controllers
-
- To compile this driver as a module, choose M here: the
- module will be called bfin_can.
-
config CAN_FLEXCAN
tristate "Support for Freescale FLEXCAN based chips"
depends on ARM || PPC
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 02b8ed794564..44922bf29b6a 100644
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -19,7 +19,6 @@ obj-y += usb/
obj-y += softing/
obj-$(CONFIG_CAN_AT91) += at91_can.o
-obj-$(CONFIG_CAN_BFIN) += bfin_can.o
obj-$(CONFIG_CAN_CC770) += cc770/
obj-$(CONFIG_CAN_C_CAN) += c_can/
obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
deleted file mode 100644
index 1deb8ff90a89..000000000000
--
2.9.0
The blackfin architecture is getting removed, so the video
capture driver is also obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/media/platform/Kconfig | 2 -
drivers/media/platform/Makefile | 2 -
drivers/media/platform/blackfin/Kconfig | 16 -
drivers/media/platform/blackfin/Makefile | 2 -
drivers/media/platform/blackfin/bfin_capture.c | 983 -------------------------
drivers/media/platform/blackfin/ppi.c | 361 ---------
include/media/blackfin/bfin_capture.h | 39 -
include/media/blackfin/ppi.h | 94 ---
8 files changed, 1499 deletions(-)
delete mode 100644 drivers/media/platform/blackfin/Kconfig
delete mode 100644 drivers/media/platform/blackfin/Makefile
delete mode 100644 drivers/media/platform/blackfin/bfin_capture.c
delete mode 100644 drivers/media/platform/blackfin/ppi.c
delete mode 100644 include/media/blackfin/bfin_capture.h
delete mode 100644 include/media/blackfin/ppi.h
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 5d8fd71fc454..2136702c95fc 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -31,8 +31,6 @@ source "drivers/media/platform/davinci/Kconfig"
source "drivers/media/platform/omap/Kconfig"
-source "drivers/media/platform/blackfin/Kconfig"
-
config VIDEO_SH_VOU
tristate "SuperH VOU video output driver"
depends on MEDIA_CAMERA_SUPPORT
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 85e112122f32..2b07f2e2fca6 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -53,8 +53,6 @@ obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra-cec/
obj-y += stm32/
-obj-y += blackfin/
-
obj-y += davinci/
obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o
diff --git a/drivers/media/platform/blackfin/Kconfig b/drivers/media/platform/blackfin/Kconfig
deleted file mode 100644
index 68fa90151b8f..000000000000
diff --git a/drivers/media/platform/blackfin/Makefile b/drivers/media/platform/blackfin/Makefile
deleted file mode 100644
index 30421bc23080..000000000000
diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
deleted file mode 100644
index b7660b1000fd..000000000000
diff --git a/drivers/media/platform/blackfin/ppi.c b/drivers/media/platform/blackfin/ppi.c
deleted file mode 100644
index d3dc765c1609..000000000000
diff --git a/include/media/blackfin/bfin_capture.h b/include/media/blackfin/bfin_capture.h
deleted file mode 100644
index a999a3970c69..000000000000
diff --git a/include/media/blackfin/ppi.h b/include/media/blackfin/ppi.h
deleted file mode 100644
index 987e49e8f9c9..000000000000
--
2.9.0
On Wed, Mar 14, 2018 at 04:35:39PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so this driver
> is obsolete as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Tejun Heo <[email protected]>
Please feel free to route with the rest of the series.
Thanks.
--
tejun
The blackfin architecture is getting removed, so the
twi driver can also be removed.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/i2c/busses/Kconfig | 18 -
drivers/i2c/busses/Makefile | 1 -
drivers/i2c/busses/i2c-bfin-twi.c | 737 --------------------------------------
3 files changed, 756 deletions(-)
delete mode 100644 drivers/i2c/busses/i2c-bfin-twi.c
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 68ceac7617ff..4c0895165727 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -445,24 +445,6 @@ config I2C_BRCMSTB
If you do not need I2C interface, say N.
-config I2C_BLACKFIN_TWI
- tristate "Blackfin TWI I2C support"
- depends on BLACKFIN
- depends on !BF561 && !BF531 && !BF532 && !BF533
- help
- This is the I2C bus driver for Blackfin on-chip TWI interface.
-
- This driver can also be built as a module. If so, the module
- will be called i2c-bfin-twi.
-
-config I2C_BLACKFIN_TWI_CLK_KHZ
- int "Blackfin TWI I2C clock (kHz)"
- depends on I2C_BLACKFIN_TWI
- range 21 400
- default 50
- help
- The unit of the TWI clock is kHz.
-
config I2C_CADENCE
tristate "Cadence I2C Controller"
depends on ARCH_ZYNQ || ARM64 || XTENSA
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 2ce8576540a2..9e475a54e36e 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -38,7 +38,6 @@ obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o
obj-$(CONFIG_I2C_AXXIA) += i2c-axxia.o
obj-$(CONFIG_I2C_BCM2835) += i2c-bcm2835.o
obj-$(CONFIG_I2C_BCM_IPROC) += i2c-bcm-iproc.o
-obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o
obj-$(CONFIG_I2C_CADENCE) += i2c-cadence.o
obj-$(CONFIG_I2C_CBUS_GPIO) += i2c-cbus-gpio.o
obj-$(CONFIG_I2C_CPM) += i2c-cpm.o
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
deleted file mode 100644
index ff3343186a82..000000000000
--
2.9.0
On Wed, Mar 14, 2018 at 04:35:14PM +0100, Arnd Bergmann wrote:
> The Tile architecture is obsolete and getting removed from the kernel,
> this driver appears to only be used there, and not on the ARM based
> successors (Tile-Mx, BlueField), so we should remove it as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/edac/Kconfig | 8 --
> drivers/edac/Makefile | 2 -
> drivers/edac/tile_edac.c | 265 -----------------------------------------------
> 3 files changed, 275 deletions(-)
> delete mode 100644 drivers/edac/tile_edac.c
Provided CONFIG_TILE gets removed, good riddance to that driver too.
Acked-by: Borislav Petkov <[email protected]>
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
The blackfin architecture is getting removed, so these
won't be needed any more.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/spi/Kconfig | 19 -
drivers/spi/Makefile | 3 -
drivers/spi/spi-adi-v3.c | 984 ----------------------------
drivers/spi/spi-bfin-sport.c | 919 --------------------------
drivers/spi/spi-bfin5xx.c | 1462 ------------------------------------------
5 files changed, 3387 deletions(-)
delete mode 100644 drivers/spi/spi-adi-v3.c
delete mode 100644 drivers/spi/spi-bfin-sport.c
delete mode 100644 drivers/spi/spi-bfin5xx.c
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 6fb0347a24f2..9b0d9ae740d1 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -115,25 +115,6 @@ config SPI_BCM2835AUX
"universal SPI master", and the regular SPI controller.
This driver is for the universal/auxiliary SPI controller.
-config SPI_BFIN5XX
- tristate "SPI controller driver for ADI Blackfin5xx"
- depends on BLACKFIN && !BF60x
- help
- This is the SPI controller master driver for Blackfin 5xx processor.
-
-config SPI_ADI_V3
- tristate "SPI controller v3 for ADI"
- depends on BF60x
- help
- This is the SPI controller v3 master driver
- found on Blackfin 60x processor.
-
-config SPI_BFIN_SPORT
- tristate "SPI bus via Blackfin SPORT"
- depends on BLACKFIN
- help
- Enable support for a SPI bus via the Blackfin SPORT peripheral.
-
config SPI_BCM53XX
tristate "Broadcom BCM53xx SPI controller"
depends on ARCH_BCM_5301X
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 34c5f2832ddf..b935f10eb961 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -24,9 +24,6 @@ obj-$(CONFIG_SPI_BCM53XX) += spi-bcm53xx.o
obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o
obj-$(CONFIG_SPI_BCM63XX_HSSPI) += spi-bcm63xx-hsspi.o
obj-$(CONFIG_SPI_BCM_QSPI) += spi-iproc-qspi.o spi-brcmstb-qspi.o spi-bcm-qspi.o
-obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o
-obj-$(CONFIG_SPI_ADI_V3) += spi-adi-v3.o
-obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o
obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o
obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o
obj-$(CONFIG_SPI_CADENCE) += spi-cadence.o
diff --git a/drivers/spi/spi-adi-v3.c b/drivers/spi/spi-adi-v3.c
deleted file mode 100644
index a16b25dcd1e6..000000000000
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
deleted file mode 100644
index 01d0ba9c5942..000000000000
diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c
deleted file mode 100644
index 249c7a3677c9..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this driver is now
obsolete as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/pwm/Kconfig | 9 ---
drivers/pwm/Makefile | 1 -
drivers/pwm/pwm-bfin.c | 157 -------------------------------------------------
3 files changed, 167 deletions(-)
delete mode 100644 drivers/pwm/pwm-bfin.c
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 763ee50ea57d..5d9868d23781 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -113,15 +113,6 @@ config PWM_BERLIN
To compile this driver as a module, choose M here: the module
will be called pwm-berlin.
-config PWM_BFIN
- tristate "Blackfin PWM support"
- depends on BFIN_GPTIMERS
- help
- Generic PWM framework driver for Blackfin.
-
- To compile this driver as a module, choose M here: the module
- will be called pwm-bfin.
-
config PWM_BRCMSTB
tristate "Broadcom STB PWM support"
depends on ARCH_BRCMSTB || BMIPS_GENERIC
diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
index 0258a745f30c..9c676a0dadf5 100644
--- a/drivers/pwm/Makefile
+++ b/drivers/pwm/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_PWM_BCM_IPROC) += pwm-bcm-iproc.o
obj-$(CONFIG_PWM_BCM_KONA) += pwm-bcm-kona.o
obj-$(CONFIG_PWM_BCM2835) += pwm-bcm2835.o
obj-$(CONFIG_PWM_BERLIN) += pwm-berlin.o
-obj-$(CONFIG_PWM_BFIN) += pwm-bfin.o
obj-$(CONFIG_PWM_BRCMSTB) += pwm-brcmstb.o
obj-$(CONFIG_PWM_CLPS711X) += pwm-clps711x.o
obj-$(CONFIG_PWM_CRC) += pwm-crc.o
diff --git a/drivers/pwm/pwm-bfin.c b/drivers/pwm/pwm-bfin.c
deleted file mode 100644
index a9a88137f2cb..000000000000
--
2.9.0
The tile architecture is getting removed, so the ehci and ohci platform
glue drivers are no longer needed. In case of ohci, this is the last
one to define a PLATFORM_DRIVER macro, so we can remove even more.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/usb/host/ehci-hcd.c | 5 -
drivers/usb/host/ehci-tilegx.c | 207 -----------------------------------------
drivers/usb/host/ohci-hcd.c | 18 ----
drivers/usb/host/ohci-tilegx.c | 196 --------------------------------------
include/linux/usb/tilegx.h | 35 -------
5 files changed, 461 deletions(-)
delete mode 100644 drivers/usb/host/ehci-tilegx.c
delete mode 100644 drivers/usb/host/ohci-tilegx.c
delete mode 100644 include/linux/usb/tilegx.h
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 7f0737449df7..d927adf3afcd 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1275,11 +1275,6 @@ MODULE_LICENSE ("GPL");
#define XILINX_OF_PLATFORM_DRIVER ehci_hcd_xilinx_of_driver
#endif
-#ifdef CONFIG_TILE_USB
-#include "ehci-tilegx.c"
-#define PLATFORM_DRIVER ehci_hcd_tilegx_driver
-#endif
-
#ifdef CONFIG_USB_EHCI_HCD_PMC_MSP
#include "ehci-pmcmsp.c"
#define PLATFORM_DRIVER ehci_hcd_msp_driver
diff --git a/drivers/usb/host/ehci-tilegx.c b/drivers/usb/host/ehci-tilegx.c
deleted file mode 100644
index 610ed437ed2c..000000000000
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 84f88fa411cd..199f1b7a91a3 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1244,11 +1244,6 @@ MODULE_LICENSE ("GPL");
#define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver
#endif
-#ifdef CONFIG_TILE_USB
-#include "ohci-tilegx.c"
-#define PLATFORM_DRIVER ohci_hcd_tilegx_driver
-#endif
-
static int __init ohci_hcd_mod_init(void)
{
int retval = 0;
@@ -1273,12 +1268,6 @@ static int __init ohci_hcd_mod_init(void)
goto error_ps3;
#endif
-#ifdef PLATFORM_DRIVER
- retval = platform_driver_register(&PLATFORM_DRIVER);
- if (retval < 0)
- goto error_platform;
-#endif
-
#ifdef OF_PLATFORM_DRIVER
retval = platform_driver_register(&OF_PLATFORM_DRIVER);
if (retval < 0)
@@ -1322,10 +1311,6 @@ static int __init ohci_hcd_mod_init(void)
platform_driver_unregister(&OF_PLATFORM_DRIVER);
error_of_platform:
#endif
-#ifdef PLATFORM_DRIVER
- platform_driver_unregister(&PLATFORM_DRIVER);
- error_platform:
-#endif
#ifdef PS3_SYSTEM_BUS_DRIVER
ps3_ohci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
error_ps3:
@@ -1353,9 +1338,6 @@ static void __exit ohci_hcd_mod_exit(void)
#ifdef OF_PLATFORM_DRIVER
platform_driver_unregister(&OF_PLATFORM_DRIVER);
#endif
-#ifdef PLATFORM_DRIVER
- platform_driver_unregister(&PLATFORM_DRIVER);
-#endif
#ifdef PS3_SYSTEM_BUS_DRIVER
ps3_ohci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
#endif
diff --git a/drivers/usb/host/ohci-tilegx.c b/drivers/usb/host/ohci-tilegx.c
deleted file mode 100644
index d21ca3ce9a30..000000000000
diff --git a/include/linux/usb/tilegx.h b/include/linux/usb/tilegx.h
deleted file mode 100644
index 817908573fe8..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this driver has
become obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/mtd/nand/raw/Kconfig | 32 --
drivers/mtd/nand/raw/Makefile | 1 -
drivers/mtd/nand/raw/bf5xx_nand.c | 861 --------------------------------------
3 files changed, 894 deletions(-)
delete mode 100644 drivers/mtd/nand/raw/bf5xx_nand.c
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index 605ec8cce67b..0f2b6f348a0a 100644
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -116,38 +116,6 @@ config MTD_NAND_AU1550
This enables the driver for the NAND flash controller on the
AMD/Alchemy 1550 SOC.
-config MTD_NAND_BF5XX
- tristate "Blackfin on-chip NAND Flash Controller driver"
- depends on BF54x || BF52x
- help
- This enables the Blackfin on-chip NAND flash controller
-
- No board specific support is done by this driver, each board
- must advertise a platform_device for the driver to attach.
-
- This driver can also be built as a module. If so, the module
- will be called bf5xx-nand.
-
-config MTD_NAND_BF5XX_HWECC
- bool "BF5XX NAND Hardware ECC"
- default y
- depends on MTD_NAND_BF5XX
- help
- Enable the use of the BF5XX's internal ECC generator when
- using NAND.
-
-config MTD_NAND_BF5XX_BOOTROM_ECC
- bool "Use Blackfin BootROM ECC Layout"
- default n
- depends on MTD_NAND_BF5XX_HWECC
- help
- If you wish to modify NAND pages and allow the Blackfin on-chip
- BootROM to boot from them, say Y here. This is only necessary
- if you are booting U-Boot out of NAND and you wish to update
- U-Boot from Linux' userspace. Otherwise, you should say N here.
-
- If unsure, say N.
-
config MTD_NAND_S3C2410
tristate "NAND Flash support for Samsung S3C SoCs"
depends on ARCH_S3C24XX || ARCH_S3C64XX
diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile
index f16f59a197a3..165b7ef9e9a1 100644
--- a/drivers/mtd/nand/raw/Makefile
+++ b/drivers/mtd/nand/raw/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_MTD_NAND_DENALI) += denali.o
obj-$(CONFIG_MTD_NAND_DENALI_PCI) += denali_pci.o
obj-$(CONFIG_MTD_NAND_DENALI_DT) += denali_dt.o
obj-$(CONFIG_MTD_NAND_AU1550) += au1550nd.o
-obj-$(CONFIG_MTD_NAND_BF5XX) += bf5xx_nand.o
obj-$(CONFIG_MTD_NAND_S3C2410) += s3c2410.o
obj-$(CONFIG_MTD_NAND_TANGO) += tango_nand.o
obj-$(CONFIG_MTD_NAND_DAVINCI) += davinci_nand.o
diff --git a/drivers/mtd/nand/raw/bf5xx_nand.c b/drivers/mtd/nand/raw/bf5xx_nand.c
deleted file mode 100644
index 9a1d8d104570..000000000000
--
2.9.0
The blackfin architecture is getting removed, so we can clean up
all the special cases in the musb driver.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/usb/musb/Kconfig | 10 +-
drivers/usb/musb/Makefile | 1 -
drivers/usb/musb/blackfin.c | 623 ----------------------------------------
drivers/usb/musb/blackfin.h | 81 ------
drivers/usb/musb/musb_core.c | 5 -
drivers/usb/musb/musb_core.h | 30 --
drivers/usb/musb/musb_debugfs.c | 2 -
drivers/usb/musb/musb_dma.h | 11 -
drivers/usb/musb/musb_gadget.c | 35 ---
drivers/usb/musb/musb_regs.h | 182 ------------
drivers/usb/musb/musbhsdma.c | 5 -
drivers/usb/musb/musbhsdma.h | 64 -----
include/linux/usb/musb.h | 7 -
13 files changed, 1 insertion(+), 1055 deletions(-)
delete mode 100644 drivers/usb/musb/blackfin.c
delete mode 100644 drivers/usb/musb/blackfin.h
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 5506a9c03c1f..490990e8b015 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -18,9 +18,6 @@ config USB_MUSB_HDRC
Texas Instruments families using this IP include DaVinci
(35x, 644x ...), OMAP 243x, OMAP 3, and TUSB 6010.
- Analog Devices parts using this IP include Blackfin BF54x,
- BF525 and BF527.
-
Allwinner SoCs using this IP include A10, A13, A20, ...
If you do not know what this is, please say N.
@@ -107,11 +104,6 @@ config USB_MUSB_DSPS
depends on ARCH_OMAP2PLUS || COMPILE_TEST
depends on OF_IRQ
-config USB_MUSB_BLACKFIN
- tristate "Blackfin"
- depends on (BF54x && !BF544) || (BF52x && ! BF522 && !BF523)
- depends on NOP_USB_XCEIV
-
config USB_MUSB_UX500
tristate "Ux500 platforms"
depends on ARCH_U8500 || COMPILE_TEST
@@ -149,7 +141,7 @@ config USB_UX500_DMA
config USB_INVENTRA_DMA
bool 'Inventra'
- depends on USB_MUSB_OMAP2PLUS || USB_MUSB_BLACKFIN
+ depends on USB_MUSB_OMAP2PLUS
help
Enable DMA transfers using Mentor's engine.
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 79d4d5439164..3a88c79e650c 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_USB_MUSB_DSPS) += musb_dsps.o
obj-$(CONFIG_USB_MUSB_TUSB6010) += tusb6010.o
obj-$(CONFIG_USB_MUSB_DAVINCI) += davinci.o
obj-$(CONFIG_USB_MUSB_DA8XX) += da8xx.o
-obj-$(CONFIG_USB_MUSB_BLACKFIN) += blackfin.o
obj-$(CONFIG_USB_MUSB_UX500) += ux500.o
obj-$(CONFIG_USB_MUSB_JZ4740) += jz4740.o
obj-$(CONFIG_USB_MUSB_SUNXI) += sunxi.o
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
deleted file mode 100644
index 0a98dcd66d19..000000000000
diff --git a/drivers/usb/musb/blackfin.h b/drivers/usb/musb/blackfin.h
deleted file mode 100644
index 5b149915b0f8..000000000000
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index c344ef4e5355..72bb03e7b751 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -126,7 +126,6 @@ EXPORT_SYMBOL_GPL(musb_get_mode);
/*-------------------------------------------------------------------------*/
-#ifndef CONFIG_BLACKFIN
static int musb_ulpi_read(struct usb_phy *phy, u32 reg)
{
void __iomem *addr = phy->io_priv;
@@ -208,10 +207,6 @@ static int musb_ulpi_write(struct usb_phy *phy, u32 val, u32 reg)
return ret;
}
-#else
-#define musb_ulpi_read NULL
-#define musb_ulpi_write NULL
-#endif
static struct usb_phy_io_ops musb_ulpi_access = {
.read = musb_ulpi_read,
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 385841ee6f46..ac675b1a34c4 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -467,34 +467,6 @@ static inline char *musb_ep_xfertype_string(u8 type)
return s;
}
-#ifdef CONFIG_BLACKFIN
-static inline int musb_read_fifosize(struct musb *musb,
- struct musb_hw_ep *hw_ep, u8 epnum)
-{
- musb->nr_endpoints++;
- musb->epmask |= (1 << epnum);
-
- if (epnum < 5) {
- hw_ep->max_packet_sz_tx = 128;
- hw_ep->max_packet_sz_rx = 128;
- } else {
- hw_ep->max_packet_sz_tx = 1024;
- hw_ep->max_packet_sz_rx = 1024;
- }
- hw_ep->is_shared_fifo = false;
-
- return 0;
-}
-
-static inline void musb_configure_ep0(struct musb *musb)
-{
- musb->endpoints[0].max_packet_sz_tx = MUSB_EP0_FIFOSIZE;
- musb->endpoints[0].max_packet_sz_rx = MUSB_EP0_FIFOSIZE;
- musb->endpoints[0].is_shared_fifo = true;
-}
-
-#else
-
static inline int musb_read_fifosize(struct musb *musb,
struct musb_hw_ep *hw_ep, u8 epnum)
{
@@ -531,8 +503,6 @@ static inline void musb_configure_ep0(struct musb *musb)
musb->endpoints[0].max_packet_sz_rx = MUSB_EP0_FIFOSIZE;
musb->endpoints[0].is_shared_fifo = true;
}
-#endif /* CONFIG_BLACKFIN */
-
/***************************** Glue it together *****************************/
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index 7cf5a1bbdaff..7dac456f7ebc 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -70,7 +70,6 @@ static const struct musb_register_map musb_regmap[] = {
{ "DMA_CNTLch7", 0x274, 16 },
{ "DMA_ADDRch7", 0x278, 32 },
{ "DMA_COUNTch7", 0x27C, 32 },
-#ifndef CONFIG_BLACKFIN
{ "ConfigData", MUSB_CONFIGDATA,8 },
{ "BabbleCtl", MUSB_BABBLE_CTL,8 },
{ "TxFIFOsz", MUSB_TXFIFOSZ, 8 },
@@ -79,7 +78,6 @@ static const struct musb_register_map musb_regmap[] = {
{ "RxFIFOadd", MUSB_RXFIFOADD, 16 },
{ "EPInfo", MUSB_EPINFO, 8 },
{ "RAMInfo", MUSB_RAMINFO, 8 },
-#endif
{ } /* Terminating Entry */
};
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h
index a4241f4d430e..0fc8cd0c2a5c 100644
--- a/drivers/usb/musb/musb_dma.h
+++ b/drivers/usb/musb/musb_dma.h
@@ -80,17 +80,6 @@ struct musb_hw_ep;
#define is_cppi_enabled(musb) 0
#endif
-/* Anomaly 05000456 - USB Receive Interrupt Is Not Generated in DMA Mode 1
- * Only allow DMA mode 1 to be used when the USB will actually generate the
- * interrupts we expect.
- */
-#ifdef CONFIG_BLACKFIN
-# undef USE_MODE1
-# if !ANOMALY_05000456
-# define USE_MODE1
-# endif
-#endif
-
/*
* DMA channel status ... updated by the dma controller driver whenever that
* status changes, and protected by the overall controller spinlock.
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 293e5b8da565..58a41b54763b 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1680,40 +1680,6 @@ static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on)
return 0;
}
-#ifdef CONFIG_BLACKFIN
-static struct usb_ep *musb_match_ep(struct usb_gadget *g,
- struct usb_endpoint_descriptor *desc,
- struct usb_ss_ep_comp_descriptor *ep_comp)
-{
- struct usb_ep *ep = NULL;
-
- switch (usb_endpoint_type(desc)) {
- case USB_ENDPOINT_XFER_ISOC:
- case USB_ENDPOINT_XFER_BULK:
- if (usb_endpoint_dir_in(desc))
- ep = gadget_find_ep_by_name(g, "ep5in");
- else
- ep = gadget_find_ep_by_name(g, "ep6out");
- break;
- case USB_ENDPOINT_XFER_INT:
- if (usb_endpoint_dir_in(desc))
- ep = gadget_find_ep_by_name(g, "ep1in");
- else
- ep = gadget_find_ep_by_name(g, "ep2out");
- break;
- default:
- break;
- }
-
- if (ep && usb_gadget_ep_match_desc(g, ep, desc, ep_comp))
- return ep;
-
- return NULL;
-}
-#else
-#define musb_match_ep NULL
-#endif
-
static int musb_gadget_start(struct usb_gadget *g,
struct usb_gadget_driver *driver);
static int musb_gadget_stop(struct usb_gadget *g);
@@ -1727,7 +1693,6 @@ static const struct usb_gadget_ops musb_gadget_operations = {
.pullup = musb_gadget_pullup,
.udc_start = musb_gadget_start,
.udc_stop = musb_gadget_stop,
- .match_ep = musb_match_ep,
};
/* ----------------------------------------------------------------------- */
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index a4beba184798..88466622c89f 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -195,8 +195,6 @@
#define MUSB_HUBADDR_MULTI_TT 0x80
-#ifndef CONFIG_BLACKFIN
-
/*
* Common USB registers
*/
@@ -416,184 +414,4 @@ static inline u8 musb_read_txhubport(struct musb *musb, u8 epnum)
musb->io.busctl_offset(epnum, MUSB_TXHUBPORT));
}
-#else /* CONFIG_BLACKFIN */
-
-#define USB_BASE USB_FADDR
-#define USB_OFFSET(reg) (reg - USB_BASE)
-
-/*
- * Common USB registers
- */
-#define MUSB_FADDR USB_OFFSET(USB_FADDR) /* 8-bit */
-#define MUSB_POWER USB_OFFSET(USB_POWER) /* 8-bit */
-#define MUSB_INTRTX USB_OFFSET(USB_INTRTX) /* 16-bit */
-#define MUSB_INTRRX USB_OFFSET(USB_INTRRX)
-#define MUSB_INTRTXE USB_OFFSET(USB_INTRTXE)
-#define MUSB_INTRRXE USB_OFFSET(USB_INTRRXE)
-#define MUSB_INTRUSB USB_OFFSET(USB_INTRUSB) /* 8 bit */
-#define MUSB_INTRUSBE USB_OFFSET(USB_INTRUSBE)/* 8 bit */
-#define MUSB_FRAME USB_OFFSET(USB_FRAME)
-#define MUSB_INDEX USB_OFFSET(USB_INDEX) /* 8 bit */
-#define MUSB_TESTMODE USB_OFFSET(USB_TESTMODE)/* 8 bit */
-
-/*
- * Additional Control Registers
- */
-
-#define MUSB_DEVCTL USB_OFFSET(USB_OTG_DEV_CTL) /* 8 bit */
-
-#define MUSB_LINKINFO USB_OFFSET(USB_LINKINFO)/* 8 bit */
-#define MUSB_VPLEN USB_OFFSET(USB_VPLEN) /* 8 bit */
-#define MUSB_HS_EOF1 USB_OFFSET(USB_HS_EOF1) /* 8 bit */
-#define MUSB_FS_EOF1 USB_OFFSET(USB_FS_EOF1) /* 8 bit */
-#define MUSB_LS_EOF1 USB_OFFSET(USB_LS_EOF1) /* 8 bit */
-
-/* Offsets to endpoint registers */
-#define MUSB_TXMAXP 0x00
-#define MUSB_TXCSR 0x04
-#define MUSB_CSR0 MUSB_TXCSR /* Re-used for EP0 */
-#define MUSB_RXMAXP 0x08
-#define MUSB_RXCSR 0x0C
-#define MUSB_RXCOUNT 0x10
-#define MUSB_COUNT0 MUSB_RXCOUNT /* Re-used for EP0 */
-#define MUSB_TXTYPE 0x14
-#define MUSB_TYPE0 MUSB_TXTYPE /* Re-used for EP0 */
-#define MUSB_TXINTERVAL 0x18
-#define MUSB_NAKLIMIT0 MUSB_TXINTERVAL /* Re-used for EP0 */
-#define MUSB_RXTYPE 0x1C
-#define MUSB_RXINTERVAL 0x20
-#define MUSB_TXCOUNT 0x28
-
-/* Offsets to endpoint registers in indexed model (using INDEX register) */
-#define MUSB_INDEXED_OFFSET(_epnum, _offset) \
- (0x40 + (_offset))
-
-/* Offsets to endpoint registers in flat models */
-#define MUSB_FLAT_OFFSET(_epnum, _offset) \
- (USB_OFFSET(USB_EP_NI0_TXMAXP) + (0x40 * (_epnum)) + (_offset))
-
-/* Not implemented - HW has separate Tx/Rx FIFO */
-#define MUSB_TXCSR_MODE 0x0000
-
-static inline void musb_write_txfifosz(void __iomem *mbase, u8 c_size)
-{
-}
-
-static inline void musb_write_txfifoadd(void __iomem *mbase, u16 c_off)
-{
-}
-
-static inline void musb_write_rxfifosz(void __iomem *mbase, u8 c_size)
-{
-}
-
-static inline void musb_write_rxfifoadd(void __iomem *mbase, u16 c_off)
-{
-}
-
-static inline void musb_write_ulpi_buscontrol(void __iomem *mbase, u8 val)
-{
-}
-
-static inline u8 musb_read_txfifosz(void __iomem *mbase)
-{
- return 0;
-}
-
-static inline u16 musb_read_txfifoadd(void __iomem *mbase)
-{
- return 0;
-}
-
-static inline u8 musb_read_rxfifosz(void __iomem *mbase)
-{
- return 0;
-}
-
-static inline u16 musb_read_rxfifoadd(void __iomem *mbase)
-{
- return 0;
-}
-
-static inline u8 musb_read_ulpi_buscontrol(void __iomem *mbase)
-{
- return 0;
-}
-
-static inline u8 musb_read_configdata(void __iomem *mbase)
-{
- return 0;
-}
-
-static inline u16 musb_read_hwvers(void __iomem *mbase)
-{
- /*
- * This register is invisible on Blackfin, actually the MUSB
- * RTL version of Blackfin is 1.9, so just hardcode its value.
- */
- return MUSB_HWVERS_1900;
-}
-
-static inline void musb_write_rxfunaddr(void __iomem *mbase, u8 epnum,
- u8 qh_addr_req)
-{
-}
-
-static inline void musb_write_rxhubaddr(void __iomem *mbase, u8 epnum,
- u8 qh_h_addr_reg)
-{
-}
-
-static inline void musb_write_rxhubport(void __iomem *mbase, u8 epnum,
- u8 qh_h_port_reg)
-{
-}
-
-static inline void musb_write_txfunaddr(void __iomem *mbase, u8 epnum,
- u8 qh_addr_reg)
-{
-}
-
-static inline void musb_write_txhubaddr(void __iomem *mbase, u8 epnum,
- u8 qh_addr_reg)
-{
-}
-
-static inline void musb_write_txhubport(void __iomem *mbase, u8 epnum,
- u8 qh_h_port_reg)
-{
-}
-
-static inline u8 musb_read_rxfunaddr(void __iomem *mbase, u8 epnum)
-{
- return 0;
-}
-
-static inline u8 musb_read_rxhubaddr(void __iomem *mbase, u8 epnum)
-{
- return 0;
-}
-
-static inline u8 musb_read_rxhubport(void __iomem *mbase, u8 epnum)
-{
- return 0;
-}
-
-static inline u8 musb_read_txfunaddr(void __iomem *mbase, u8 epnum)
-{
- return 0;
-}
-
-static inline u8 musb_read_txhubaddr(void __iomem *mbase, u8 epnum)
-{
- return 0;
-}
-
-static inline u8 musb_read_txhubport(void __iomem *mbase, u8 epnum)
-{
- return 0;
-}
-
-#endif /* CONFIG_BLACKFIN */
-
#endif /* __MUSB_REGS_H__ */
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 21fb9e6622f3..4389fc3422bd 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -235,11 +235,6 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)
int_hsdma = musb_readb(mbase, MUSB_HSDMA_INTR);
-#ifdef CONFIG_BLACKFIN
- /* Clear DMA interrupt flags */
- musb_writeb(mbase, MUSB_HSDMA_INTR, int_hsdma);
-#endif
-
if (!int_hsdma) {
musb_dbg(musb, "spurious DMA irq");
diff --git a/drivers/usb/musb/musbhsdma.h b/drivers/usb/musb/musbhsdma.h
index 44f7983df0a1..93665135aff1 100644
--- a/drivers/usb/musb/musbhsdma.h
+++ b/drivers/usb/musb/musbhsdma.h
@@ -6,8 +6,6 @@
* Copyright (C) 2005-2007 by Texas Instruments
*/
-#ifndef CONFIG_BLACKFIN
-
#define MUSB_HSDMA_BASE 0x200
#define MUSB_HSDMA_INTR (MUSB_HSDMA_BASE + 0)
#define MUSB_HSDMA_CONTROL 0x4
@@ -34,68 +32,6 @@
musb_writel(mbase, \
MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT), \
len)
-#else
-
-#define MUSB_HSDMA_BASE 0x400
-#define MUSB_HSDMA_INTR (MUSB_HSDMA_BASE + 0)
-#define MUSB_HSDMA_CONTROL 0x04
-#define MUSB_HSDMA_ADDR_LOW 0x08
-#define MUSB_HSDMA_ADDR_HIGH 0x0C
-#define MUSB_HSDMA_COUNT_LOW 0x10
-#define MUSB_HSDMA_COUNT_HIGH 0x14
-
-#define MUSB_HSDMA_CHANNEL_OFFSET(_bchannel, _offset) \
- (MUSB_HSDMA_BASE + (_bchannel * 0x20) + _offset)
-
-static inline u32 musb_read_hsdma_addr(void __iomem *mbase, u8 bchannel)
-{
- u32 addr = musb_readw(mbase,
- MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_ADDR_HIGH));
-
- addr = addr << 16;
-
- addr |= musb_readw(mbase,
- MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_ADDR_LOW));
-
- return addr;
-}
-
-static inline void musb_write_hsdma_addr(void __iomem *mbase,
- u8 bchannel, dma_addr_t dma_addr)
-{
- musb_writew(mbase,
- MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_ADDR_LOW),
- dma_addr);
- musb_writew(mbase,
- MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_ADDR_HIGH),
- (dma_addr >> 16));
-}
-
-static inline u32 musb_read_hsdma_count(void __iomem *mbase, u8 bchannel)
-{
- u32 count = musb_readw(mbase,
- MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT_HIGH));
-
- count = count << 16;
-
- count |= musb_readw(mbase,
- MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT_LOW));
-
- return count;
-}
-
-static inline void musb_write_hsdma_count(void __iomem *mbase,
- u8 bchannel, u32 len)
-{
- musb_writew(mbase,
- MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT_LOW),len);
- musb_writew(mbase,
- MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT_HIGH),
- (len >> 16));
-}
-
-#endif /* CONFIG_BLACKFIN */
-
/* control register (16-bit): */
#define MUSB_HSDMA_ENABLE_SHIFT 0
#define MUSB_HSDMA_TRANSMIT_SHIFT 1
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index 5d19e6730475..9eb908a98033 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -89,13 +89,6 @@ struct musb_hdrc_config {
u8 ram_bits; /* ram address size */
struct musb_hdrc_eps_bits *eps_bits __deprecated;
-#ifdef CONFIG_BLACKFIN
- /* A GPIO controlling VRSEL in Blackfin */
- unsigned int gpio_vrsel;
- unsigned int gpio_vrsel_active;
- /* musb CLKIN in Blackfin in MHZ */
- unsigned char clkin;
-#endif
u32 maximum_speed;
};
--
2.9.0
The blackfin architecture is getting removed, so this driver has
become obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
Documentation/watchdog/watchdog-parameters.txt | 5 -
drivers/watchdog/Kconfig | 17 -
drivers/watchdog/Makefile | 7 -
drivers/watchdog/bfin_wdt.c | 476 -------------------------
4 files changed, 505 deletions(-)
delete mode 100644 drivers/watchdog/bfin_wdt.c
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt
index beea975980f6..6d6200ea27b8 100644
--- a/Documentation/watchdog/watchdog-parameters.txt
+++ b/Documentation/watchdog/watchdog-parameters.txt
@@ -55,11 +55,6 @@ wdt_time: Watchdog time in seconds. (default=30)
nowayout: Watchdog cannot be stopped once started
(default=kernel config parameter)
-------------------------------------------------
-bfin_wdt:
-timeout: Watchdog timeout in seconds. (1<=timeout<=((2^32)/SCLK), default=20)
-nowayout: Watchdog cannot be stopped once started
- (default=kernel config parameter)
--------------------------------------------------
coh901327_wdt:
margin: Watchdog margin in seconds (default 60s)
-------------------------------------------------
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 098e5ed4ee3d..f89f8869ca2a 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -815,23 +815,6 @@ config SPRD_WATCHDOG
Say Y here to include watchdog timer supported
by Spreadtrum system.
-# BLACKFIN Architecture
-
-config BFIN_WDT
- tristate "Blackfin On-Chip Watchdog Timer"
- depends on BLACKFIN
- ---help---
- If you say yes here you will get support for the Blackfin On-Chip
- Watchdog Timer. If you have one of these processors and wish to
- have watchdog support enabled, say Y, otherwise say N.
-
- To compile this driver as a module, choose M here: the
- module will be called bfin_wdt.
-
-# CRIS Architecture
-
-# FRV Architecture
-
# X86 (i386 + ia64 + x86_64) Architecture
config ACQUIRE_WDT
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 0474d38aa854..e209824541b8 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -91,13 +91,6 @@ obj-$(CONFIG_UNIPHIER_WATCHDOG) += uniphier_wdt.o
obj-$(CONFIG_RTD119X_WATCHDOG) += rtd119x_wdt.o
obj-$(CONFIG_SPRD_WATCHDOG) += sprd_wdt.o
-# BLACKFIN Architecture
-obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o
-
-# CRIS Architecture
-
-# FRV Architecture
-
# X86 (i386 + ia64 + x86_64) Architecture
obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
deleted file mode 100644
index aa4d2e8a8ef9..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this driver
has become obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/mtd/maps/Kconfig | 10 --
drivers/mtd/maps/Makefile | 1 -
drivers/mtd/maps/bfin-async-flash.c | 196 ------------------------------------
3 files changed, 207 deletions(-)
delete mode 100644 drivers/mtd/maps/bfin-async-flash.c
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 542fdf8e81fa..bdc1283f30fb 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -334,16 +334,6 @@ config MTD_PCMCIA_ANONYMOUS
If unsure, say N.
-config MTD_BFIN_ASYNC
- tristate "Blackfin BF533-STAMP Flash Chip Support"
- depends on BFIN533_STAMP && MTD_CFI && MTD_COMPLEX_MAPPINGS
- default y
- help
- Map driver which allows for simultaneous utilization of
- ethernet and CFI parallel flash.
-
- If compiled as a module, it will be called bfin-async-flash.
-
config MTD_GPIO_ADDR
tristate "GPIO-assisted Flash Chip Support"
depends on GPIOLIB || COMPILE_TEST
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index b849aaf85c34..51acf1fec19b 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -42,7 +42,6 @@ obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o
obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o
obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
-obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-async-flash.o
obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o
obj-$(CONFIG_MTD_VMU) += vmu-flash.o
obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr-flash.o
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
deleted file mode 100644
index 41730feeace8..000000000000
--
2.9.0
The cris architecture is getting removed, so we don't need the
uart driver any more.
Signed-off-by: Arnd Bergmann <[email protected]>
---
.../bindings/serial/axis,etraxfs-uart.txt | 22 -
drivers/tty/serial/Kconfig | 11 -
drivers/tty/serial/Makefile | 2 -
drivers/tty/serial/crisv10.c | 4248 --------------------
drivers/tty/serial/crisv10.h | 133 -
drivers/tty/serial/etraxfs-uart.c | 960 -----
6 files changed, 5376 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt
delete mode 100644 drivers/tty/serial/crisv10.c
delete mode 100644 drivers/tty/serial/crisv10.h
delete mode 100644 drivers/tty/serial/etraxfs-uart.c
diff --git a/Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt b/Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt
deleted file mode 100644
index 048c3818c826..000000000000
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 3682fd3e960c..f6e09326042d 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1114,17 +1114,6 @@ config SERIAL_VT8500_CONSOLE
depends on SERIAL_VT8500=y
select SERIAL_CORE_CONSOLE
-config SERIAL_ETRAXFS
- bool "ETRAX FS serial port support"
- depends on ETRAX_ARCH_V32 && OF
- select SERIAL_CORE
- select SERIAL_MCTRL_GPIO if GPIOLIB
-
-config SERIAL_ETRAXFS_CONSOLE
- bool "ETRAX FS serial console support"
- depends on SERIAL_ETRAXFS
- select SERIAL_CORE_CONSOLE
-
config SERIAL_NETX
tristate "NetX serial port support"
depends on ARCH_NETX
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index 842d185d697e..c21835dc16b2 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -51,8 +51,6 @@ obj-$(CONFIG_SERIAL_M32R_SIO) += m32r_sio.o
obj-$(CONFIG_SERIAL_MPSC) += mpsc.o
obj-$(CONFIG_SERIAL_MESON) += meson_uart.o
obj-$(CONFIG_SERIAL_SB1250_DUART) += sb1250-duart.o
-obj-$(CONFIG_ETRAX_SERIAL) += crisv10.o
-obj-$(CONFIG_SERIAL_ETRAXFS) += etraxfs-uart.o
obj-$(CONFIG_SERIAL_SCCNXP) += sccnxp.o
obj-$(CONFIG_SERIAL_SC16IS7XX_CORE) += sc16is7xx.o
obj-$(CONFIG_SERIAL_JSM) += jsm/
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
deleted file mode 100644
index c9458a033e3c..000000000000
diff --git a/drivers/tty/serial/crisv10.h b/drivers/tty/serial/crisv10.h
deleted file mode 100644
index 79ba2bc95d3d..000000000000
diff --git a/drivers/tty/serial/etraxfs-uart.c b/drivers/tty/serial/etraxfs-uart.c
deleted file mode 100644
index 24bf6bfb29b4..000000000000
--
2.9.0
The blackfin architecture is getting removed, and this is the last
remaining architecture specific setting, so the various hacks
can be removed now.
From all I can tell, there are no remaining in-tree users of the
driver, but it could be used by out-of-tree platform ports.
I've marked the driver as 'depends on COMPILE_TEST', short of
removing it outright.
It was originally written for some ARM PXA machines using the same
chip, but that platform never really worked and the code has been
removed a long time ago.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/usb/host/Kconfig | 1 +
drivers/usb/host/isp1362.h | 44 --------------------------------------------
2 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 4fcfb3084b36..b85822f0c874 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -360,6 +360,7 @@ config USB_ISP116X_HCD
config USB_ISP1362_HCD
tristate "ISP1362 HCD support"
depends on HAS_IOMEM
+ depends on COMPILE_TEST # nothing uses this
---help---
Supports the Philips ISP1362 chip as a host controller
diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h
index da79e36ced89..87c1ac97e538 100644
--- a/drivers/usb/host/isp1362.h
+++ b/drivers/usb/host/isp1362.h
@@ -9,47 +9,6 @@
/*
* Platform specific compile time options
*/
-#if defined(CONFIG_BLACKFIN)
-
-#include <linux/io.h>
-#define USE_32BIT 0
-#define MAX_ROOT_PORTS 2
-#define USE_PLATFORM_DELAY 0
-#define USE_NDELAY 1
-
-#define DUMMY_DELAY_ACCESS \
- do { \
- bfin_read16(ASYNC_BANK0_BASE); \
- bfin_read16(ASYNC_BANK0_BASE); \
- bfin_read16(ASYNC_BANK0_BASE); \
- } while (0)
-
-#undef insw
-#undef outsw
-
-#define insw delayed_insw
-#define outsw delayed_outsw
-
-static inline void delayed_outsw(unsigned int addr, void *buf, int len)
-{
- unsigned short *bp = (unsigned short *)buf;
- while (len--) {
- DUMMY_DELAY_ACCESS;
- outw(*bp++, addr);
- }
-}
-
-static inline void delayed_insw(unsigned int addr, void *buf, int len)
-{
- unsigned short *bp = (unsigned short *)buf;
- while (len--) {
- DUMMY_DELAY_ACCESS;
- *bp++ = inw(addr);
- }
-}
-
-#else
-
#define MAX_ROOT_PORTS 2
#define USE_32BIT 0
@@ -60,9 +19,6 @@ static inline void delayed_insw(unsigned int addr, void *buf, int len)
#define DUMMY_DELAY_ACCESS do {} while (0)
-#endif
-
-
/* ------------------------------------------------------------------------- */
#define USB_RESET_WIDTH 50
--
2.9.0
The tile architecture is getting removed, and this driver is
useless without it.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/tty/serial/Kconfig | 9 -
drivers/tty/serial/Makefile | 1 -
drivers/tty/serial/tilegx.c | 689 --------------------------------------------
3 files changed, 699 deletions(-)
delete mode 100644 drivers/tty/serial/tilegx.c
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 1a48ae6abb2c..736720a8d84f 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1330,15 +1330,6 @@ config SERIAL_EFM32_UART_CONSOLE
depends on SERIAL_EFM32_UART=y
select SERIAL_CORE_CONSOLE
-config SERIAL_TILEGX
- tristate "TILE-Gx on-chip serial port support"
- depends on TILEGX
- select TILE_GXIO_UART
- select SERIAL_CORE
- ---help---
- This device provides access to the on-chip UARTs on the TILE-Gx
- processor.
-
config SERIAL_ARC
tristate "ARC UART driver support"
select SERIAL_CORE
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index 606e746b61f1..b30ee2e5d518 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -63,7 +63,6 @@ obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o
obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o
obj-$(CONFIG_SERIAL_ST_ASC) += st-asc.o
-obj-$(CONFIG_SERIAL_TILEGX) += tilegx.o
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o
obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o
diff --git a/drivers/tty/serial/tilegx.c b/drivers/tty/serial/tilegx.c
deleted file mode 100644
index f0a3ae57f881..000000000000
--
2.9.0
The blackfin architecture is getting removed, so both the bfin_uart
and bfin_sport_uart can be removed as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/tty/serial/Kconfig | 149 ----
drivers/tty/serial/Makefile | 2 -
drivers/tty/serial/bfin_sport_uart.c | 937 --------------------
drivers/tty/serial/bfin_sport_uart.h | 86 --
drivers/tty/serial/bfin_uart.c | 1551 ----------------------------------
5 files changed, 2725 deletions(-)
delete mode 100644 drivers/tty/serial/bfin_sport_uart.c
delete mode 100644 drivers/tty/serial/bfin_sport_uart.h
delete mode 100644 drivers/tty/serial/bfin_uart.c
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index f6e09326042d..031552eb3f65 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -498,92 +498,6 @@ config SERIAL_SA1100_CONSOLE
your boot loader (lilo or loadlin) about how to pass options to the
kernel at boot time.)
-config SERIAL_BFIN
- tristate "Blackfin serial port support"
- depends on BLACKFIN
- select SERIAL_CORE
- select SERIAL_BFIN_UART0 if (BF531 || BF532 || BF533 || BF561)
- help
- Add support for the built-in UARTs on the Blackfin.
-
- To compile this driver as a module, choose M here: the
- module is named bfin_uart.ko.
-
-config SERIAL_BFIN_CONSOLE
- bool "Console on Blackfin serial port"
- depends on SERIAL_BFIN=y
- select SERIAL_CORE_CONSOLE
-
-choice
- prompt "UART Mode"
- depends on SERIAL_BFIN
- default SERIAL_BFIN_DMA
- help
- This driver supports the built-in serial ports of the Blackfin family
- of CPUs
-
-config SERIAL_BFIN_DMA
- bool "DMA mode"
- depends on !DMA_UNCACHED_NONE && KGDB_SERIAL_CONSOLE=n
- help
- This driver works under DMA mode. If this option is selected, the
- blackfin simple dma driver is also enabled.
-
-config SERIAL_BFIN_PIO
- bool "PIO mode"
- help
- This driver works under PIO mode.
-
-endchoice
-
-config SERIAL_BFIN_UART0
- bool "Enable UART0"
- depends on SERIAL_BFIN
- help
- Enable UART0
-
-config BFIN_UART0_CTSRTS
- bool "Enable UART0 hardware flow control"
- depends on SERIAL_BFIN_UART0
- help
- Enable hardware flow control in the driver.
-
-config SERIAL_BFIN_UART1
- bool "Enable UART1"
- depends on SERIAL_BFIN && (!BF531 && !BF532 && !BF533 && !BF561)
- help
- Enable UART1
-
-config BFIN_UART1_CTSRTS
- bool "Enable UART1 hardware flow control"
- depends on SERIAL_BFIN_UART1
- help
- Enable hardware flow control in the driver.
-
-config SERIAL_BFIN_UART2
- bool "Enable UART2"
- depends on SERIAL_BFIN && (BF54x || BF538 || BF539)
- help
- Enable UART2
-
-config BFIN_UART2_CTSRTS
- bool "Enable UART2 hardware flow control"
- depends on SERIAL_BFIN_UART2
- help
- Enable hardware flow control in the driver.
-
-config SERIAL_BFIN_UART3
- bool "Enable UART3"
- depends on SERIAL_BFIN && (BF54x)
- help
- Enable UART3
-
-config BFIN_UART3_CTSRTS
- bool "Enable UART3 hardware flow control"
- depends on SERIAL_BFIN_UART3
- help
- Enable hardware flow control in the driver.
-
config SERIAL_IMX
tristate "IMX serial port support"
depends on HAS_DMA
@@ -1231,69 +1145,6 @@ config SERIAL_SC16IS7XX_SPI
This is additional support to exsisting driver.
You must select at least one bus for the driver to be built.
-config SERIAL_BFIN_SPORT
- tristate "Blackfin SPORT emulate UART"
- depends on BLACKFIN
- select SERIAL_CORE
- help
- Enable SPORT emulate UART on Blackfin series.
-
- To compile this driver as a module, choose M here: the
- module will be called bfin_sport_uart.
-
-config SERIAL_BFIN_SPORT_CONSOLE
- bool "Console on Blackfin sport emulated uart"
- depends on SERIAL_BFIN_SPORT=y
- select SERIAL_CORE_CONSOLE
-
-config SERIAL_BFIN_SPORT0_UART
- bool "Enable UART over SPORT0"
- depends on SERIAL_BFIN_SPORT && !(BF542 || BF544)
- help
- Enable UART over SPORT0
-
-config SERIAL_BFIN_SPORT0_UART_CTSRTS
- bool "Enable UART over SPORT0 hardware flow control"
- depends on SERIAL_BFIN_SPORT0_UART
- help
- Enable hardware flow control in the driver.
-
-config SERIAL_BFIN_SPORT1_UART
- bool "Enable UART over SPORT1"
- depends on SERIAL_BFIN_SPORT
- help
- Enable UART over SPORT1
-
-config SERIAL_BFIN_SPORT1_UART_CTSRTS
- bool "Enable UART over SPORT1 hardware flow control"
- depends on SERIAL_BFIN_SPORT1_UART
- help
- Enable hardware flow control in the driver.
-
-config SERIAL_BFIN_SPORT2_UART
- bool "Enable UART over SPORT2"
- depends on SERIAL_BFIN_SPORT && (BF54x || BF538 || BF539)
- help
- Enable UART over SPORT2
-
-config SERIAL_BFIN_SPORT2_UART_CTSRTS
- bool "Enable UART over SPORT2 hardware flow control"
- depends on SERIAL_BFIN_SPORT2_UART
- help
- Enable hardware flow control in the driver.
-
-config SERIAL_BFIN_SPORT3_UART
- bool "Enable UART over SPORT3"
- depends on SERIAL_BFIN_SPORT && (BF54x || BF538 || BF539)
- help
- Enable UART over SPORT3
-
-config SERIAL_BFIN_SPORT3_UART_CTSRTS
- bool "Enable UART over SPORT3 hardware flow control"
- depends on SERIAL_BFIN_SPORT3_UART
- help
- Enable hardware flow control in the driver.
-
config SERIAL_TIMBERDALE
tristate "Support for timberdale UART"
select SERIAL_CORE
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index c21835dc16b2..a9242484e821 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -29,8 +29,6 @@ obj-$(CONFIG_SERIAL_PXA_NON8250) += pxa.o
obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o
obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o
-obj-$(CONFIG_SERIAL_BFIN) += bfin_uart.o
-obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
obj-$(CONFIG_SERIAL_MAX310X) += max310x.o
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
deleted file mode 100644
index 4ccca5d22f4f..000000000000
diff --git a/drivers/tty/serial/bfin_sport_uart.h b/drivers/tty/serial/bfin_sport_uart.h
deleted file mode 100644
index 4b12f45d6580..000000000000
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
deleted file mode 100644
index 4755fa696321..000000000000
--
2.9.0
The m32r architecture is getting removed, so we don't need this
any more.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/tty/serial/Kconfig | 29 -
drivers/tty/serial/Makefile | 1 -
drivers/tty/serial/m32r_sio.c | 1053 -------------------------------------
drivers/tty/serial/m32r_sio_reg.h | 150 ------
4 files changed, 1233 deletions(-)
delete mode 100644 drivers/tty/serial/m32r_sio.c
delete mode 100644 drivers/tty/serial/m32r_sio_reg.h
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 031552eb3f65..1a48ae6abb2c 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -905,35 +905,6 @@ config SERIAL_ICOM
This driver can also be built as a module. If so, the module
will be called icom.
-config SERIAL_M32R_SIO
- bool "M32R SIO I/F"
- depends on M32R
- default y
- select SERIAL_CORE
- help
- Say Y here if you want to use the M32R serial controller.
-
-config SERIAL_M32R_SIO_CONSOLE
- bool "use SIO console"
- depends on SERIAL_M32R_SIO=y
- select SERIAL_CORE_CONSOLE
- help
- Say Y here if you want to support a serial console.
-
- If you use an M3T-M32700UT or an OPSPUT platform,
- please say also y for SERIAL_M32R_PLDSIO.
-
-config SERIAL_M32R_PLDSIO
- bool "M32R SIO I/F on a PLD"
- depends on SERIAL_M32R_SIO=y && (PLAT_OPSPUT || PLAT_USRV || PLAT_M32700UT)
- default n
- help
- Say Y here if you want to use the M32R serial controller
- on a PLD (Programmable Logic Device).
-
- If you use an M3T-M32700UT or an OPSPUT platform,
- please say Y.
-
config SERIAL_TXX9
bool "TMPTX39XX/49XX SIO support"
depends on HAS_TXX9_SERIAL
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index a9242484e821..606e746b61f1 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_SERIAL_CPM) += cpm_uart/
obj-$(CONFIG_SERIAL_IMX) += imx.o
obj-$(CONFIG_SERIAL_MPC52xx) += mpc52xx_uart.o
obj-$(CONFIG_SERIAL_ICOM) += icom.o
-obj-$(CONFIG_SERIAL_M32R_SIO) += m32r_sio.o
obj-$(CONFIG_SERIAL_MPSC) += mpsc.o
obj-$(CONFIG_SERIAL_MESON) += meson_uart.o
obj-$(CONFIG_SERIAL_SB1250_DUART) += sb1250-duart.o
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
deleted file mode 100644
index 7b83a8aab495..000000000000
diff --git a/drivers/tty/serial/m32r_sio_reg.h b/drivers/tty/serial/m32r_sio_reg.h
deleted file mode 100644
index 6eed48828f94..000000000000
--
2.9.0
The Tile architecture is obsolete and getting removed from the kernel,
this removes the corresponding console driver as well.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/tty/hvc/Makefile | 1 -
drivers/tty/hvc/hvc_tile.c | 196 ---------------------------------------------
2 files changed, 197 deletions(-)
delete mode 100644 drivers/tty/hvc/hvc_tile.c
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
index b82f9f68cd23..7da1934d34e8 100644
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@ -3,7 +3,6 @@ obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi_lib.o
obj-$(CONFIG_HVC_OPAL) += hvc_opal.o hvsi_lib.o
obj-$(CONFIG_HVC_OLD_HVSI) += hvsi.o
obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o
-obj-$(CONFIG_HVC_TILE) += hvc_tile.o
obj-$(CONFIG_HVC_DCC) += hvc_dcc.o
obj-$(CONFIG_HVC_DRIVER) += hvc_console.o
obj-$(CONFIG_HVC_IRQ) += hvc_irq.o
diff --git a/drivers/tty/hvc/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
deleted file mode 100644
index b517c0661abb..000000000000
--
2.9.0
The blackfin architecture is getting removed, so these drivers
are not needed any more.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/tty/Kconfig | 13 --
drivers/tty/Makefile | 1 -
drivers/tty/bfin_jtag_comm.c | 353 ----------------------------------------
drivers/tty/hvc/Kconfig | 9 -
drivers/tty/hvc/Makefile | 1 -
drivers/tty/hvc/hvc_bfin_jtag.c | 104 ------------
6 files changed, 481 deletions(-)
delete mode 100644 drivers/tty/bfin_jtag_comm.c
delete mode 100644 drivers/tty/hvc/hvc_bfin_jtag.c
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index b68e71751cc5..0840d27381ea 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -151,19 +151,6 @@ config LEGACY_PTY_COUNT
When not in use, each legacy PTY occupies 12 bytes on 32-bit
architectures and 24 bytes on 64-bit architectures.
-config BFIN_JTAG_COMM
- tristate "Blackfin JTAG Communication"
- depends on BLACKFIN
- help
- Add support for emulating a TTY device over the Blackfin JTAG.
-
- To compile this driver as a module, choose M here: the
- module will be called bfin_jtag_comm.
-
-config BFIN_JTAG_COMM_CONSOLE
- bool "Console on Blackfin JTAG"
- depends on BFIN_JTAG_COMM=y
-
config SERIAL_NONSTANDARD
bool "Non-standard serial port support"
depends on HAS_IOMEM
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 47c71f43a397..c72cafdf32b4 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_SERIAL_DEV_BUS) += serdev/
# tty drivers
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
-obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
obj-$(CONFIG_CYCLADES) += cyclades.o
obj-$(CONFIG_ISI) += isicom.o
obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
diff --git a/drivers/tty/bfin_jtag_comm.c b/drivers/tty/bfin_jtag_comm.c
deleted file mode 100644
index c369bf27a67b..000000000000
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index fec457edad14..3bade5ad3d71 100644
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -88,15 +88,6 @@ config HVC_DCC
driver. This console is used through a JTAG only on ARM. If you don't have
a JTAG then you probably don't want this option.
-config HVC_BFIN_JTAG
- bool "Blackfin JTAG console"
- depends on BLACKFIN
- select HVC_DRIVER
- help
- This console uses the Blackfin JTAG to create a console under the
- the HVC driver. If you don't have JTAG, then you probably don't
- want this option.
-
config HVCS
tristate "IBM Hypervisor Virtual Console Server support"
depends on PPC_PSERIES && HVC_CONSOLE
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
index 0b02ec7f1dfd..b82f9f68cd23 100644
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@ -10,5 +10,4 @@ obj-$(CONFIG_HVC_IRQ) += hvc_irq.o
obj-$(CONFIG_HVC_XEN) += hvc_xen.o
obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
-obj-$(CONFIG_HVC_BFIN_JTAG) += hvc_bfin_jtag.o
obj-$(CONFIG_HVCS) += hvcs.o
diff --git a/drivers/tty/hvc/hvc_bfin_jtag.c b/drivers/tty/hvc/hvc_bfin_jtag.c
deleted file mode 100644
index dd7cae4c195b..000000000000
--
2.9.0
The blackfin architecture is getting removed, so the timer trigger
driver is now obsolete. Since this is the last remaining iio trigger
driver in staging, I'm removing the entire directory.
I'm not sure about the other staging iio drivers though: almost
all of them are for Analog Devices devices like this one. They
are likely used along with blackfin SoCs, but could easily be
used on any others as well.
It might be time to consider whether they should be removed, but
it doesn't feel like a decision that I should be making.
Signed-off-by: Arnd Bergmann <[email protected]>
---
MAINTAINERS | 1 -
drivers/staging/iio/Kconfig | 1 -
drivers/staging/iio/Makefile | 1 -
drivers/staging/iio/trigger/Kconfig | 19 --
drivers/staging/iio/trigger/Makefile | 5 -
drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 292 ----------------------
drivers/staging/iio/trigger/iio-trig-bfin-timer.h | 25 --
7 files changed, 344 deletions(-)
delete mode 100644 drivers/staging/iio/trigger/Kconfig
delete mode 100644 drivers/staging/iio/trigger/Makefile
delete mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.c
delete mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 6eb7387bb1e9..c85ce0cd5038 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -859,7 +859,6 @@ F: drivers/iio/*/ad*
F: drivers/iio/adc/ltc2497*
X: drivers/iio/*/adjd*
F: drivers/staging/iio/*/ad*
-F: drivers/staging/iio/trigger/iio-trig-bfin-timer.c
ANDES ARCHITECTURE
M: Greentime Hu <[email protected]>
diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig
index 8abc1ab3c0c7..bd9445956511 100644
--- a/drivers/staging/iio/Kconfig
+++ b/drivers/staging/iio/Kconfig
@@ -14,6 +14,5 @@ source "drivers/staging/iio/impedance-analyzer/Kconfig"
source "drivers/staging/iio/light/Kconfig"
source "drivers/staging/iio/meter/Kconfig"
source "drivers/staging/iio/resolver/Kconfig"
-source "drivers/staging/iio/trigger/Kconfig"
endmenu
diff --git a/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile
index 455bffc29649..e99a375c07b9 100644
--- a/drivers/staging/iio/Makefile
+++ b/drivers/staging/iio/Makefile
@@ -13,4 +13,3 @@ obj-y += impedance-analyzer/
obj-y += light/
obj-y += meter/
obj-y += resolver/
-obj-y += trigger/
diff --git a/drivers/staging/iio/trigger/Kconfig b/drivers/staging/iio/trigger/Kconfig
deleted file mode 100644
index 0b01d24cea51..000000000000
diff --git a/drivers/staging/iio/trigger/Makefile b/drivers/staging/iio/trigger/Makefile
deleted file mode 100644
index 1300a21363db..000000000000
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
deleted file mode 100644
index 71f11d7472c0..000000000000
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.h b/drivers/staging/iio/trigger/iio-trig-bfin-timer.h
deleted file mode 100644
index fb05a2a8397c..000000000000
--
2.9.0
The blackfin architecture is getting removed, so this
driver is now obsolete.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/staging/irda/drivers/Kconfig | 45 --
drivers/staging/irda/drivers/Makefile | 1 -
drivers/staging/irda/drivers/bfin_sir.c | 819 --------------------------------
drivers/staging/irda/drivers/bfin_sir.h | 93 ----
4 files changed, 958 deletions(-)
delete mode 100644 drivers/staging/irda/drivers/bfin_sir.c
delete mode 100644 drivers/staging/irda/drivers/bfin_sir.h
diff --git a/drivers/staging/irda/drivers/Kconfig b/drivers/staging/irda/drivers/Kconfig
index e070e1222733..71ac76c5295a 100644
--- a/drivers/staging/irda/drivers/Kconfig
+++ b/drivers/staging/irda/drivers/Kconfig
@@ -17,51 +17,6 @@ config IRTTY_SIR
If unsure, say Y.
-config BFIN_SIR
- tristate "Blackfin SIR on UART"
- depends on BLACKFIN && IRDA
- default n
- help
- Say Y here if your want to enable SIR function on Blackfin UART
- devices.
-
- To activate this driver you can start irattach like:
- "irattach irda0 -s"
-
- Saying M, it will be built as a module named bfin_sir.
-
- Note that you need to turn off one of the serial drivers for SIR
- to use that UART.
-
-config BFIN_SIR0
- bool "Blackfin SIR on UART0"
- depends on BFIN_SIR && !SERIAL_BFIN_UART0
-
-config BFIN_SIR1
- bool "Blackfin SIR on UART1"
- depends on BFIN_SIR && !SERIAL_BFIN_UART1 && (!BF531 && !BF532 && !BF533 && !BF561)
-
-config BFIN_SIR2
- bool "Blackfin SIR on UART2"
- depends on BFIN_SIR && !SERIAL_BFIN_UART2 && (BF54x || BF538 || BF539)
-
-config BFIN_SIR3
- bool "Blackfin SIR on UART3"
- depends on BFIN_SIR && !SERIAL_BFIN_UART3 && (BF54x)
-
-choice
- prompt "SIR Mode"
- depends on BFIN_SIR
- default SIR_BFIN_DMA
-
-config SIR_BFIN_DMA
- bool "DMA mode"
- depends on !DMA_UNCACHED_NONE
-
-config SIR_BFIN_PIO
- bool "PIO mode"
-endchoice
-
config SH_SIR
tristate "SuperH SIR on UART"
depends on IRDA && SUPERH && \
diff --git a/drivers/staging/irda/drivers/Makefile b/drivers/staging/irda/drivers/Makefile
index e2901b135528..d5307ed2d9b4 100644
--- a/drivers/staging/irda/drivers/Makefile
+++ b/drivers/staging/irda/drivers/Makefile
@@ -23,7 +23,6 @@ obj-$(CONFIG_MCS_FIR) += mcs7780.o
obj-$(CONFIG_AU1000_FIR) += au1k_ir.o
# SIR drivers
obj-$(CONFIG_IRTTY_SIR) += irtty-sir.o sir-dev.o
-obj-$(CONFIG_BFIN_SIR) += bfin_sir.o
obj-$(CONFIG_SH_SIR) += sh_sir.o
# dongle drivers for SIR drivers
obj-$(CONFIG_ESI_DONGLE) += esi-sir.o
diff --git a/drivers/staging/irda/drivers/bfin_sir.c b/drivers/staging/irda/drivers/bfin_sir.c
deleted file mode 100644
index 59e409b68349..000000000000
diff --git a/drivers/staging/irda/drivers/bfin_sir.h b/drivers/staging/irda/drivers/bfin_sir.h
deleted file mode 100644
index d47cf14bb4a5..000000000000
--
2.9.0
On Wed, Mar 14, 2018 at 04:35:40PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so this
> driver is now obsolete.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Dmitry Torokhov <[email protected]>
Please take it through your tree with the rest of bfin removal patches.
> ---
> drivers/input/keyboard/Kconfig | 9 -
> drivers/input/keyboard/Makefile | 1 -
> drivers/input/keyboard/bf54x-keys.c | 396 ------------------------------------
> 3 files changed, 406 deletions(-)
> delete mode 100644 drivers/input/keyboard/bf54x-keys.c
>
> diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
> index 4c4ab1ced235..2b469cc47a78 100644
> --- a/drivers/input/keyboard/Kconfig
> +++ b/drivers/input/keyboard/Kconfig
> @@ -157,15 +157,6 @@ config KEYBOARD_QT2160
> This driver can also be built as a module. If so, the module
> will be called qt2160.
>
> -config KEYBOARD_BFIN
> - tristate "Blackfin BF54x keypad support"
> - depends on (BF54x && !BF544)
> - help
> - Say Y here if you want to use the BF54x keypad.
> -
> - To compile this driver as a module, choose M here: the
> - module will be called bf54x-keys.
> -
> config KEYBOARD_CLPS711X
> tristate "CLPS711X Keypad support"
> depends on OF_GPIO && (ARCH_CLPS711X || COMPILE_TEST)
> diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
> index 526e68294e6e..8fab920afa58 100644
> --- a/drivers/input/keyboard/Makefile
> +++ b/drivers/input/keyboard/Makefile
> @@ -13,7 +13,6 @@ obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o
> obj-$(CONFIG_KEYBOARD_ATARI) += atakbd.o
> obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o
> obj-$(CONFIG_KEYBOARD_BCM) += bcm-keypad.o
> -obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o
> obj-$(CONFIG_KEYBOARD_CAP11XX) += cap11xx.o
> obj-$(CONFIG_KEYBOARD_CLPS711X) += clps711x-keypad.o
> obj-$(CONFIG_KEYBOARD_CROS_EC) += cros_ec_keyb.o
> diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
> deleted file mode 100644
> index 8a07a426f88e..000000000000
> --
> 2.9.0
>
--
Dmitry
On Wed, Mar 14, 2018 at 04:35:41PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so this
> one is obsolete as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Dmitry Torokhov <[email protected]>
Please take it through your tree with the rest of bfin removal patches.
> ---
> drivers/input/misc/Kconfig | 9 -
> drivers/input/misc/Makefile | 1 -
> drivers/input/misc/bfin_rotary.c | 294 ------------------------------
> include/linux/platform_data/bfin_rotary.h | 117 ------------
> 4 files changed, 421 deletions(-)
> delete mode 100644 drivers/input/misc/bfin_rotary.c
> delete mode 100644 include/linux/platform_data/bfin_rotary.h
>
> diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
> index 6a3c753b093b..572b15fa18c2 100644
> --- a/drivers/input/misc/Kconfig
> +++ b/drivers/input/misc/Kconfig
> @@ -655,15 +655,6 @@ config INPUT_DM355EVM
> To compile this driver as a module, choose M here: the
> module will be called dm355evm_keys.
>
> -config INPUT_BFIN_ROTARY
> - tristate "Blackfin Rotary support"
> - depends on BF54x || BF52x
> - help
> - Say Y here if you want to use the Blackfin Rotary.
> -
> - To compile this driver as a module, choose M here: the
> - module will be called bfin-rotary.
> -
> config INPUT_WM831X_ON
> tristate "WM831X ON pin"
> depends on MFD_WM831X
> diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
> index 8cc58f362bb8..72cde28649e2 100644
> --- a/drivers/input/misc/Makefile
> +++ b/drivers/input/misc/Makefile
> @@ -19,7 +19,6 @@ obj-$(CONFIG_INPUT_ARIZONA_HAPTICS) += arizona-haptics.o
> obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o
> obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
> obj-$(CONFIG_INPUT_ATMEL_CAPTOUCH) += atmel_captouch.o
> -obj-$(CONFIG_INPUT_BFIN_ROTARY) += bfin_rotary.o
> obj-$(CONFIG_INPUT_BMA150) += bma150.o
> obj-$(CONFIG_INPUT_CM109) += cm109.o
> obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o
> diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
> deleted file mode 100644
> index 799ce3d2820e..000000000000
> diff --git a/include/linux/platform_data/bfin_rotary.h b/include/linux/platform_data/bfin_rotary.h
> deleted file mode 100644
> index 98829370fee2..000000000000
> --
> 2.9.0
>
--
Dmitry
On Wed, Mar 14, 2018 at 04:35:44PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so this driver has
> become obsolete.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Guenter Roeck <[email protected]>
> ---
> Documentation/watchdog/watchdog-parameters.txt | 5 -
> drivers/watchdog/Kconfig | 17 -
> drivers/watchdog/Makefile | 7 -
> drivers/watchdog/bfin_wdt.c | 476 -------------------------
> 4 files changed, 505 deletions(-)
> delete mode 100644 drivers/watchdog/bfin_wdt.c
>
> diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt
> index beea975980f6..6d6200ea27b8 100644
> --- a/Documentation/watchdog/watchdog-parameters.txt
> +++ b/Documentation/watchdog/watchdog-parameters.txt
> @@ -55,11 +55,6 @@ wdt_time: Watchdog time in seconds. (default=30)
> nowayout: Watchdog cannot be stopped once started
> (default=kernel config parameter)
> -------------------------------------------------
> -bfin_wdt:
> -timeout: Watchdog timeout in seconds. (1<=timeout<=((2^32)/SCLK), default=20)
> -nowayout: Watchdog cannot be stopped once started
> - (default=kernel config parameter)
> --------------------------------------------------
> coh901327_wdt:
> margin: Watchdog margin in seconds (default 60s)
> -------------------------------------------------
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 098e5ed4ee3d..f89f8869ca2a 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -815,23 +815,6 @@ config SPRD_WATCHDOG
> Say Y here to include watchdog timer supported
> by Spreadtrum system.
>
> -# BLACKFIN Architecture
> -
> -config BFIN_WDT
> - tristate "Blackfin On-Chip Watchdog Timer"
> - depends on BLACKFIN
> - ---help---
> - If you say yes here you will get support for the Blackfin On-Chip
> - Watchdog Timer. If you have one of these processors and wish to
> - have watchdog support enabled, say Y, otherwise say N.
> -
> - To compile this driver as a module, choose M here: the
> - module will be called bfin_wdt.
> -
> -# CRIS Architecture
> -
> -# FRV Architecture
> -
> # X86 (i386 + ia64 + x86_64) Architecture
>
> config ACQUIRE_WDT
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index 0474d38aa854..e209824541b8 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -91,13 +91,6 @@ obj-$(CONFIG_UNIPHIER_WATCHDOG) += uniphier_wdt.o
> obj-$(CONFIG_RTD119X_WATCHDOG) += rtd119x_wdt.o
> obj-$(CONFIG_SPRD_WATCHDOG) += sprd_wdt.o
>
> -# BLACKFIN Architecture
> -obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o
> -
> -# CRIS Architecture
> -
> -# FRV Architecture
> -
> # X86 (i386 + ia64 + x86_64) Architecture
> obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
> obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
> diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
> deleted file mode 100644
> index aa4d2e8a8ef9..000000000000
> --
> 2.9.0
>
On Wed, Mar 14, 2018 at 04:35:28PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so the ASoC drivers
> are all obsolete as well.
This is going to cause loads of conflicts due to the ASoC platform to
component refactoring - can you send me something that I can git am
directly against my -next please, it seems better to apply it there so
that nobody needs to see the conflicts?
On Wed, Mar 14, 2018 at 04:35:47PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so these
> won't be needed any more.
Acked-by: Mark Brown <[email protected]>
(or if you resend something directly applicable I can do that)
The cris architecture is getting removed, so we don't need the
ethernet driver any more either.
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/net/Makefile | 1 -
drivers/net/cris/Makefile | 1 -
drivers/net/cris/eth_v10.c | 1742 --------------------------------------------
3 files changed, 1744 deletions(-)
delete mode 100644 drivers/net/cris/Makefile
delete mode 100644 drivers/net/cris/eth_v10.c
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 04c3b747812c..91e67e375dd4 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_CAIF) += caif/
obj-$(CONFIG_CAN) += can/
-obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_NET_DSA) += dsa/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/
diff --git a/drivers/net/cris/Makefile b/drivers/net/cris/Makefile
deleted file mode 100644
index b4e8932227b6..000000000000
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
deleted file mode 100644
index 8b1a859f5140..000000000000
--
2.9.0
On Wed, Mar 14, 2018 at 5:12 PM, Mark Brown <[email protected]> wrote:
> On Wed, Mar 14, 2018 at 04:35:28PM +0100, Arnd Bergmann wrote:
>
>> The blackfin architecture is getting removed, so the ASoC drivers
>> are all obsolete as well.
>
> This is going to cause loads of conflicts due to the ASoC platform to
> component refactoring - can you send me something that I can git am
> directly against my -next please, it seems better to apply it there so
> that nobody needs to see the conflicts?
Done.
Arnd
On Wed, Mar 14, 2018 at 5:12 PM, Mark Brown <[email protected]> wrote:
> On Wed, Mar 14, 2018 at 04:35:28PM +0100, Arnd Bergmann wrote:
>
>> The blackfin architecture is getting removed, so the ASoC drivers
>> are all obsolete as well.
>
> This is going to cause loads of conflicts due to the ASoC platform to
> component refactoring - can you send me something that I can git am
> directly against my -next please, it seems better to apply it there so
> that nobody needs to see the conflicts?
Done.
Arnd
On Wed, Mar 14, 2018 at 04:36:00PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so the timer trigger
> driver is now obsolete. Since this is the last remaining iio trigger
> driver in staging, I'm removing the entire directory.
>
> I'm not sure about the other staging iio drivers though: almost
> all of them are for Analog Devices devices like this one. They
> are likely used along with blackfin SoCs, but could easily be
> used on any others as well.
>
> It might be time to consider whether they should be removed, but
> it doesn't feel like a decision that I should be making.
The IIO driver maintainer/developers are talking about that currently, I
think they have a plan for those other drivers.
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:55PM +0100, Arnd Bergmann wrote:
> The m32r architecture is getting removed, so we don't need this
> any more.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/tty/serial/Kconfig | 29 -
> drivers/tty/serial/Makefile | 1 -
> drivers/tty/serial/m32r_sio.c | 1053 -------------------------------------
> drivers/tty/serial/m32r_sio_reg.h | 150 ------
> 4 files changed, 1233 deletions(-)
> delete mode 100644 drivers/tty/serial/m32r_sio.c
> delete mode 100644 drivers/tty/serial/m32r_sio_reg.h
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:56PM +0100, Arnd Bergmann wrote:
> The tile architecture is getting removed, and this driver is
> useless without it.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/tty/serial/Kconfig | 9 -
> drivers/tty/serial/Makefile | 1 -
> drivers/tty/serial/tilegx.c | 689 --------------------------------------------
> 3 files changed, 699 deletions(-)
> delete mode 100644 drivers/tty/serial/tilegx.c
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:59PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so this
> driver is now obsolete.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/staging/irda/drivers/Kconfig | 45 --
> drivers/staging/irda/drivers/Makefile | 1 -
> drivers/staging/irda/drivers/bfin_sir.c | 819 --------------------------------
> drivers/staging/irda/drivers/bfin_sir.h | 93 ----
> 4 files changed, 958 deletions(-)
> delete mode 100644 drivers/staging/irda/drivers/bfin_sir.c
> delete mode 100644 drivers/staging/irda/drivers/bfin_sir.h
I just deleted all of drivers/staging/irda/ earlier today :)
thanks,
greg k-h
On Wed, Mar 14, 2018 at 04:35:52PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, and this is the last
> remaining architecture specific setting, so the various hacks
> can be removed now.
>
> >From all I can tell, there are no remaining in-tree users of the
> driver, but it could be used by out-of-tree platform ports.
> I've marked the driver as 'depends on COMPILE_TEST', short of
> removing it outright.
>
> It was originally written for some ARM PXA machines using the same
> chip, but that platform never really worked and the code has been
> removed a long time ago.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/usb/host/Kconfig | 1 +
> drivers/usb/host/isp1362.h | 44 --------------------------------------------
> 2 files changed, 1 insertion(+), 44 deletions(-)
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:51PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so we can clean up
> all the special cases in the musb driver.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/usb/musb/Kconfig | 10 +-
> drivers/usb/musb/Makefile | 1 -
> drivers/usb/musb/blackfin.c | 623 ----------------------------------------
> drivers/usb/musb/blackfin.h | 81 ------
> drivers/usb/musb/musb_core.c | 5 -
> drivers/usb/musb/musb_core.h | 30 --
> drivers/usb/musb/musb_debugfs.c | 2 -
> drivers/usb/musb/musb_dma.h | 11 -
> drivers/usb/musb/musb_gadget.c | 35 ---
> drivers/usb/musb/musb_regs.h | 182 ------------
> drivers/usb/musb/musbhsdma.c | 5 -
> drivers/usb/musb/musbhsdma.h | 64 -----
> include/linux/usb/musb.h | 7 -
> 13 files changed, 1 insertion(+), 1055 deletions(-)
> delete mode 100644 drivers/usb/musb/blackfin.c
> delete mode 100644 drivers/usb/musb/blackfin.h
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:50PM +0100, Arnd Bergmann wrote:
> The tile architecture is getting removed, so the ehci and ohci platform
> glue drivers are no longer needed. In case of ohci, this is the last
> one to define a PLATFORM_DRIVER macro, so we can remove even more.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/usb/host/ehci-hcd.c | 5 -
> drivers/usb/host/ehci-tilegx.c | 207 -----------------------------------------
> drivers/usb/host/ohci-hcd.c | 18 ----
> drivers/usb/host/ohci-tilegx.c | 196 --------------------------------------
> include/linux/usb/tilegx.h | 35 -------
> 5 files changed, 461 deletions(-)
> delete mode 100644 drivers/usb/host/ehci-tilegx.c
> delete mode 100644 drivers/usb/host/ohci-tilegx.c
> delete mode 100644 include/linux/usb/tilegx.h
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:24PM +0100, Arnd Bergmann wrote:
> The tile architecture is being removed, so we no longer need this driver.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/char/Kconfig | 11 --
> drivers/char/Makefile | 1 -
> drivers/char/tile-srom.c | 475 -----------------------------------------------
> 3 files changed, 487 deletions(-)
> delete mode 100644 drivers/char/tile-srom.c
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:23PM +0100, Arnd Bergmann wrote:
> The m32r architecture was the only user of the old-style
> rtc driver for ds1302. The architecture is getting removed
> now, and we have a modern driver for the same hardware in
> drivers/rtc/rtc-ds1302.c, so this one won't be missed.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/char/Kconfig | 9 --
> drivers/char/Makefile | 1 -
> drivers/char/ds1302.c | 357 --------------------------------------------------
> 3 files changed, 367 deletions(-)
> delete mode 100644 drivers/char/ds1302.c
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:53PM +0100, Arnd Bergmann wrote:
> The cris architecture is getting removed, so we don't need the
> uart driver any more.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> .../bindings/serial/axis,etraxfs-uart.txt | 22 -
> drivers/tty/serial/Kconfig | 11 -
> drivers/tty/serial/Makefile | 2 -
> drivers/tty/serial/crisv10.c | 4248 --------------------
> drivers/tty/serial/crisv10.h | 133 -
> drivers/tty/serial/etraxfs-uart.c | 960 -----
> 6 files changed, 5376 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt
> delete mode 100644 drivers/tty/serial/crisv10.c
> delete mode 100644 drivers/tty/serial/crisv10.h
> delete mode 100644 drivers/tty/serial/etraxfs-uart.c
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:25PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so we don't
> need this driver any more.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/char/Kconfig | 28 ------
> drivers/char/Makefile | 1 -
> drivers/char/bfin-otp.c | 237 ------------------------------------------------
> 3 files changed, 266 deletions(-)
> delete mode 100644 drivers/char/bfin-otp.c
>
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:54PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so both the bfin_uart
> and bfin_sport_uart can be removed as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/tty/serial/Kconfig | 149 ----
> drivers/tty/serial/Makefile | 2 -
> drivers/tty/serial/bfin_sport_uart.c | 937 --------------------
> drivers/tty/serial/bfin_sport_uart.h | 86 --
> drivers/tty/serial/bfin_uart.c | 1551 ----------------------------------
> 5 files changed, 2725 deletions(-)
> delete mode 100644 drivers/tty/serial/bfin_sport_uart.c
> delete mode 100644 drivers/tty/serial/bfin_sport_uart.h
> delete mode 100644 drivers/tty/serial/bfin_uart.c
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:57PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so these drivers
> are not needed any more.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/tty/Kconfig | 13 --
> drivers/tty/Makefile | 1 -
> drivers/tty/bfin_jtag_comm.c | 353 ----------------------------------------
> drivers/tty/hvc/Kconfig | 9 -
> drivers/tty/hvc/Makefile | 1 -
> drivers/tty/hvc/hvc_bfin_jtag.c | 104 ------------
> 6 files changed, 481 deletions(-)
> delete mode 100644 drivers/tty/bfin_jtag_comm.c
> delete mode 100644 drivers/tty/hvc/hvc_bfin_jtag.c
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 5:32 PM, Greg Kroah-Hartman
<[email protected]> wrote:
> On Wed, Mar 14, 2018 at 04:35:59PM +0100, Arnd Bergmann wrote:
>> The blackfin architecture is getting removed, so this
>> driver is now obsolete.
>>
>> Signed-off-by: Arnd Bergmann <[email protected]>
>> ---
>> drivers/staging/irda/drivers/Kconfig | 45 --
>> drivers/staging/irda/drivers/Makefile | 1 -
>> drivers/staging/irda/drivers/bfin_sir.c | 819 --------------------------------
>> drivers/staging/irda/drivers/bfin_sir.h | 93 ----
>> 4 files changed, 958 deletions(-)
>> delete mode 100644 drivers/staging/irda/drivers/bfin_sir.c
>> delete mode 100644 drivers/staging/irda/drivers/bfin_sir.h
>
> I just deleted all of drivers/staging/irda/ earlier today :)
Perfect, dropping this patch from my series then. Thanks,
Arnd
On Wed, Mar 14, 2018 at 04:35:58PM +0100, Arnd Bergmann wrote:
> The Tile architecture is obsolete and getting removed from the kernel,
> this removes the corresponding console driver as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/tty/hvc/Makefile | 1 -
> drivers/tty/hvc/hvc_tile.c | 196 ---------------------------------------------
> 2 files changed, 197 deletions(-)
> delete mode 100644 drivers/tty/hvc/hvc_tile.c
Acked-by: Greg Kroah-Hartman <[email protected]>
On Wed, Mar 14, 2018 at 04:35:49PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so this driver is now
> obsolete as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/pwm/Kconfig | 9 ---
> drivers/pwm/Makefile | 1 -
> drivers/pwm/pwm-bfin.c | 157 -------------------------------------------------
> 3 files changed, 167 deletions(-)
> delete mode 100644 drivers/pwm/pwm-bfin.c
Do you want to apply this in a batch or do you want me to pick it up
into the PWM tree?
If you want to go for the former:
Acked-by: Thierry Reding <[email protected]>
Otherwise, just let me know and I'll pick this up for v4.17.
Thanks,
Thierry
On Wed, Mar 14, 2018 at 5:38 PM, Thierry Reding
<[email protected]> wrote:
> On Wed, Mar 14, 2018 at 04:35:49PM +0100, Arnd Bergmann wrote:
>> The blackfin architecture is getting removed, so this driver is now
>> obsolete as well.
>>
>> Signed-off-by: Arnd Bergmann <[email protected]>
>> ---
>> drivers/pwm/Kconfig | 9 ---
>> drivers/pwm/Makefile | 1 -
>> drivers/pwm/pwm-bfin.c | 157 -------------------------------------------------
>> 3 files changed, 167 deletions(-)
>> delete mode 100644 drivers/pwm/pwm-bfin.c
>
> Do you want to apply this in a batch or do you want me to pick it up
> into the PWM tree?
>
> If you want to go for the former:
>
> Acked-by: Thierry Reding <[email protected]>
>
> Otherwise, just let me know and I'll pick this up for v4.17.
Either way is fine with me, the other maintainers just provided
an Ack, and preferred me to keep the removal in one piece, so
i'll do the same here.
Arnd
On Wed, 14 Mar 2018, Greg Kroah-Hartman wrote:
> On Wed, Mar 14, 2018 at 04:35:50PM +0100, Arnd Bergmann wrote:
> > The tile architecture is getting removed, so the ehci and ohci platform
> > glue drivers are no longer needed. In case of ohci, this is the last
> > one to define a PLATFORM_DRIVER macro, so we can remove even more.
> >
> > Signed-off-by: Arnd Bergmann <[email protected]>
> > ---
> > drivers/usb/host/ehci-hcd.c | 5 -
> > drivers/usb/host/ehci-tilegx.c | 207 -----------------------------------------
> > drivers/usb/host/ohci-hcd.c | 18 ----
> > drivers/usb/host/ohci-tilegx.c | 196 --------------------------------------
> > include/linux/usb/tilegx.h | 35 -------
> > 5 files changed, 461 deletions(-)
> > delete mode 100644 drivers/usb/host/ehci-tilegx.c
> > delete mode 100644 drivers/usb/host/ohci-tilegx.c
> > delete mode 100644 include/linux/usb/tilegx.h
>
> Acked-by: Greg Kroah-Hartman <[email protected]>
Acked-by: Alan Stern <[email protected]>
On 14 March 2018 at 15:35, Arnd Bergmann <[email protected]> wrote:
> The Tile architecture is getting removed, so we no longer need this either.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Ard Biesheuvel <[email protected]>
> ---
> include/linux/raid/pq.h | 1 -
> lib/raid6/Makefile | 6 ----
> lib/raid6/algos.c | 3 --
> lib/raid6/test/Makefile | 7 ----
> lib/raid6/tilegx.uc | 87 -------------------------------------------------
> 5 files changed, 104 deletions(-)
> delete mode 100644 lib/raid6/tilegx.uc
>
> diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
> index 583cdd3d49ca..a366cc314479 100644
> --- a/include/linux/raid/pq.h
> +++ b/include/linux/raid/pq.h
> @@ -105,7 +105,6 @@ extern const struct raid6_calls raid6_avx2x4;
> extern const struct raid6_calls raid6_avx512x1;
> extern const struct raid6_calls raid6_avx512x2;
> extern const struct raid6_calls raid6_avx512x4;
> -extern const struct raid6_calls raid6_tilegx8;
> extern const struct raid6_calls raid6_s390vx8;
>
> struct raid6_recov_calls {
> diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile
> index 4add700ddfe3..44d6b46df051 100644
> --- a/lib/raid6/Makefile
> +++ b/lib/raid6/Makefile
> @@ -7,7 +7,6 @@ raid6_pq-y += algos.o recov.o tables.o int1.o int2.o int4.o \
> raid6_pq-$(CONFIG_X86) += recov_ssse3.o recov_avx2.o mmx.o sse1.o sse2.o avx2.o avx512.o recov_avx512.o
> raid6_pq-$(CONFIG_ALTIVEC) += altivec1.o altivec2.o altivec4.o altivec8.o
> raid6_pq-$(CONFIG_KERNEL_MODE_NEON) += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o
> -raid6_pq-$(CONFIG_TILEGX) += tilegx8.o
> raid6_pq-$(CONFIG_S390) += s390vx8.o recov_s390xc.o
>
> hostprogs-y += mktables
> @@ -115,11 +114,6 @@ $(obj)/neon8.c: UNROLL := 8
> $(obj)/neon8.c: $(src)/neon.uc $(src)/unroll.awk FORCE
> $(call if_changed,unroll)
>
> -targets += tilegx8.c
> -$(obj)/tilegx8.c: UNROLL := 8
> -$(obj)/tilegx8.c: $(src)/tilegx.uc $(src)/unroll.awk FORCE
> - $(call if_changed,unroll)
> -
> targets += s390vx8.c
> $(obj)/s390vx8.c: UNROLL := 8
> $(obj)/s390vx8.c: $(src)/s390vx.uc $(src)/unroll.awk FORCE
> diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
> index 476994723258..c65aa80d67ed 100644
> --- a/lib/raid6/algos.c
> +++ b/lib/raid6/algos.c
> @@ -75,9 +75,6 @@ const struct raid6_calls * const raid6_algos[] = {
> &raid6_altivec4,
> &raid6_altivec8,
> #endif
> -#if defined(CONFIG_TILEGX)
> - &raid6_tilegx8,
> -#endif
> #if defined(CONFIG_S390)
> &raid6_s390vx8,
> #endif
> diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile
> index be1010bdc435..fabc477b1417 100644
> --- a/lib/raid6/test/Makefile
> +++ b/lib/raid6/test/Makefile
> @@ -51,9 +51,6 @@ else
> OBJS += altivec1.o altivec2.o altivec4.o altivec8.o
> endif
> endif
> -ifeq ($(ARCH),tilegx)
> -OBJS += tilegx8.o
> -endif
>
> .c.o:
> $(CC) $(CFLAGS) -c -o $@ $<
> @@ -116,15 +113,11 @@ int16.c: int.uc ../unroll.awk
> int32.c: int.uc ../unroll.awk
> $(AWK) ../unroll.awk -vN=32 < int.uc > $@
>
> -tilegx8.c: tilegx.uc ../unroll.awk
> - $(AWK) ../unroll.awk -vN=8 < tilegx.uc > $@
> -
> tables.c: mktables
> ./mktables > tables.c
>
> clean:
> rm -f *.o *.a mktables mktables.c *.uc int*.c altivec*.c neon*.c tables.c raid6test
> - rm -f tilegx*.c
>
> spotless: clean
> rm -f *~
> diff --git a/lib/raid6/tilegx.uc b/lib/raid6/tilegx.uc
> deleted file mode 100644
> index 2dd291a11264..000000000000
> --
> 2.9.0
>
On Wed, 14 Mar 2018 17:32:07 +0100
Greg Kroah-Hartman <[email protected]> wrote:
> On Wed, Mar 14, 2018 at 04:36:00PM +0100, Arnd Bergmann wrote:
> > The blackfin architecture is getting removed, so the timer trigger
> > driver is now obsolete. Since this is the last remaining iio trigger
> > driver in staging, I'm removing the entire directory.
Great.
> >
> > I'm not sure about the other staging iio drivers though: almost
> > all of them are for Analog Devices devices like this one. They
> > are likely used along with blackfin SoCs, but could easily be
> > used on any others as well.
> >
> > It might be time to consider whether they should be removed, but
> > it doesn't feel like a decision that I should be making.
>
> The IIO driver maintainer/developers are talking about that currently, I
> think they have a plan for those other drivers.
Some of the drivers are under consideration for removal (particularly most
of the meter drivers) but it is unconnected to the blackfin removal.
They are simply other obsolete parts that we don't have test hardware
for and need sufficient 'surgery' that we wouldn't feel comfortable
cleaning them up without. One has been reprieved as a user, who was
happy to test, came forward when I announced the intent to remove them.
>
> > Signed-off-by: Arnd Bergmann <[email protected]>
>
> Acked-by: Greg Kroah-Hartman <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On 14 March 2018 at 16:35, Arnd Bergmann <[email protected]> wrote:
> The blackfin architecture is getting removed, so this one
> is obsolete now as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Ulf Hansson <[email protected]>
Kind regards
Uffe
> ---
> drivers/mmc/host/Kconfig | 19 --
> drivers/mmc/host/Makefile | 1 -
> drivers/mmc/host/bfin_sdh.c | 679 --------------------------------------------
> 3 files changed, 699 deletions(-)
> delete mode 100644 drivers/mmc/host/bfin_sdh.c
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 620c2d90a646..b4fd5d48dd35 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -646,25 +646,6 @@ config MMC_VIA_SDMMC
>
> If unsure, say N.
>
> -config SDH_BFIN
> - tristate "Blackfin Secure Digital Host support"
> - depends on (BF54x && !BF544) || (BF51x && !BF512)
> - help
> - If you say yes here you will get support for the Blackfin on-chip
> - Secure Digital Host interface. This includes support for MMC and
> - SD cards.
> -
> - To compile this driver as a module, choose M here: the
> - module will be called bfin_sdh.
> -
> - If unsure, say N.
> -
> -config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND
> - bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround"
> - depends on SDH_BFIN
> - help
> - If you say yes here SD-Cards may work on the EZkit.
> -
> config MMC_CAVIUM_OCTEON
> tristate "Cavium OCTEON SD/MMC Card Interface support"
> depends on CAVIUM_OCTEON_SOC
> diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
> index 84cd1388abc3..f563cc0b7f93 100644
> --- a/drivers/mmc/host/Makefile
> +++ b/drivers/mmc/host/Makefile
> @@ -43,7 +43,6 @@ obj-$(CONFIG_MMC_SDHI_SYS_DMAC) += renesas_sdhi_sys_dmac.o
> obj-$(CONFIG_MMC_SDHI_INTERNAL_DMAC) += renesas_sdhi_internal_dmac.o
> obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
> obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
> -obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
> octeon-mmc-objs := cavium.o cavium-octeon.o
> obj-$(CONFIG_MMC_CAVIUM_OCTEON) += octeon-mmc.o
> thunderx-mmc-objs := cavium.o cavium-thunderx.o
> diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
> deleted file mode 100644
> index 526231e38583..000000000000
> --
> 2.9.0
>
Hi,
On Wed, Mar 14, 2018 at 04:35:51PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so we can clean up
> all the special cases in the musb driver.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/usb/musb/Kconfig | 10 +-
> drivers/usb/musb/Makefile | 1 -
> drivers/usb/musb/blackfin.c | 623 ----------------------------------------
> drivers/usb/musb/blackfin.h | 81 ------
> drivers/usb/musb/musb_core.c | 5 -
> drivers/usb/musb/musb_core.h | 30 --
> drivers/usb/musb/musb_debugfs.c | 2 -
> drivers/usb/musb/musb_dma.h | 11 -
> drivers/usb/musb/musb_gadget.c | 35 ---
> drivers/usb/musb/musb_regs.h | 182 ------------
> drivers/usb/musb/musbhsdma.c | 5 -
> drivers/usb/musb/musbhsdma.h | 64 -----
> include/linux/usb/musb.h | 7 -
> 13 files changed, 1 insertion(+), 1055 deletions(-)
> delete mode 100644 drivers/usb/musb/blackfin.c
> delete mode 100644 drivers/usb/musb/blackfin.h
>
> diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
> index 5506a9c03c1f..490990e8b015 100644
> --- a/drivers/usb/musb/Kconfig
> +++ b/drivers/usb/musb/Kconfig
> @@ -18,9 +18,6 @@ config USB_MUSB_HDRC
This config entry has "ADI" in its tristate message:
config USB_MUSB_HDRC
tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, AW, ...)'
so we might want to remove it along with the whole parentheses?
- tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, AW, ...)'
+ tristate 'Inventra Highspeed Dual Role Controller'
Other than this,
Acked-by: Bin Liu <[email protected]>
Regards,
-Bin.
On 14/03/2018 at 16:35:21 +0100, Arnd Bergmann wrote:
> The tile architecture is getting removed, so this driver is
> no longer needed.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>
> ---
> drivers/rtc/Kconfig | 7 ---
> drivers/rtc/Makefile | 1 -
> drivers/rtc/rtc-tile.c | 143 -------------------------------------------------
> 3 files changed, 151 deletions(-)
> delete mode 100644 drivers/rtc/rtc-tile.c
>
> diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
> index 5457d15bbcc0..0e1413a5ba3a 100644
> --- a/drivers/rtc/Kconfig
> +++ b/drivers/rtc/Kconfig
> @@ -1667,13 +1667,6 @@ config RTC_DRV_TEGRA
> This drive can also be built as a module. If so, the module
> will be called rtc-tegra.
>
> -config RTC_DRV_TILE
> - tristate "Tilera hypervisor RTC support"
> - depends on TILE
> - help
> - Enable support for the Linux driver side of the Tilera
> - hypervisor's real-time clock interface.
> -
> config RTC_DRV_PUV3
> tristate "PKUnity v3 RTC support"
> depends on ARCH_PUV3
> diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
> index f481661a6eae..f7a4b09557a0 100644
> --- a/drivers/rtc/Makefile
> +++ b/drivers/rtc/Makefile
> @@ -163,7 +163,6 @@ obj-$(CONFIG_RTC_DRV_SUN6I) += rtc-sun6i.o
> obj-$(CONFIG_RTC_DRV_SUNXI) += rtc-sunxi.o
> obj-$(CONFIG_RTC_DRV_TEGRA) += rtc-tegra.o
> obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o
> -obj-$(CONFIG_RTC_DRV_TILE) += rtc-tile.o
> obj-$(CONFIG_RTC_DRV_TPS6586X) += rtc-tps6586x.o
> obj-$(CONFIG_RTC_DRV_TPS65910) += rtc-tps65910.o
> obj-$(CONFIG_RTC_DRV_TPS80031) += rtc-tps80031.o
> diff --git a/drivers/rtc/rtc-tile.c b/drivers/rtc/rtc-tile.c
> deleted file mode 100644
> index ef1cdabf05b4..000000000000
> --
> 2.9.0
>
--
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
On 14/03/2018 at 16:35:22 +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so this one is
> now obsolete.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>
> ---
> drivers/rtc/Kconfig | 10 --
> drivers/rtc/Makefile | 1 -
> drivers/rtc/rtc-bfin.c | 448 -------------------------------------------------
> 3 files changed, 459 deletions(-)
> delete mode 100644 drivers/rtc/rtc-bfin.c
>
> diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
> index 0e1413a5ba3a..0ab8946f69b7 100644
> --- a/drivers/rtc/Kconfig
> +++ b/drivers/rtc/Kconfig
> @@ -1445,16 +1445,6 @@ config RTC_DRV_AU1XXX
> This driver can also be built as a module. If so, the module
> will be called rtc-au1xxx.
>
> -config RTC_DRV_BFIN
> - tristate "Blackfin On-Chip RTC"
> - depends on BLACKFIN && !BF561
> - help
> - If you say yes here you will get support for the
> - Blackfin On-Chip Real Time Clock.
> -
> - This driver can also be built as a module. If so, the module
> - will be called rtc-bfin.
> -
> config RTC_DRV_RS5C313
> tristate "Ricoh RS5C313"
> depends on SH_LANDISK
> diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
> index f7a4b09557a0..5ff2fc0c361a 100644
> --- a/drivers/rtc/Makefile
> +++ b/drivers/rtc/Makefile
> @@ -36,7 +36,6 @@ obj-$(CONFIG_RTC_DRV_ASM9260) += rtc-asm9260.o
> obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
> obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o
> obj-$(CONFIG_RTC_DRV_AU1XXX) += rtc-au1xxx.o
> -obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o
> obj-$(CONFIG_RTC_DRV_BRCMSTB) += rtc-brcmstb-waketimer.o
> obj-$(CONFIG_RTC_DRV_BQ32K) += rtc-bq32k.o
> obj-$(CONFIG_RTC_DRV_BQ4802) += rtc-bq4802.o
> diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
> deleted file mode 100644
> index 15344b7c07c5..000000000000
> --
> 2.9.0
>
--
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
On Wed, Mar 14, 2018 at 6:06 PM, Jonathan Cameron
<[email protected]> wrote:
> On Wed, 14 Mar 2018 17:32:07 +0100
> Greg Kroah-Hartman <[email protected]> wrote:
>> On Wed, Mar 14, 2018 at 04:36:00PM +0100, Arnd Bergmann wrote:
>> > I'm not sure about the other staging iio drivers though: almost
>> > all of them are for Analog Devices devices like this one. They
>> > are likely used along with blackfin SoCs, but could easily be
>> > used on any others as well.
>> >
>> > It might be time to consider whether they should be removed, but
>> > it doesn't feel like a decision that I should be making.
>>
>> The IIO driver maintainer/developers are talking about that currently, I
>> think they have a plan for those other drivers.
>
> Some of the drivers are under consideration for removal (particularly most
> of the meter drivers) but it is unconnected to the blackfin removal.
> They are simply other obsolete parts that we don't have test hardware
> for and need sufficient 'surgery' that we wouldn't feel comfortable
> cleaning them up without. One has been reprieved as a user, who was
> happy to test, came forward when I announced the intent to remove them.
Ok, thanks for the clarification. I'll just drop my comment then, as you
clearly have this under control
>> > Signed-off-by: Arnd Bergmann <[email protected]>
>>
>> Acked-by: Greg Kroah-Hartman <[email protected]>
> Acked-by: Jonathan Cameron <[email protected]>
Thanks,
Arnd
On Wed, Mar 14, 2018 at 04:35:26PM +0100, Arnd Bergmann wrote:
> The m32r architecture is getting removed, so these drivers
> are no longer needed.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Dominik Brodowski <[email protected]>
Thanks,
Dominik
On 14-03-18, 16:35, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so this driver is
> now obsolete.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/cpufreq/Makefile | 1 -
> drivers/cpufreq/blackfin-cpufreq.c | 217 -------------------------------------
> 2 files changed, 218 deletions(-)
> delete mode 100644 drivers/cpufreq/blackfin-cpufreq.c
>
> diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
> index 4987227b67df..2e4495cf9aa8 100644
> --- a/drivers/cpufreq/Makefile
> +++ b/drivers/cpufreq/Makefile
> @@ -101,7 +101,6 @@ obj-$(CONFIG_POWERNV_CPUFREQ) += powernv-cpufreq.o
>
> ##################################################################################
> # Other platform drivers
> -obj-$(CONFIG_BFIN_CPU_FREQ) += blackfin-cpufreq.o
> obj-$(CONFIG_BMIPS_CPUFREQ) += bmips-cpufreq.o
> obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o
> obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o
> diff --git a/drivers/cpufreq/blackfin-cpufreq.c b/drivers/cpufreq/blackfin-cpufreq.c
> deleted file mode 100644
> index 12e97d8a9db0..000000000000
Acked-by: Viresh Kumar <[email protected]>
--
viresh
On 14-03-18, 16:35, Arnd Bergmann wrote:
> The cris architecture is getting removed, including the artpec3
> and etraxfs SoCs, so these cpufreq drivers are now unused.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/cpufreq/Makefile | 2 -
> drivers/cpufreq/cris-artpec3-cpufreq.c | 93 ----------------------------------
> drivers/cpufreq/cris-etraxfs-cpufreq.c | 92 ---------------------------------
> 3 files changed, 187 deletions(-)
> delete mode 100644 drivers/cpufreq/cris-artpec3-cpufreq.c
> delete mode 100644 drivers/cpufreq/cris-etraxfs-cpufreq.c
>
> diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
> index 2e4495cf9aa8..8d24ade3bd02 100644
> --- a/drivers/cpufreq/Makefile
> +++ b/drivers/cpufreq/Makefile
> @@ -102,8 +102,6 @@ obj-$(CONFIG_POWERNV_CPUFREQ) += powernv-cpufreq.o
> ##################################################################################
> # Other platform drivers
> obj-$(CONFIG_BMIPS_CPUFREQ) += bmips-cpufreq.o
> -obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o
> -obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o
> obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o
> obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
> obj-$(CONFIG_LOONGSON1_CPUFREQ) += loongson1-cpufreq.o
> diff --git a/drivers/cpufreq/cris-artpec3-cpufreq.c b/drivers/cpufreq/cris-artpec3-cpufreq.c
> deleted file mode 100644
> index 455b4fb78cba..000000000000
> diff --git a/drivers/cpufreq/cris-etraxfs-cpufreq.c b/drivers/cpufreq/cris-etraxfs-cpufreq.c
> deleted file mode 100644
> index 4c4b5dd685e3..000000000000
Acked-by: Viresh Kumar <[email protected]>
--
viresh
On Wed, 14 Mar 2018, Nicolas Pitre wrote:
> On Wed, 14 Mar 2018, Arnd Bergmann wrote:
>
> > The m32r architecture is getting removed, so this part can be
> > cleaned up as well.
> >
> > Signed-off-by: Arnd Bergmann <[email protected]>
>
> Acked-by: Nicolas Pitre <[email protected]>
>
> > ---
> > drivers/net/ethernet/smsc/Kconfig | 4 ++--
> > drivers/net/ethernet/smsc/smc91x.h | 26 --------------------------
> > 2 files changed, 2 insertions(+), 28 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
> > index 4c2f612e4414..1c2b6663f7ce 100644
> > --- a/drivers/net/ethernet/smsc/Kconfig
> > +++ b/drivers/net/ethernet/smsc/Kconfig
> > @@ -37,8 +37,8 @@ config SMC91X
> > select CRC32
> > select MII
> > depends on !OF || GPIOLIB
> > - depends on ARM || ARM64 || ATARI_ETHERNAT || BLACKFIN || COLDFIRE || \
> > - M32R || MIPS || MN10300 || NIOS2 || SUPERH || XTENSA || H8300
> > + depends on ARM || ARM64 || ATARI_ETHERNAT || COLDFIRE || \
> > + MIPS || NIOS2 || SUPERH || XTENSA || H8300
> > ---help---
> > This is a driver for SMC's 91x series of Ethernet chipsets,
> > including the SMC91C94 and the SMC91C111. Say Y if you want it
> > diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
> > index 08b17adf0a65..b337ee97e0c0 100644
> > --- a/drivers/net/ethernet/smsc/smc91x.h
> > +++ b/drivers/net/ethernet/smsc/smc91x.h
> > @@ -144,32 +144,6 @@ static inline void _SMC_outw_align4(u16 val, void __iomem *ioaddr, int reg,
> >
> > #define SMC_IRQ_FLAGS (0)
> >
> > -#elif defined(CONFIG_M32R)
> > -
> > -#define SMC_CAN_USE_8BIT 0
> > -#define SMC_CAN_USE_16BIT 1
> > -#define SMC_CAN_USE_32BIT 0
> > -
> > -#define SMC_inb(a, r) inb(((u32)a) + (r))
> > -#define SMC_inw(a, r) inw(((u32)a) + (r))
> > -#define SMC_outb(v, a, r) outb(v, ((u32)a) + (r))
> > -#define SMC_outw(lp, v, a, r) outw(v, ((u32)a) + (r))
> > -#define SMC_insw(a, r, p, l) insw(((u32)a) + (r), p, l)
> > -#define SMC_outsw(a, r, p, l) outsw(((u32)a) + (r), p, l)
> > -
> > -#define SMC_IRQ_FLAGS (0)
> > -
> > -#define RPC_LSA_DEFAULT RPC_LED_TX_RX
> > -#define RPC_LSB_DEFAULT RPC_LED_100_10
> > -
> > -#elif defined(CONFIG_MN10300)
MN103 is a separate architecture, unrelated to M32R afaict...
--
> > -
> > -/*
> > - * MN10300/AM33 configuration
> > - */
> > -
> > -#include <unit/smc91111.h>
> > -
> > #elif defined(CONFIG_ATARI)
> >
> > #define SMC_CAN_USE_8BIT 1
> > --
> > 2.9.0
> >
> >
>
Hi Arnd,
On Wed, 14 Mar 2018 16:35:13 +0100
Arnd Bergmann <[email protected]> wrote:
> Hi driver maintainers,
>
> I just posted one series with the removal of eight architectures,
> see https://lkml.org/lkml/2018/3/14/505 for details, or
> https://lwn.net/Articles/748074/ for more background.
>
> These are the device drivers that go along with them. I have already
> picked up the drivers for arch/metag/ into my tree, they were reviewed
> earlier.
>
> Please let me know if you have any concerns with the patch, or if you
> prefer to pick up the patches in your respective trees. I created
> the patches with 'git format-patch -D', so they will not apply without
> manually removing those files.
>
> For anything else, I'd keep the removal patches in my asm-generic tree
> and will send a pull request for 4.17 along with the actual arch removal.
>
> Arnd
>
> Arnd Bergmann
> edac: remove tile driver
> net: tile: remove ethernet drivers
> net: adi: remove blackfin ethernet drivers
> net: 8390: remove m32r specific bits
> net: remove cris etrax ethernet driver
> net: smsc: remove m32r specific smc91x configuration
> raid: remove tile specific raid6 implementation
> rtc: remove tile driver
> rtc: remove bfin driver
> char: remove obsolete ds1302 rtc driver
> char: remove tile-srom.c
> char: remove blackfin OTP driver
> pcmcia: remove m32r drivers
> pcmcia: remove blackfin driver
> ASoC: remove blackfin drivers
> video/logo: remove obsolete logo files
> fbdev: remove blackfin drivers
> fbdev: s1d13xxxfb: remove m32r specific hacks
> crypto: remove blackfin CRC driver
> media: platform: remove blackfin capture driver
> media: platform: remove m32r specific arv driver
> cpufreq: remove blackfin driver
> cpufreq: remove cris specific drivers
> gpio: remove etraxfs driver
> pinctrl: remove adi2/blackfin drivers
> ata: remove bf54x driver
> input: keyboard: remove bf54x driver
> input: misc: remove blackfin rotary driver
> mmc: remove bfin_sdh driver
> can: remove bfin_can driver
> watchdog: remove bfin_wdt driver
> mtd: maps: remove bfin-async-flash driver
> mtd: nand: remove bf5xx_nand driver
If you don't mind, I'd like to take the mtd patches through the MTD
tree. As you've probably noticed, nand code has been moved around and
it's easier for me to carry those 2 simple changes in my tree than
creating an immutable branch.
Let me know if this is a problem.
Regards,
Boris
--
Boris Brezillon, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
On Thu, Mar 15, 2018 at 5:58 AM, Finn Thain <[email protected]> wrote:
>
> MN103 is a separate architecture, unrelated to M32R afaict...
That is correct. They are both being removed, but I must have made
a mistake when writing the changelog text here. I've fixed it now
to say
8<---
net: smsc: remove m32r/mn10300 specific smc91x configuration
The m32r and mn10300 architectures are getting removed, so this
part can be cleaned up as well.
Acked-by: Nicolas Pitre <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
--->8
Arnd
Em Wed, 14 Mar 2018 16:48:47 +0100
Borislav Petkov <[email protected]> escreveu:
> On Wed, Mar 14, 2018 at 04:35:14PM +0100, Arnd Bergmann wrote:
> > The Tile architecture is obsolete and getting removed from the kernel,
> > this driver appears to only be used there, and not on the ARM based
> > successors (Tile-Mx, BlueField), so we should remove it as well.
> >
> > Signed-off-by: Arnd Bergmann <[email protected]>
> > ---
> > drivers/edac/Kconfig | 8 --
> > drivers/edac/Makefile | 2 -
> > drivers/edac/tile_edac.c | 265 -----------------------------------------------
> > 3 files changed, 275 deletions(-)
> > delete mode 100644 drivers/edac/tile_edac.c
>
> Provided CONFIG_TILE gets removed, good riddance to that driver too.
>
> Acked-by: Borislav Petkov <[email protected]>
Acked-by: Mauro Carvalho Chehab <[email protected]>
>
Thanks,
Mauro
Em Wed, 14 Mar 2018 16:35:33 +0100
Arnd Bergmann <[email protected]> escreveu:
> The blackfin architecture is getting removed, so the video
> capture driver is also obsolete.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Mauro Carvalho Chehab <[email protected]>
> ---
> drivers/media/platform/Kconfig | 2 -
> drivers/media/platform/Makefile | 2 -
> drivers/media/platform/blackfin/Kconfig | 16 -
> drivers/media/platform/blackfin/Makefile | 2 -
> drivers/media/platform/blackfin/bfin_capture.c | 983 -------------------------
> drivers/media/platform/blackfin/ppi.c | 361 ---------
> include/media/blackfin/bfin_capture.h | 39 -
> include/media/blackfin/ppi.h | 94 ---
> 8 files changed, 1499 deletions(-)
> delete mode 100644 drivers/media/platform/blackfin/Kconfig
> delete mode 100644 drivers/media/platform/blackfin/Makefile
> delete mode 100644 drivers/media/platform/blackfin/bfin_capture.c
> delete mode 100644 drivers/media/platform/blackfin/ppi.c
> delete mode 100644 include/media/blackfin/bfin_capture.h
> delete mode 100644 include/media/blackfin/ppi.h
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index 5d8fd71fc454..2136702c95fc 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -31,8 +31,6 @@ source "drivers/media/platform/davinci/Kconfig"
>
> source "drivers/media/platform/omap/Kconfig"
>
> -source "drivers/media/platform/blackfin/Kconfig"
> -
> config VIDEO_SH_VOU
> tristate "SuperH VOU video output driver"
> depends on MEDIA_CAMERA_SUPPORT
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index 85e112122f32..2b07f2e2fca6 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -53,8 +53,6 @@ obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra-cec/
>
> obj-y += stm32/
>
> -obj-y += blackfin/
> -
> obj-y += davinci/
>
> obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o
> diff --git a/drivers/media/platform/blackfin/Kconfig b/drivers/media/platform/blackfin/Kconfig
> deleted file mode 100644
> index 68fa90151b8f..000000000000
> diff --git a/drivers/media/platform/blackfin/Makefile b/drivers/media/platform/blackfin/Makefile
> deleted file mode 100644
> index 30421bc23080..000000000000
> diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
> deleted file mode 100644
> index b7660b1000fd..000000000000
> diff --git a/drivers/media/platform/blackfin/ppi.c b/drivers/media/platform/blackfin/ppi.c
> deleted file mode 100644
> index d3dc765c1609..000000000000
> diff --git a/include/media/blackfin/bfin_capture.h b/include/media/blackfin/bfin_capture.h
> deleted file mode 100644
> index a999a3970c69..000000000000
> diff --git a/include/media/blackfin/ppi.h b/include/media/blackfin/ppi.h
> deleted file mode 100644
> index 987e49e8f9c9..000000000000
Thanks,
Mauro
Em Wed, 14 Mar 2018 16:35:34 +0100
Arnd Bergmann <[email protected]> escreveu:
> The m32r architecture is getting removed, so this one is no longer needed.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Mauro Carvalho Chehab <[email protected]>
> ---
> drivers/media/platform/Kconfig | 20 -
> drivers/media/platform/Makefile | 2 -
> drivers/media/platform/arv.c | 884 ----------------------------------------
> 3 files changed, 906 deletions(-)
> delete mode 100644 drivers/media/platform/arv.c
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index 2136702c95fc..c7a1cf8a1b01 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -52,26 +52,6 @@ config VIDEO_VIU
> Say Y here if you want to enable VIU device on MPC5121e Rev2+.
> In doubt, say N.
>
> -config VIDEO_M32R_AR
> - tristate "AR devices"
> - depends on VIDEO_V4L2
> - depends on M32R || COMPILE_TEST
> - ---help---
> - This is a video4linux driver for the Renesas AR (Artificial Retina)
> - camera module.
> -
> -config VIDEO_M32R_AR_M64278
> - tristate "AR device with color module M64278(VGA)"
> - depends on PLAT_M32700UT
> - select VIDEO_M32R_AR
> - ---help---
> - This is a video4linux driver for the Renesas AR (Artificial
> - Retina) with M64278E-800 camera module.
> - This module supports VGA(640x480 pixels) resolutions.
> -
> - To compile this driver as a module, choose M here: the
> - module will be called arv.
> -
> config VIDEO_MUX
> tristate "Video Multiplexer"
> select MULTIPLEXER
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index 2b07f2e2fca6..932515df4477 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -3,8 +3,6 @@
> # Makefile for the video capture/playback device drivers.
> #
>
> -obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
> -
> obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
> obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
> obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/
> diff --git a/drivers/media/platform/arv.c b/drivers/media/platform/arv.c
> deleted file mode 100644
> index 1e865fea803c..000000000000
Thanks,
Mauro
On Wed, Mar 14, 2018 at 04:35:18PM +0100, Arnd Bergmann wrote:
> The cris architecture is getting removed, so we don't need the
> ethernet driver any more either.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Jesper Nilsson <[email protected]>
> ---
> drivers/net/Makefile | 1 -
> drivers/net/cris/Makefile | 1 -
> drivers/net/cris/eth_v10.c | 1742 --------------------------------------------
> 3 files changed, 1744 deletions(-)
> delete mode 100644 drivers/net/cris/Makefile
> delete mode 100644 drivers/net/cris/eth_v10.c
>
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 04c3b747812c..91e67e375dd4 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -40,7 +40,6 @@ obj-$(CONFIG_ARCNET) += arcnet/
> obj-$(CONFIG_DEV_APPLETALK) += appletalk/
> obj-$(CONFIG_CAIF) += caif/
> obj-$(CONFIG_CAN) += can/
> -obj-$(CONFIG_ETRAX_ETHERNET) += cris/
> obj-$(CONFIG_NET_DSA) += dsa/
> obj-$(CONFIG_ETHERNET) += ethernet/
> obj-$(CONFIG_FDDI) += fddi/
> diff --git a/drivers/net/cris/Makefile b/drivers/net/cris/Makefile
> deleted file mode 100644
> index b4e8932227b6..000000000000
> diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
> deleted file mode 100644
> index 8b1a859f5140..000000000000
> --
> 2.9.0
/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]
On Wed, Mar 14, 2018 at 04:35:53PM +0100, Arnd Bergmann wrote:
> The cris architecture is getting removed, so we don't need the
> uart driver any more.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Jesper Nilsson <[email protected]>
> ---
> .../bindings/serial/axis,etraxfs-uart.txt | 22 -
> drivers/tty/serial/Kconfig | 11 -
> drivers/tty/serial/Makefile | 2 -
> drivers/tty/serial/crisv10.c | 4248 --------------------
> drivers/tty/serial/crisv10.h | 133 -
> drivers/tty/serial/etraxfs-uart.c | 960 -----
> 6 files changed, 5376 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt
> delete mode 100644 drivers/tty/serial/crisv10.c
> delete mode 100644 drivers/tty/serial/crisv10.h
> delete mode 100644 drivers/tty/serial/etraxfs-uart.c
>
> diff --git a/Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt b/Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt
> deleted file mode 100644
> index 048c3818c826..000000000000
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 3682fd3e960c..f6e09326042d 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -1114,17 +1114,6 @@ config SERIAL_VT8500_CONSOLE
> depends on SERIAL_VT8500=y
> select SERIAL_CORE_CONSOLE
>
> -config SERIAL_ETRAXFS
> - bool "ETRAX FS serial port support"
> - depends on ETRAX_ARCH_V32 && OF
> - select SERIAL_CORE
> - select SERIAL_MCTRL_GPIO if GPIOLIB
> -
> -config SERIAL_ETRAXFS_CONSOLE
> - bool "ETRAX FS serial console support"
> - depends on SERIAL_ETRAXFS
> - select SERIAL_CORE_CONSOLE
> -
> config SERIAL_NETX
> tristate "NetX serial port support"
> depends on ARCH_NETX
> diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
> index 842d185d697e..c21835dc16b2 100644
> --- a/drivers/tty/serial/Makefile
> +++ b/drivers/tty/serial/Makefile
> @@ -51,8 +51,6 @@ obj-$(CONFIG_SERIAL_M32R_SIO) += m32r_sio.o
> obj-$(CONFIG_SERIAL_MPSC) += mpsc.o
> obj-$(CONFIG_SERIAL_MESON) += meson_uart.o
> obj-$(CONFIG_SERIAL_SB1250_DUART) += sb1250-duart.o
> -obj-$(CONFIG_ETRAX_SERIAL) += crisv10.o
> -obj-$(CONFIG_SERIAL_ETRAXFS) += etraxfs-uart.o
> obj-$(CONFIG_SERIAL_SCCNXP) += sccnxp.o
> obj-$(CONFIG_SERIAL_SC16IS7XX_CORE) += sc16is7xx.o
> obj-$(CONFIG_SERIAL_JSM) += jsm/
> diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
> deleted file mode 100644
> index c9458a033e3c..000000000000
> diff --git a/drivers/tty/serial/crisv10.h b/drivers/tty/serial/crisv10.h
> deleted file mode 100644
> index 79ba2bc95d3d..000000000000
> diff --git a/drivers/tty/serial/etraxfs-uart.c b/drivers/tty/serial/etraxfs-uart.c
> deleted file mode 100644
> index 24bf6bfb29b4..000000000000
> --
> 2.9.0
/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]
On Wed, Mar 14, 2018 at 04:35:36PM +0100, Arnd Bergmann wrote:
> The cris architecture is getting removed, including the artpec3
> and etraxfs SoCs, so these cpufreq drivers are now unused.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Jesper Nilsson <[email protected]>
> ---
> drivers/cpufreq/Makefile | 2 -
> drivers/cpufreq/cris-artpec3-cpufreq.c | 93 ----------------------------------
> drivers/cpufreq/cris-etraxfs-cpufreq.c | 92 ---------------------------------
> 3 files changed, 187 deletions(-)
> delete mode 100644 drivers/cpufreq/cris-artpec3-cpufreq.c
> delete mode 100644 drivers/cpufreq/cris-etraxfs-cpufreq.c
>
> diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
> index 2e4495cf9aa8..8d24ade3bd02 100644
> --- a/drivers/cpufreq/Makefile
> +++ b/drivers/cpufreq/Makefile
> @@ -102,8 +102,6 @@ obj-$(CONFIG_POWERNV_CPUFREQ) += powernv-cpufreq.o
> ##################################################################################
> # Other platform drivers
> obj-$(CONFIG_BMIPS_CPUFREQ) += bmips-cpufreq.o
> -obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o
> -obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o
> obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o
> obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
> obj-$(CONFIG_LOONGSON1_CPUFREQ) += loongson1-cpufreq.o
> diff --git a/drivers/cpufreq/cris-artpec3-cpufreq.c b/drivers/cpufreq/cris-artpec3-cpufreq.c
> deleted file mode 100644
> index 455b4fb78cba..000000000000
> diff --git a/drivers/cpufreq/cris-etraxfs-cpufreq.c b/drivers/cpufreq/cris-etraxfs-cpufreq.c
> deleted file mode 100644
> index 4c4b5dd685e3..000000000000
> --
> 2.9.0
/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]
On Wednesday, March 14, 2018 04:35:29 PM Arnd Bergmann wrote:
> The blackfin and m32r architectures are getting removed, so it's
> time to clean up the logos as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Bartlomiej Zolnierkiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
On Wednesday, March 14, 2018 04:35:30 PM Arnd Bergmann wrote:
> The blackfin architecture is getting removed, this removes the
> associated fbdev drivers as well.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Bartlomiej Zolnierkiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
On Wednesday, March 14, 2018 04:35:31 PM Arnd Bergmann wrote:
> The m32r architecture is being removed, so this is no longer needed.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Bartlomiej Zolnierkiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
On Wed, Mar 14, 2018 at 6:12 PM, Bin Liu <[email protected]> wrote:
> On Wed, Mar 14, 2018 at 04:35:51PM +0100, Arnd Bergmann wrote:
>> diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
>> index 5506a9c03c1f..490990e8b015 100644
>> --- a/drivers/usb/musb/Kconfig
>> +++ b/drivers/usb/musb/Kconfig
>> @@ -18,9 +18,6 @@ config USB_MUSB_HDRC
>
> This config entry has "ADI" in its tristate message:
>
> config USB_MUSB_HDRC
> tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, AW, ...)'
>
> so we might want to remove it along with the whole parentheses?
>
> - tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, AW, ...)'
> + tristate 'Inventra Highspeed Dual Role Controller'
Done.
> Other than this,
>
> Acked-by: Bin Liu <[email protected]>
Thanks!
Arnd
On Wed, Mar 14, 2018 at 04:35:48PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so the
> twi driver can also be removed.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Wolfram Sang <[email protected]>
On Wed, Mar 14, 2018 at 04:35:32PM +0100, Arnd Bergmann wrote:
> The blackfin architecture is getting removed, so this
> driver won't be used any more.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Wed, Mar 14, 2018 at 4:35 PM, Arnd Bergmann <[email protected]> wrote:
> The cris architecture is getting removed, so we no longer need the
> etraxfs driver.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Reviewed-by: Linus Walleij <[email protected]>
Yours,
Linus Walleij
On Wed, Mar 14, 2018 at 4:35 PM, Arnd Bergmann <[email protected]> wrote:
> The blackfin architecture is getting removed, so these are
> now obsolete.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Reviewed-by: Linus Walleij <[email protected]>
Yours,
Linus Walleij