projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
kernel: reorganize 2.6.37 patches
[openwrt.git] / target / linux / lantiq / patches / 400-mach-arv45xx.patch
diff --git a/target/linux/lantiq/patches/400-mach-arv45xx.patch b/target/linux/lantiq/patches/400-mach-arv45xx.patch
index af86355..4da4c98 100644 (file)
--- a/target/linux/lantiq/patches/400-mach-arv45xx.patch
+++ b/target/linux/lantiq/patches/400-mach-arv45xx.patch
@@ -1,11 +1,12 @@
 --- a/arch/mips/include/asm/mach-lantiq/machine.h
 +++ b/arch/mips/include/asm/mach-lantiq/machine.h
 --- a/arch/mips/include/asm/mach-lantiq/machine.h
 +++ b/arch/mips/include/asm/mach-lantiq/machine.h
-@@ -11,4 +11,14 @@
+@@ -11,4 +11,15 @@
        LANTIQ_MACH_EASY4010,           /* Twinpass evalkit */
        LANTIQ_MACH_EASY50712,          /* Danube evalkit */
        LANTIQ_MACH_EASY50812,          /* AR9 eval board */
 +
 +      /* Arcadyan */
        LANTIQ_MACH_EASY4010,           /* Twinpass evalkit */
        LANTIQ_MACH_EASY50712,          /* Danube evalkit */
        LANTIQ_MACH_EASY50812,          /* AR9 eval board */
 +
 +      /* Arcadyan */
++      LANTIQ_MACH_ARV3527P,           /* Arcor easybox a401 */
 +      LANTIQ_MACH_ARV4510PW,          /* Wippies Homebox */
 +      LANTIQ_MACH_ARV4518PW,          /* Airties WAV-221, SMC-7908A-ISP */
 +      LANTIQ_MACH_ARV4520PW,          /* Airties WAV-281, Arcor EasyboxA800 */
 +      LANTIQ_MACH_ARV4510PW,          /* Wippies Homebox */
 +      LANTIQ_MACH_ARV4518PW,          /* Airties WAV-221, SMC-7908A-ISP */
 +      LANTIQ_MACH_ARV4520PW,          /* Airties WAV-281, Arcor EasyboxA800 */
@@ -37,7 +38,7 @@
 +obj-$(CONFIG_LANTIQ_MACH_ARV45XX) += mach-arv45xx.o
 --- /dev/null
 +++ b/arch/mips/lantiq/xway/mach-arv45xx.c
 +obj-$(CONFIG_LANTIQ_MACH_ARV45XX) += mach-arv45xx.o
 --- /dev/null
 +++ b/arch/mips/lantiq/xway/mach-arv45xx.c
-@@ -0,0 +1,514 @@
+@@ -0,0 +1,537 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify it
 + *  under the terms of the GNU General Public License version 2 as published
 +/*
 + *  This program is free software; you can redistribute it and/or modify it
 + *  under the terms of the GNU General Public License version 2 as published
@@ -68,7 +69,7 @@
 +#include "dev-dwc_otg.h"
 +
 +#ifdef CONFIG_MTD_PARTITIONS
 +#include "dev-dwc_otg.h"
 +
 +#ifdef CONFIG_MTD_PARTITIONS
-+static struct mtd_partition arv45xx_partitions[] =
++static struct mtd_partition arv4510_partitions[] =
 +{
 +      {
 +              .name   = "uboot",
 +{
 +      {
 +              .name   = "uboot",
@@ -78,36 +79,36 @@
 +      {
 +              .name   = "uboot_env",
 +              .offset = 0x20000,
 +      {
 +              .name   = "uboot_env",
 +              .offset = 0x20000,
-+              .size   = 0x10000,
++              .size   = 0x120000,
 +      },
 +      {
 +              .name   = "linux",
 +      },
 +      {
 +              .name   = "linux",
-+              .offset = 0x30000,
-+              .size   = 0x3c0000,
++              .offset = 0x40000,
++              .size   = 0xfa0000,
 +      },
 +      {
 +              .name   = "board_config",
 +      },
 +      {
 +              .name   = "board_config",
-+              .offset = 0x3f0000,
-+              .size   = 0x10000,
++              .offset = 0xfe0000,
++              .size   = 0x20000,
 +      },
 +};
 +
 +      },
 +};
 +
-+static struct mtd_partition arv4518_partitions[] =
++static struct mtd_partition arv45xx_partitions[] =
 +{
 +      {
 +              .name   = "uboot",
 +              .offset = 0x0,
 +{
 +      {
 +              .name   = "uboot",
 +              .offset = 0x0,
-+              .size   = 0x40000,
++              .size   = 0x20000,
 +      },
 +      {
 +              .name   = "uboot_env",
 +      },
 +      {
 +              .name   = "uboot_env",
-+              .offset = 0x40000,
++              .offset = 0x20000,
 +              .size   = 0x10000,
 +      },
 +      {
 +              .name   = "linux",
 +              .size   = 0x10000,
 +      },
 +      {
 +              .name   = "linux",
-+              .offset = 0x50000,
-+              .size   = 0x3a0000,
++              .offset = 0x30000,
++              .size   = 0x3c0000,
 +      },
 +      {
 +              .name   = "board_config",
 +      },
 +      {
 +              .name   = "board_config",
@@ -121,17 +122,17 @@
 +      {
 +              .name   = "uboot",
 +              .offset = 0x0,
 +      {
 +              .name   = "uboot",
 +              .offset = 0x0,
-+              .size   = 0x40000,
++              .size   = 0x10000,
 +      },
 +      {
 +              .name   = "uboot_env",
 +      },
 +      {
 +              .name   = "uboot_env",
-+              .offset = 0x40000,
++              .offset = 0x10000,
 +              .size   = 0x10000,
 +      },
 +      {
 +              .name   = "linux",
 +              .size   = 0x10000,
 +      },
 +      {
 +              .name   = "linux",
-+              .offset = 0x50000,
-+              .size   = 0x7a0000,
++              .offset = 0x20000,
++              .size   = 0x7d0000,
 +      },
 +      {
 +              .name   = "board_config",
 +      },
 +      {
 +              .name   = "board_config",
@@ -142,17 +143,17 @@
 +
 +#endif
 +
 +
 +#endif
 +
-+static struct physmap_flash_data arv45xx_flash_data = {
++static struct physmap_flash_data arv4510_flash_data = {
 +#ifdef CONFIG_MTD_PARTITIONS
 +#ifdef CONFIG_MTD_PARTITIONS
-+      .nr_parts       = ARRAY_SIZE(arv45xx_partitions),
-+      .parts          = arv45xx_partitions,
++      .nr_parts       = ARRAY_SIZE(arv4510_partitions),
++      .parts          = arv4510_partitions,
 +#endif
 +};
 +
 +#endif
 +};
 +
-+static struct physmap_flash_data arv4518_flash_data = {
++static struct physmap_flash_data arv45xx_flash_data = {
 +#ifdef CONFIG_MTD_PARTITIONS
 +#ifdef CONFIG_MTD_PARTITIONS
-+      .nr_parts       = ARRAY_SIZE(arv4518_partitions),
-+      .parts          = arv4518_partitions,
++      .nr_parts       = ARRAY_SIZE(arv45xx_partitions),
++      .parts          = arv45xx_partitions,
 +#endif
 +};
 +
 +#endif
 +};
 +
@@ -332,7 +333,7 @@
 +#define ARV45XX_BRN_ATH               0x3f0478
 +      int i;
 +      unsigned char eeprom_mac[6];
 +#define ARV45XX_BRN_ATH               0x3f0478
 +      int i;
 +      unsigned char eeprom_mac[6];
-+      u16 eeprom_data[ATH5K_PLAT_EEP_MAX_WORDS];
++      static u16 eeprom_data[ATH5K_PLAT_EEP_MAX_WORDS];
 +      u32 *p = (u32*)arv45xx_ath5k_eeprom_data;
 +
 +      memcpy_fromio(eeprom_mac,
 +      u32 *p = (u32*)arv45xx_ath5k_eeprom_data;
 +
 +      memcpy_fromio(eeprom_mac,
@@ -359,6 +360,24 @@
 +}
 +
 +static void __init
 +}
 +
 +static void __init
++arv3527p_init(void)
++{
++      lq_register_gpio();
++      lq_register_gpio_stp();
++      //lq_register_gpio_leds(arv3527p_leds_gpio, ARRAY_SIZE(arv3527p_leds_gpio));
++      lq_register_asc(0);
++      lq_register_asc(1);
++      lq_register_nor(&arv45xx_flash_data);
++      lq_register_wdt();
++      arv45xx_register_ethernet();
++}
++
++MIPS_MACHINE(LANTIQ_MACH_ARV3527P,
++                      "ARV3527P",
++                      "ARV3527P - Arcor Easybox 401",
++                      arv3527p_init);
++
++static void __init
 +arv4510pw_init(void)
 +{
 +      lq_register_gpio();
 +arv4510pw_init(void)
 +{
 +      lq_register_gpio();
@@ -366,10 +385,10 @@
 +      lq_register_gpio_leds(arv4510pw_leds_gpio, ARRAY_SIZE(arv4510pw_leds_gpio));
 +      lq_register_asc(0);
 +      lq_register_asc(1);
 +      lq_register_gpio_leds(arv4510pw_leds_gpio, ARRAY_SIZE(arv4510pw_leds_gpio));
 +      lq_register_asc(0);
 +      lq_register_asc(1);
-+      lq_register_nor(&arv45xx_flash_data);
-+      lq_register_pci(&lq_pci_data);
-+      lq_pci_data.irq[15] = (INT_NUM_IM2_IRL0 + 31);
-+      lq_pci_data.gpio |= PCI_EXIN1 | PCI_REQ2;
++      lq_register_nor(&arv4510_flash_data);
++      lq_pci_data.irq[12] = (INT_NUM_IM2_IRL0 + 31);
++      lq_pci_data.irq[15] = (INT_NUM_IM0_IRL0 + 26);
++      lq_pci_data.gpio |= PCI_EXIN2 | PCI_REQ2;
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
 +      bewan_register_ethernet();
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
 +      bewan_register_ethernet();
@@ -393,10 +412,11 @@
 +      lq_register_gpio_buttons(arv4518pw_gpio_buttons, ARRAY_SIZE(arv4518pw_gpio_buttons));
 +      lq_register_asc(0);
 +      lq_register_asc(1);
 +      lq_register_gpio_buttons(arv4518pw_gpio_buttons, ARRAY_SIZE(arv4518pw_gpio_buttons));
 +      lq_register_asc(0);
 +      lq_register_asc(1);
-+      lq_register_nor(&arv4518_flash_data);
++      lq_register_nor(&arv45xx_flash_data);
 +      lq_pci_data.gpio = PCI_GNT2 | PCI_REQ2;
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
 +      lq_pci_data.gpio = PCI_GNT2 | PCI_REQ2;
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
++      lq_register_madwifi_eep();
 +      xway_register_dwc(ARV4518PW_USB);
 +      arv45xx_register_ethernet();
 +      arv45xx_register_ath5k();
 +      xway_register_dwc(ARV4518PW_USB);
 +      arv45xx_register_ethernet();
 +      arv45xx_register_ath5k();
@@ -426,6 +446,7 @@
 +      lq_register_nor(&arv45xx_flash_data);
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
 +      lq_register_nor(&arv45xx_flash_data);
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
++      lq_register_tapi();
 +      arv45xx_register_ethernet();
 +      xway_register_dwc(ARV4520PW_USB);
 +
 +      arv45xx_register_ethernet();
 +      xway_register_dwc(ARV4520PW_USB);
 +
@@ -452,9 +473,10 @@
 +      lq_register_gpio_leds(arv452cpw_leds_gpio, ARRAY_SIZE(arv452cpw_leds_gpio));
 +      lq_register_asc(0);
 +      lq_register_asc(1);
 +      lq_register_gpio_leds(arv452cpw_leds_gpio, ARRAY_SIZE(arv452cpw_leds_gpio));
 +      lq_register_asc(0);
 +      lq_register_asc(1);
-+      lq_register_nor(&arv4518_flash_data);
++      lq_register_nor(&arv45xx_flash_data);
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
++      lq_register_madwifi_eep();
 +      xway_register_dwc(ARV452CPW_USB);
 +      arv45xx_register_ethernet();
 +      arv45xx_register_ath5k();
 +      xway_register_dwc(ARV452CPW_USB);
 +      arv45xx_register_ethernet();
 +      arv45xx_register_ath5k();
@@ -488,6 +510,7 @@
 +      lq_pci_data.clock = PCI_CLOCK_INT;
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
 +      lq_pci_data.clock = PCI_CLOCK_INT;
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
++      lq_register_madwifi_eep();
 +      lq_eth_data.mii_mode = MII_MODE;
 +      arv45xx_register_ethernet();
 +}
 +      lq_eth_data.mii_mode = MII_MODE;
 +      arv45xx_register_ethernet();
 +}
@@ -501,7 +524,7 @@
 +arv7518pw_init(void)
 +{
 +#define ARV7518PW_EBU                 0x2
 +arv7518pw_init(void)
 +{
 +#define ARV7518PW_EBU                 0x2
-+#define ARV7518PW_USB                 -1
++#define ARV7518PW_USB                 14
 +
 +      lq_register_gpio();
 +      lq_register_gpio_ebu(ARV7518PW_EBU);
 +
 +      lq_register_gpio();
 +      lq_register_gpio_ebu(ARV7518PW_EBU);
@@ -512,6 +535,7 @@
 +      lq_register_nor(&arv75xx_flash_data);
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
 +      lq_register_nor(&arv75xx_flash_data);
 +      lq_register_pci(&lq_pci_data);
 +      lq_register_wdt();
++      lq_register_tapi();
 +      xway_register_dwc(ARV7518PW_USB);
 +      arv75xx_register_ethernet();
 +      //arv7518_register_ath9k(mac);
 +      xway_register_dwc(ARV7518PW_USB);
 +      arv75xx_register_ethernet();
 +      //arv7518_register_ath9k(mac);
Personal OpenWRT clone
This page took 0.031784 seconds and 4 git commands to generate.