Skip to content

Commit 656d88c

Browse files
committed
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
2 parents 89cdf9d + 4b7d3ab commit 656d88c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+5
-4033
lines changed

MAINTAINERS

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23198,13 +23198,6 @@ W: https://linuxtv.org
2319823198
T: git git://linuxtv.org/media_tree.git
2319923199
F: drivers/media/test-drivers/vivid/*
2320023200

23201-
VLYNQ BUS
23202-
M: Florian Fainelli <[email protected]>
23203-
L: [email protected] (subscribers-only)
23204-
S: Maintained
23205-
F: drivers/vlynq/vlynq.c
23206-
F: include/linux/vlynq.h
23207-
2320823201
VM SOCKETS (AF_VSOCK)
2320923202
M: Stefano Garzarella <[email protected]>
2321023203

arch/arm/configs/pxa_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ CONFIG_DEVTMPFS=y
100100
CONFIG_DEVTMPFS_MOUNT=y
101101
CONFIG_CONNECTOR=y
102102
CONFIG_MTD=y
103-
CONFIG_MTD_AR7_PARTS=m
104103
CONFIG_MTD_CMDLINE_PARTS=m
105104
CONFIG_MTD_OF_PARTS=m
106105
CONFIG_MTD_AFS_PARTS=m

arch/mips/Kbuild.platforms

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# All platforms listed in alphabetic order
33

44
platform-$(CONFIG_MIPS_ALCHEMY) += alchemy/
5-
platform-$(CONFIG_AR7) += ar7/
65
platform-$(CONFIG_ATH25) += ath25/
76
platform-$(CONFIG_ATH79) += ath79/
87
platform-$(CONFIG_BCM47XX) += bcm47xx/

arch/mips/Kconfig

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -202,28 +202,6 @@ config MIPS_ALCHEMY
202202
select SYS_SUPPORTS_ZBOOT
203203
select COMMON_CLK
204204

205-
config AR7
206-
bool "Texas Instruments AR7"
207-
select BOOT_ELF32
208-
select COMMON_CLK
209-
select DMA_NONCOHERENT
210-
select CEVT_R4K
211-
select CSRC_R4K
212-
select IRQ_MIPS_CPU
213-
select NO_EXCEPT_FILL
214-
select SWAP_IO_SPACE
215-
select SYS_HAS_CPU_MIPS32_R1
216-
select SYS_HAS_EARLY_PRINTK
217-
select SYS_SUPPORTS_32BIT_KERNEL
218-
select SYS_SUPPORTS_LITTLE_ENDIAN
219-
select SYS_SUPPORTS_MIPS16
220-
select SYS_SUPPORTS_ZBOOT_UART16550
221-
select GPIOLIB
222-
select VLYNQ
223-
help
224-
Support for the Texas Instruments AR7 System-on-a-Chip
225-
family: TNETD7100, 7200 and 7300.
226-
227205
config ATH25
228206
bool "Atheros AR231x/AR531x SoC support"
229207
select CEVT_R4K

arch/mips/ar7/Makefile

Lines changed: 0 additions & 11 deletions
This file was deleted.

arch/mips/ar7/Platform

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)