ar71xx: merge ap81 patches into one

Signed-off-by: Roman Yeryomin <roman@advem.lv>
SVN-Revision: 45551

diff --git a/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch b/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch
index 1d38986b63a01217178071432b6f01278fa7a0ff..1cf4c2398b8be7f2520ae764e817288e7a1f4684 100644 (file)
--- a/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch
+++ b/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch
@@ -57,27 +57,6 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
        }
  };
  
---- a/arch/mips/ath79/mach-ap81.c
-+++ b/arch/mips/ath79/mach-ap81.c
-@@ -67,12 +67,18 @@ static struct gpio_keys_button ap81_gpio
-       }
- };
- 
-+static struct ath79_spi_controller_data ap81_spi0_data = {
-+      .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
-+      .cs_line = 0,
-+};
-+
- static struct spi_board_info ap81_spi_info[] = {
-       {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p64",
-+              .controller_data = &ap81_spi0_data,
-       }
- };
- 
 --- a/arch/mips/ath79/mach-db120.c
 +++ b/arch/mips/ath79/mach-db120.c
 @@ -76,12 +76,18 @@ static struct gpio_keys_button db120_gpi

diff --git a/target/linux/ar71xx/patches-3.18/604-MIPS-ath79-ap81-fixes.patch b/target/linux/ar71xx/patches-3.18/604-MIPS-ath79-ap81-fixes.patch
index bbfdd49dbce7e4e9049cbc970fa403e02c6491d9..2817453a4d4511b3cd4cf14622ef6b11169900ff 100644 (file)
--- a/target/linux/ar71xx/patches-3.18/604-MIPS-ath79-ap81-fixes.patch
+++ b/target/linux/ar71xx/patches-3.18/604-MIPS-ath79-ap81-fixes.patch
@@ -20,60 +20,16 @@
  
  #define AP81_GPIO_LED_STATUS  1
  #define AP81_GPIO_LED_AOSS    3
-@@ -29,6 +33,37 @@
- 
- #define AP81_CAL_DATA_ADDR    0x1fff1000
- 
-+static struct mtd_partition ap81_partitions[] = {
-+      {
-+              .name           = "u-boot",
-+              .offset         = 0,
-+              .size           = 0x040000,
-+              .mask_flags     = MTD_WRITEABLE,
-+      }, {
-+              .name           = "u-boot-env",
-+              .offset         = 0x040000,
-+              .size           = 0x010000,
-+      }, {
-+              .name           = "rootfs",
-+              .offset         = 0x050000,
-+              .size           = 0x500000,
-+      }, {
-+              .name           = "uImage",
-+              .offset         = 0x550000,
-+              .size           = 0x100000,
-+      }, {
-+              .name           = "ART",
-+              .offset         = 0x650000,
-+              .size           = 0x1b0000,
-+              .mask_flags     = MTD_WRITEABLE,
-+      }
-+};
-+
-+static struct flash_platform_data ap81_flash_data = {
-+      .parts          = ap81_partitions,
-+      .nr_parts       = ARRAY_SIZE(ap81_partitions),
-+};
-+
- static struct gpio_led ap81_leds_gpio[] __initdata = {
-       {
-               .name           = "ap81:green:status",
-@@ -67,26 +102,6 @@ static struct gpio_keys_button ap81_gpio
+@@ -67,20 +102,6 @@ static struct gpio_keys_button ap81_gpio
        }
  };
  
--static struct ath79_spi_controller_data ap81_spi0_data = {
--      .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
--      .cs_line = 0,
--};
--
 -static struct spi_board_info ap81_spi_info[] = {
 -      {
 -              .bus_num        = 0,
 -              .chip_select    = 0,
 -              .max_speed_hz   = 25000000,
 -              .modalias       = "m25p64",
--              .controller_data = &ap81_spi0_data,
 -      }
 -};
 -
@@ -85,13 +41,13 @@
  static void __init ap81_setup(void)
  {
        u8 *cal_data = (u8 *) KSEG1ADDR(AP81_CAL_DATA_ADDR);
-@@ -96,10 +111,24 @@ static void __init ap81_setup(void)
+@@ -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(&ap81_flash_data);
++      ath79_register_m25p80(NULL);
        ath79_register_wmac(cal_data, NULL);
        ath79_register_usb();
 +

diff --git a/target/linux/ar71xx/patches-3.18/614-MIPS-ath79-ap81-remove-mtd-partitions.patch b/target/linux/ar71xx/patches-3.18/614-MIPS-ath79-ap81-remove-mtd-partitions.patch
deleted file mode 100644 (file)
index 6d403ab..0000000
--- a/target/linux/ar71xx/patches-3.18/614-MIPS-ath79-ap81-remove-mtd-partitions.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/arch/mips/ath79/mach-ap81.c
-+++ b/arch/mips/ath79/mach-ap81.c
-@@ -33,37 +33,6 @@
- 
- #define AP81_CAL_DATA_ADDR    0x1fff1000
- 
--static struct mtd_partition ap81_partitions[] = {
--      {
--              .name           = "u-boot",
--              .offset         = 0,
--              .size           = 0x040000,
--              .mask_flags     = MTD_WRITEABLE,
--      }, {
--              .name           = "u-boot-env",
--              .offset         = 0x040000,
--              .size           = 0x010000,
--      }, {
--              .name           = "rootfs",
--              .offset         = 0x050000,
--              .size           = 0x500000,
--      }, {
--              .name           = "uImage",
--              .offset         = 0x550000,
--              .size           = 0x100000,
--      }, {
--              .name           = "ART",
--              .offset         = 0x650000,
--              .size           = 0x1b0000,
--              .mask_flags     = MTD_WRITEABLE,
--      }
--};
--
--static struct flash_platform_data ap81_flash_data = {
--      .parts          = ap81_partitions,
--      .nr_parts       = ARRAY_SIZE(ap81_partitions),
--};
--
- static struct gpio_led ap81_leds_gpio[] __initdata = {
-       {
-               .name           = "ap81:green:status",
-@@ -111,7 +80,7 @@ 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_m25p80(&ap81_flash_data);
-+      ath79_register_m25p80(NULL);
-       ath79_register_wmac(cal_data, NULL);
-       ath79_register_usb();
-