#include <linux/input.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
#include <linux/spi/vsc7385.h>
#include <asm/mips_machine.h>
#include <asm/mach-ar71xx/ar71xx.h>
+#include <asm/mach-ar71xx/ar91xx_flash.h>
#include "devices.h"
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
- .name = "rootfs",
+ .name = "kernel",
.offset = 0x060000,
- .size = 0x400000,
+ .size = 0x140000,
} , {
- .name = "kernel",
- .offset = 0x460000,
- .size = 0x100000,
+ .name = "rootfs",
+ .offset = 0x1a0000,
+ .size = 0x650000,
} , {
.name = "art",
- .offset = 0x560000,
- .size = 0x2a0000,
+ .offset = 0x7f0000,
+ .size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
.name = "firmware",
.offset = 0x060000,
- .size = 0x500000,
+ .size = 0x790000,
}
};
#endif /* CONFIG_MTD_PARTITIONS */
-static struct physmap_flash_data ap83_flash_data = {
+static struct ar91xx_flash_platform_data ap83_flash_data = {
.width = 2,
#ifdef CONFIG_MTD_PARTITIONS
.parts = ap83_flash_partitions,
};
static struct platform_device ap83_flash_device = {
- .name = "physmap-flash",
+ .name = "ar91xx-flash",
.id = -1,
.resource = ap83_flash_resources,
.num_resources = ARRAY_SIZE(ap83_flash_resources),
static struct vsc7385_platform_data ap83_vsc7385_data = {
.reset = ap83_vsc7385_reset,
.ucode_name = "vsc7385_ucode_ap83.bin",
+ .mac_cfg = {
+ .tx_ipg = 6,
+ .bit2 = 0,
+ .clk_sel = 3,
+ },
};
static struct spi_board_info ap83_spi_info[] = {
static void __init ap83_040_setup(void)
{
- ar71xx_flash_lock_enable();
+ ap83_flash_data.is_shared=1;
ap83_generic_setup();
platform_device_register(&ap83_040_spi_device);
}