ramips: merge ops-rt288x.c and rt288x_pci.h into pci-rt288x.c

[openwrt.git] / target / linux / orion / patches / 020-wnr854t_switch_support.patch

diff --git a/target/linux/orion/patches/020-wnr854t_switch_support.patch b/target/linux/orion/patches/020-wnr854t_switch_support.patch
index 564474a..f62b569 100644 (file)
--- a/target/linux/orion/patches/020-wnr854t_switch_support.patch
+++ b/target/linux/orion/patches/020-wnr854t_switch_support.patch
@@ -8,11 +8,11 @@
  #include <asm/mach-types.h>
  #include <asm/gpio.h>
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  #include <asm/gpio.h>
  #include <asm/mach/arch.h>

-@@ -97,6 +98,15 @@ static struct mv643xx_eth_platform_data 
+@@ -97,6 +98,20 @@ static struct mv643xx_eth_platform_data 

        .duplex         = DUPLEX_FULL,
  };
  
        .duplex         = DUPLEX_FULL,
  };
  

-+static struct dsa_platform_data wnr854t_switch_data = {
++static struct dsa_chip_data wnr854t_switch_chip_data = {

 +      .port_names[0] = "lan3",
 +      .port_names[1] = "lan4",
 +      .port_names[2] = "wan",
 +      .port_names[0] = "lan3",
 +      .port_names[1] = "lan4",
 +      .port_names[2] = "wan",


@@ -20,15 +20,20 @@
 +      .port_names[5] = "lan1",
 +      .port_names[7] = "lan2",
 +};
 +      .port_names[5] = "lan1",
 +      .port_names[7] = "lan2",
 +};

++
++static struct dsa_platform_data wnr854t_switch_plat_data = {
++      .nr_chips       = 1,
++      .chip           = &wnr854t_switch_chip_data,
++};

 +
  static void __init wnr854t_init(void)
  {
        /*
 +
  static void __init wnr854t_init(void)
  {
        /*

-@@ -110,6 +120,7 @@ static void __init wnr854t_init(void)
+@@ -110,6 +125,7 @@ static void __init wnr854t_init(void)

         * Configure peripherals.
         */
        orion5x_eth_init(&wnr854t_eth_data);
         * Configure peripherals.
         */
        orion5x_eth_init(&wnr854t_eth_data);

-+      orion5x_eth_switch_init(&wnr854t_switch_data, NO_IRQ);
++      orion5x_eth_switch_init(&wnr854t_switch_plat_data, NO_IRQ);

        orion5x_uart0_init();
  
        orion5x_setup_dev_boot_win(WNR854T_NOR_BOOT_BASE,
        orion5x_uart0_init();
  
        orion5x_setup_dev_boot_win(WNR854T_NOR_BOOT_BASE,