diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-12-26 14:19:05 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-12-26 14:19:05 +0000 |
| commit | 64e26215eee9aca32f7c1b409e7acb974f25e2f9 (patch) | |
| tree | 8b06a689528faf5c170983eb31d18dac3c0a37f9 | |
| parent | 08d44a0942cee409dabbeb55d5a901b375ae1f36 (diff) | |
| download | upstream-64e26215eee9aca32f7c1b409e7acb974f25e2f9.tar.gz upstream-64e26215eee9aca32f7c1b409e7acb974f25e2f9.tar.bz2 upstream-64e26215eee9aca32f7c1b409e7acb974f25e2f9.zip | |
ar71xx: use the generic m25p80 registration code for the MZK-W04NU
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18938 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c index a3d71f6242..58b64976d7 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c @@ -11,8 +11,6 @@ #include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> -#include <linux/spi/spi.h> -#include <linux/spi/flash.h> #include <asm/mips_machine.h> #include <asm/mach-ar71xx/ar71xx.h> @@ -21,6 +19,7 @@ #include "dev-ar913x-wmac.h" #include "dev-gpio-buttons.h" #include "dev-leds-gpio.h" +#include "dev-m25p80.h" #define MZK_W04NU_GPIO_LED_USB 0 #define MZK_W04NU_GPIO_LED_STATUS 1 @@ -74,16 +73,6 @@ static struct flash_platform_data mzk_w04nu_flash_data = { #endif }; -static struct spi_board_info mzk_w04nu_spi_info[] = { - { - .bus_num = 0, - .chip_select = 0, - .max_speed_hz = 25000000, - .modalias = "m25p80", - .platform_data = &mzk_w04nu_flash_data, - } -}; - static struct gpio_led mzk_w04nu_leds_gpio[] __initdata = { { .name = "mzk-w04nu:green:status", @@ -157,8 +146,7 @@ static void __init mzk_w04nu_setup(void) ar71xx_add_device_eth(0); ar71xx_add_device_eth(1); - ar71xx_add_device_spi(NULL, mzk_w04nu_spi_info, - ARRAY_SIZE(mzk_w04nu_spi_info)); + ar71xx_add_device_m25p80(&mzk_w04nu_flash_data); ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(mzk_w04nu_leds_gpio), mzk_w04nu_leds_gpio); |