Unverified Commit 3a77e0d7 authored by John Crispin's avatar John Crispin Committed by Paul Burton
Browse files

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: default avatarJohn Crispin <john@phrozen.org>
Signed-off-by: default avatarPaul 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>
parent 51fa4f89

arch/mips/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ config ATH79 
	select COMMON_CLK

	select CLKDEV_LOOKUP

	select IRQ_MIPS_CPU

	select MIPS_MACHINE

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

arch/mips/ath79/Kconfig

+0 −73
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

if ATH79



menu "Atheros AR71XX/AR724X/AR913X machine selection"



config ATH79_MACH_AP121

	bool "Atheros AP121 reference board"

	select SOC_AR933X

	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	select ATH79_DEV_USB

	select ATH79_DEV_WMAC

	help

	  Say 'Y' here if you want your kernel to support the

	  Atheros AP121 reference board.



config ATH79_MACH_AP136

	bool "Atheros AP136 reference board"

	select SOC_QCA955X

	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	select ATH79_DEV_USB

	select ATH79_DEV_WMAC

	help

	  Say 'Y' here if you want your kernel to support the

	  Atheros AP136 reference board.



config ATH79_MACH_AP81

	bool "Atheros AP81 reference board"

	select SOC_AR913X

	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	select ATH79_DEV_USB

	select ATH79_DEV_WMAC

	help

	  Say 'Y' here if you want your kernel to support the

	  Atheros AP81 reference board.



config ATH79_MACH_DB120

	bool "Atheros DB120 reference board"

	select SOC_AR934X

	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	select ATH79_DEV_USB

	select ATH79_DEV_WMAC

	help

	  Say 'Y' here if you want your kernel to support the

	  Atheros DB120 reference board.



config ATH79_MACH_PB44

	bool "Atheros PB44 reference board"

	select SOC_AR71XX

	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	select ATH79_DEV_USB

	help

	  Say 'Y' here if you want your kernel to support the

	  Atheros PB44 reference board.



config ATH79_MACH_UBNT_XM

	bool "Ubiquiti Networks XM (rev 1.0) board"

	select SOC_AR724X

	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	help

	  Say 'Y' here if you want your kernel to support the

	  Ubiquiti Networks XM (rev 1.0) board.



endmenu



config SOC_AR71XX

	select HAVE_PCI

	def_bool n

arch/mips/ath79/Makefile

+0 −10
Original line number Diff line number Diff line
@@ -22,13 +22,3 @@ obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o 
obj-$(CONFIG_ATH79_DEV_SPI)		+= dev-spi.o

obj-$(CONFIG_ATH79_DEV_USB)		+= dev-usb.o

obj-$(CONFIG_ATH79_DEV_WMAC)		+= dev-wmac.o
 


#

# Machines

#

obj-$(CONFIG_ATH79_MACH_AP121)		+= mach-ap121.o

obj-$(CONFIG_ATH79_MACH_AP136)		+= mach-ap136.o

obj-$(CONFIG_ATH79_MACH_AP81)		+= mach-ap81.o

obj-$(CONFIG_ATH79_MACH_DB120)		+= mach-db120.o

obj-$(CONFIG_ATH79_MACH_PB44)		+= mach-pb44.o

obj-$(CONFIG_ATH79_MACH_UBNT_XM)	+= mach-ubnt-xm.o

arch/mips/ath79/clock.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <asm/mach-ath79/ath79.h>

#include <asm/mach-ath79/ar71xx_regs.h>

#include "common.h"

#include "machtypes.h"



#define AR71XX_BASE_FREQ	40000000

#define AR724X_BASE_FREQ	40000000

arch/mips/ath79/mach-ap121.c

deleted100644 → 0
+0 −92
Original line number Diff line number Diff line 
/*

 *  Atheros AP121 board support

 *

 *  Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>

 *

 *  This program is free software; you can redistribute it and/or modify it

 *  under the terms of the GNU General Public License version 2 as published

 *  by the Free Software Foundation.

 */



#include "machtypes.h"

#include "dev-gpio-buttons.h"

#include "dev-leds-gpio.h"

#include "dev-spi.h"

#include "dev-usb.h"

#include "dev-wmac.h"



#define AP121_GPIO_LED_WLAN		0

#define AP121_GPIO_LED_USB		1



#define AP121_GPIO_BTN_JUMPSTART	11

#define AP121_GPIO_BTN_RESET		12



#define AP121_KEYS_POLL_INTERVAL	20	/* msecs */

#define AP121_KEYS_DEBOUNCE_INTERVAL	(3 * AP121_KEYS_POLL_INTERVAL)



#define AP121_CAL_DATA_ADDR	0x1fff1000



static struct gpio_led ap121_leds_gpio[] __initdata = {

	{

		.name		= "ap121:green:usb",

		.gpio		= AP121_GPIO_LED_USB,

		.active_low	= 0,

	},

	{

		.name		= "ap121:green:wlan",

		.gpio		= AP121_GPIO_LED_WLAN,

		.active_low	= 0,

	},

};



static struct gpio_keys_button ap121_gpio_keys[] __initdata = {

	{

		.desc		= "jumpstart button",

		.type		= EV_KEY,

		.code		= KEY_WPS_BUTTON,

		.debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,

		.gpio		= AP121_GPIO_BTN_JUMPSTART,

		.active_low	= 1,

	},

	{

		.desc		= "reset button",

		.type		= EV_KEY,

		.code		= KEY_RESTART,

		.debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,

		.gpio		= AP121_GPIO_BTN_RESET,

		.active_low	= 1,

	}

};



static struct spi_board_info ap121_spi_info[] = {

	{

		.bus_num	= 0,

		.chip_select	= 0,

		.max_speed_hz	= 25000000,

		.modalias	= "mx25l1606e",

	}

};



static struct ath79_spi_platform_data ap121_spi_data = {

	.bus_num	= 0,

	.num_chipselect = 1,

};



static void __init ap121_setup(void)

{

	u8 *cal_data = (u8 *) KSEG1ADDR(AP121_CAL_DATA_ADDR);



	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap121_leds_gpio),

				 ap121_leds_gpio);

	ath79_register_gpio_keys_polled(-1, AP121_KEYS_POLL_INTERVAL,

					ARRAY_SIZE(ap121_gpio_keys),

					ap121_gpio_keys);



	ath79_register_spi(&ap121_spi_data, ap121_spi_info,

			   ARRAY_SIZE(ap121_spi_info));

	ath79_register_usb();

	ath79_register_wmac(cal_data);

}



MIPS_MACHINE(ATH79_MACH_AP121, "AP121", "Atheros AP121 reference board",

	     ap121_setup);

CRA Git | Maintained and supported by SUSTech CRA and CCSE