84 lines
2.1 KiB
Diff
84 lines
2.1 KiB
Diff
--- a/arch/mips/ath79/mach-ap81.c
|
|
+++ b/arch/mips/ath79/mach-ap81.c
|
|
@@ -9,12 +9,16 @@
|
|
* by the Free Software Foundation.
|
|
*/
|
|
|
|
-#include "machtypes.h"
|
|
-#include "dev-wmac.h"
|
|
+#include <linux/mtd/mtd.h>
|
|
+#include <linux/mtd/partitions.h>
|
|
+
|
|
+#include "dev-eth.h"
|
|
#include "dev-gpio-buttons.h"
|
|
#include "dev-leds-gpio.h"
|
|
-#include "dev-spi.h"
|
|
+#include "dev-m25p80.h"
|
|
#include "dev-usb.h"
|
|
+#include "dev-wmac.h"
|
|
+#include "machtypes.h"
|
|
|
|
#define AP81_GPIO_LED_STATUS 1
|
|
#define AP81_GPIO_LED_AOSS 3
|
|
@@ -67,20 +102,6 @@ static struct gpio_keys_button ap81_gpio
|
|
}
|
|
};
|
|
|
|
-static struct spi_board_info ap81_spi_info[] = {
|
|
- {
|
|
- .bus_num = 0,
|
|
- .chip_select = 0,
|
|
- .max_speed_hz = 25000000,
|
|
- .modalias = "m25p64",
|
|
- }
|
|
-};
|
|
-
|
|
-static struct ath79_spi_platform_data ap81_spi_data = {
|
|
- .bus_num = 0,
|
|
- .num_chipselect = 1,
|
|
-};
|
|
-
|
|
static void __init ap81_setup(void)
|
|
{
|
|
u8 *cal_data = (u8 *) KSEG1ADDR(AP81_CAL_DATA_ADDR);
|
|
@@ -90,10 +105,24 @@ static void __init ap81_setup(void)
|
|
ath79_register_gpio_keys_polled(-1, AP81_KEYS_POLL_INTERVAL,
|
|
ARRAY_SIZE(ap81_gpio_keys),
|
|
ap81_gpio_keys);
|
|
- ath79_register_spi(&ap81_spi_data, ap81_spi_info,
|
|
- ARRAY_SIZE(ap81_spi_info));
|
|
+ ath79_register_m25p80(NULL);
|
|
ath79_register_wmac(cal_data, NULL);
|
|
ath79_register_usb();
|
|
+
|
|
+ ath79_register_mdio(0, 0x0);
|
|
+
|
|
+ ath79_init_mac(ath79_eth0_data.mac_addr, cal_data, 0);
|
|
+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
|
|
+ ath79_eth0_data.speed = SPEED_100;
|
|
+ ath79_eth0_data.duplex = DUPLEX_FULL;
|
|
+ ath79_eth0_data.has_ar8216 = 1;
|
|
+
|
|
+ ath79_init_mac(ath79_eth1_data.mac_addr, cal_data, 1);
|
|
+ ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
|
|
+ ath79_eth1_data.phy_mask = 0x10;
|
|
+
|
|
+ ath79_register_eth(0);
|
|
+ ath79_register_eth(1);
|
|
}
|
|
|
|
MIPS_MACHINE(ATH79_MACH_AP81, "AP81", "Atheros AP81 reference board",
|
|
--- a/arch/mips/ath79/Kconfig
|
|
+++ b/arch/mips/ath79/Kconfig
|
|
@@ -30,9 +30,10 @@ config ATH79_MACH_AP136
|
|
config ATH79_MACH_AP81
|
|
bool "Atheros AP81 reference board"
|
|
select SOC_AR913X
|
|
+ select ATH79_DEV_ETH
|
|
select ATH79_DEV_GPIO_BUTTONS
|
|
select ATH79_DEV_LEDS_GPIO
|
|
- select ATH79_DEV_SPI
|
|
+ select ATH79_DEV_M25P80
|
|
select ATH79_DEV_USB
|
|
select ATH79_DEV_WMAC
|
|
help
|