projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: wrap long lines
[openwrt.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
ar71xx
/
mach-ap81.c
diff --git
a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
index
0b234cd
..
2bf1e22
100644
(file)
--- a/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
+++ b/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
@@
-9,18
+9,18
@@
* by the Free Software Foundation.
*/
* by the Free Software Foundation.
*/
-#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-#include <linux/input.h>
-#include <asm/mips_machine.h>
#include <asm/mach-ar71xx/ar71xx.h>
#include <asm/mach-ar71xx/ar71xx.h>
+#include "machtype.h"
#include "devices.h"
#include "dev-m25p80.h"
#include "dev-ar913x-wmac.h"
#include "devices.h"
#include "dev-m25p80.h"
#include "dev-ar913x-wmac.h"
+#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-leds-gpio.h"
+#include "dev-usb.h"
#define AP81_GPIO_LED_STATUS 1
#define AP81_GPIO_LED_AOSS 3
#define AP81_GPIO_LED_STATUS 1
#define AP81_GPIO_LED_AOSS 3
@@
-39,19
+39,19
@@
static struct mtd_partition ap81_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
- }
, {
+ }, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x010000,
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x010000,
- }
, {
+ }, {
.name = "rootfs",
.offset = 0x050000,
.size = 0x500000,
.name = "rootfs",
.offset = 0x050000,
.size = 0x500000,
- }
, {
+ }, {
.name = "uImage",
.offset = 0x550000,
.size = 0x100000,
.name = "uImage",
.offset = 0x550000,
.size = 0x100000,
- }
, {
+ }, {
.name = "ART",
.offset = 0x650000,
.size = 0x1b0000,
.name = "ART",
.offset = 0x650000,
.size = 0x1b0000,
@@
-62,8
+62,8
@@
static struct mtd_partition ap81_partitions[] = {
static struct flash_platform_data ap81_flash_data = {
#ifdef CONFIG_MTD_PARTITIONS
static struct flash_platform_data ap81_flash_data = {
#ifdef CONFIG_MTD_PARTITIONS
-
.parts = ap81_partitions,
-
.nr_parts = ARRAY_SIZE(ap81_partitions),
+ .parts = ap81_partitions,
+ .nr_parts = ARRAY_SIZE(ap81_partitions),
#endif
};
#endif
};
@@
-92,14
+92,14
@@
static struct gpio_button ap81_gpio_buttons[] __initdata = {
.desc = "sw1",
.type = EV_KEY,
.code = BTN_0,
.desc = "sw1",
.type = EV_KEY,
.code = BTN_0,
- .threshold =
5
,
+ .threshold =
3
,
.gpio = AP81_GPIO_BTN_SW1,
.active_low = 1,
.gpio = AP81_GPIO_BTN_SW1,
.active_low = 1,
- }
, {
+ }, {
.desc = "sw4",
.type = EV_KEY,
.code = BTN_1,
.desc = "sw4",
.type = EV_KEY,
.code = BTN_1,
- .threshold =
5
,
+ .threshold =
3
,
.gpio = AP81_GPIO_BTN_SW4,
.active_low = 1,
}
.gpio = AP81_GPIO_BTN_SW4,
.active_low = 1,
}
@@
-107,17
+107,17
@@
static struct gpio_button ap81_gpio_buttons[] __initdata = {
static void __init ap81_setup(void)
{
static void __init ap81_setup(void)
{
- u8 *
mac
= (u8 *) KSEG1ADDR(0x1fff1000);
+ u8 *
eeprom
= (u8 *) KSEG1ADDR(0x1fff1000);
- ar71xx_set_mac_base(mac);
ar71xx_add_device_mdio(0x0);
ar71xx_add_device_mdio(0x0);
+ ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
- ar71xx_eth0_data.phy_mask = 0xf;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.has_ar8216 = 1;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.has_ar8216 = 1;
+ ar71xx_init_mac(ar71xx_eth1_data.mac_addr, eeprom, 1);
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.phy_mask = 0x10;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.phy_mask = 0x10;
@@
-135,7
+135,7
@@
static void __init ap81_setup(void)
ARRAY_SIZE(ap81_gpio_buttons),
ap81_gpio_buttons);
ARRAY_SIZE(ap81_gpio_buttons),
ap81_gpio_buttons);
- ar913x_add_device_wmac();
+ ar913x_add_device_wmac(
eeprom, NULL
);
}
}
-MIPS_MACHINE(AR71XX_MACH_AP81, "Atheros AP81", ap81_setup);
+MIPS_MACHINE(AR71XX_MACH_AP81, "A
P81", "A
theros AP81", ap81_setup);