Skip to content

Commit 3a77e0d

Browse files
blogicpaulburton
blogic
authored and
paulburton
committed
MIPS: ath79: drop machfiles
With the target now being fully OF based, we can drop the legacy mach files. Boards can now boot fully of devicetree files. Signed-off-by: John Crispin <john@phrozen.org> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: Felix Fietkau <nbd@nbd.name>
1 parent 51fa4f8 commit 3a77e0d

File tree

12 files changed

+9
-919
lines changed

12 files changed

+9
-919
lines changed

‎arch/mips/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ config ATH79
206206
select COMMON_CLK
207207
select CLKDEV_LOOKUP
208208
select IRQ_MIPS_CPU
209-
select MIPS_MACHINE
210209
select SYS_HAS_CPU_MIPS32_R2
211210
select SYS_HAS_EARLY_PRINTK
212211
select SYS_SUPPORTS_32BIT_KERNEL

‎arch/mips/ath79/Kconfig

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
if ATH79
33

4-
menu "Atheros AR71XX/AR724X/AR913X machine selection"
5-
6-
config ATH79_MACH_AP121
7-
bool "Atheros AP121 reference board"
8-
select SOC_AR933X
9-
select ATH79_DEV_GPIO_BUTTONS
10-
select ATH79_DEV_LEDS_GPIO
11-
select ATH79_DEV_SPI
12-
select ATH79_DEV_USB
13-
select ATH79_DEV_WMAC
14-
help
15-
Say 'Y' here if you want your kernel to support the
16-
Atheros AP121 reference board.
17-
18-
config ATH79_MACH_AP136
19-
bool "Atheros AP136 reference board"
20-
select SOC_QCA955X
21-
select ATH79_DEV_GPIO_BUTTONS
22-
select ATH79_DEV_LEDS_GPIO
23-
select ATH79_DEV_SPI
24-
select ATH79_DEV_USB
25-
select ATH79_DEV_WMAC
26-
help
27-
Say 'Y' here if you want your kernel to support the
28-
Atheros AP136 reference board.
29-
30-
config ATH79_MACH_AP81
31-
bool "Atheros AP81 reference board"
32-
select SOC_AR913X
33-
select ATH79_DEV_GPIO_BUTTONS
34-
select ATH79_DEV_LEDS_GPIO
35-
select ATH79_DEV_SPI
36-
select ATH79_DEV_USB
37-
select ATH79_DEV_WMAC
38-
help
39-
Say 'Y' here if you want your kernel to support the
40-
Atheros AP81 reference board.
41-
42-
config ATH79_MACH_DB120
43-
bool "Atheros DB120 reference board"
44-
select SOC_AR934X
45-
select ATH79_DEV_GPIO_BUTTONS
46-
select ATH79_DEV_LEDS_GPIO
47-
select ATH79_DEV_SPI
48-
select ATH79_DEV_USB
49-
select ATH79_DEV_WMAC
50-
help
51-
Say 'Y' here if you want your kernel to support the
52-
Atheros DB120 reference board.
53-
54-
config ATH79_MACH_PB44
55-
bool "Atheros PB44 reference board"
56-
select SOC_AR71XX
57-
select ATH79_DEV_GPIO_BUTTONS
58-
select ATH79_DEV_LEDS_GPIO
59-
select ATH79_DEV_SPI
60-
select ATH79_DEV_USB
61-
help
62-
Say 'Y' here if you want your kernel to support the
63-
Atheros PB44 reference board.
64-
65-
config ATH79_MACH_UBNT_XM
66-
bool "Ubiquiti Networks XM (rev 1.0) board"
67-
select SOC_AR724X
68-
select ATH79_DEV_GPIO_BUTTONS
69-
select ATH79_DEV_LEDS_GPIO
70-
select ATH79_DEV_SPI
71-
help
72-
Say 'Y' here if you want your kernel to support the
73-
Ubiquiti Networks XM (rev 1.0) board.
74-
75-
endmenu
76-
774
config SOC_AR71XX
785
select HAVE_PCI
796
def_bool n

‎arch/mips/ath79/Makefile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,3 @@ obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o
2222
obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o
2323
obj-$(CONFIG_ATH79_DEV_USB) += dev-usb.o
2424
obj-$(CONFIG_ATH79_DEV_WMAC) += dev-wmac.o
25-
26-
#
27-
# Machines
28-
#
29-
obj-$(CONFIG_ATH79_MACH_AP121) += mach-ap121.o
30-
obj-$(CONFIG_ATH79_MACH_AP136) += mach-ap136.o
31-
obj-$(CONFIG_ATH79_MACH_AP81) += mach-ap81.o
32-
obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o
33-
obj-$(CONFIG_ATH79_MACH_PB44) += mach-pb44.o
34-
obj-$(CONFIG_ATH79_MACH_UBNT_XM) += mach-ubnt-xm.o

‎arch/mips/ath79/clock.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <asm/mach-ath79/ath79.h>
2727
#include <asm/mach-ath79/ar71xx_regs.h>
2828
#include "common.h"
29-
#include "machtypes.h"
3029

3130
#define AR71XX_BASE_FREQ 40000000
3231
#define AR724X_BASE_FREQ 40000000

‎arch/mips/ath79/mach-ap121.c

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

‎arch/mips/ath79/mach-ap136.c

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

0 commit comments

Comments
 (0)