Commit 656d88c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Thomas Bogendoerfer:

 - removed AR7 platform support

 - cleanups and fixes

* tag 'mips_6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: AR7: remove platform
  watchdog: ar7_wdt: remove driver to prepare for platform removal
  vlynq: remove bus driver
  mtd: parsers: ar7: remove support
  serial: 8250: remove AR7 support
  arch: mips: remove ReiserFS from defconfig
  MIPS: lantiq: Remove unnecessary include of <linux/of_irq.h>
  MIPS: lantiq: Fix pcibios_plat_dev_init() "no previous prototype" warning
  MIPS: KVM: Fix a build warning about variable set but not used
  MIPS: Remove dead code in relocate_new_kernel
  mips: dts: ralink: mt7621: rename to GnuBee GB-PC1 and GnuBee GB-PC2
  mips: dts: ralink: mt7621: define each reset as an item
  mips: dts: ingenic: Remove unneeded probe-type properties
  MIPS: loongson32: Remove dma.h and nand.h
parents 89cdf9d5 4b7d3ab4

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -23198,13 +23198,6 @@ W: https://linuxtv.org 
T:	git git://linuxtv.org/media_tree.git

F:	drivers/media/test-drivers/vivid/*









VLYNQ BUS









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	openwrt-devel@lists.openwrt.org (subscribers-only)









S:	Maintained









F:	drivers/vlynq/vlynq.c









F:	include/linux/vlynq.h

















VM SOCKETS (AF_VSOCK)









M:	Stefano Garzarella <sgarzare@redhat.com>









L:	virtualization@lists.linux.dev

























arch/arm/configs/pxa_defconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -100,7 +100,6 @@ CONFIG_DEVTMPFS=y







CONFIG_DEVTMPFS_MOUNT=y









CONFIG_CONNECTOR=y









CONFIG_MTD=y









CONFIG_MTD_AR7_PARTS=m









CONFIG_MTD_CMDLINE_PARTS=m









CONFIG_MTD_OF_PARTS=m









CONFIG_MTD_AFS_PARTS=m
































arch/mips/Kbuild.platforms



+0
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,6 @@







# All platforms listed in alphabetic order



















platform-$(CONFIG_MIPS_ALCHEMY)		+= alchemy/









platform-$(CONFIG_AR7)			+= ar7/









platform-$(CONFIG_ATH25)		+= ath25/









platform-$(CONFIG_ATH79)		+= ath79/









platform-$(CONFIG_BCM47XX)		+= bcm47xx/
































arch/mips/Kconfig



+0
−22






























Original line number
Diff line number
Diff line







@@ -202,28 +202,6 @@ config MIPS_ALCHEMY







	select SYS_SUPPORTS_ZBOOT









	select COMMON_CLK



















config AR7









	bool "Texas Instruments AR7"









	select BOOT_ELF32









	select COMMON_CLK









	select DMA_NONCOHERENT









	select CEVT_R4K









	select CSRC_R4K









	select IRQ_MIPS_CPU









	select NO_EXCEPT_FILL









	select SWAP_IO_SPACE









	select SYS_HAS_CPU_MIPS32_R1









	select SYS_HAS_EARLY_PRINTK









	select SYS_SUPPORTS_32BIT_KERNEL









	select SYS_SUPPORTS_LITTLE_ENDIAN









	select SYS_SUPPORTS_MIPS16









	select SYS_SUPPORTS_ZBOOT_UART16550









	select GPIOLIB









	select VLYNQ









	help









	  Support for the Texas Instruments AR7 System-on-a-Chip









	  family: TNETD7100, 7200 and 7300.



















config ATH25









	bool "Atheros AR231x/AR531x SoC support"









	select CEVT_R4K
































arch/mips/ar7/Makefile
deleted100644 → 0



+0
−11






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0



















obj-y := \









	prom.o \









	setup.o \









	memory.o \









	irq.o \









	time.o \









	platform.o \









	gpio.o \









	clock.o