ar71xx: add defines for the AR934X GMAC interface

[openwrt.git] / target / linux / brcm47xx / patches-3.0 / 014-MIPS-BCM47xx-Setup-and-register-serial-early.patch

diff --git a/target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch b/target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
index 419a4f6..0951644 100644 (file)
--- a/target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
+++ b/target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
@@ -15,16 +15,16 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
 
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c

-@@ -29,6 +29,8 @@
- #include <linux/types.h>
- #include <linux/ssb/ssb.h>
+@@ -31,6 +31,8 @@

  #include <linux/ssb/ssb_embedded.h>
  #include <linux/ssb/ssb_embedded.h>

+ #include <linux/bcma/bcma_soc.h>
+ #include <linux/platform_device.h>

 +#include <linux/serial.h>
 +#include <linux/serial_8250.h>
  #include <asm/bootinfo.h>
  #include <asm/reboot.h>
  #include <asm/time.h>
 +#include <linux/serial.h>
 +#include <linux/serial_8250.h>
  #include <asm/bootinfo.h>
  #include <asm/reboot.h>
  #include <asm/time.h>

-@@ -247,6 +249,31 @@ static int bcm47xx_get_invariants(struct
+@@ -278,6 +280,31 @@ static int bcm47xx_get_invariants(struct

        return 0;
  }
  
        return 0;
  }
  


@@ -53,17 +53,17 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +}
 +#endif
 +
 +}
 +#endif
 +

- void __init plat_mem_setup(void)
+ static void __init bcm47xx_register_ssb(void)

  {
        int err;
  {
        int err;

-@@ -277,6 +304,10 @@ void __init plat_mem_setup(void)
+@@ -310,6 +337,10 @@ static void __init bcm47xx_register_ssb(
+                       memcpy(&mcore->serial_ports[1], &port, sizeof(port));

                }
        }
                }
        }

- 
++

 +#ifdef CONFIG_SERIAL_8250
 +      bcm47xx_early_serial_setup(mcore);
 +#endif
 +#ifdef CONFIG_SERIAL_8250
 +      bcm47xx_early_serial_setup(mcore);
 +#endif

-+
-       _machine_restart = bcm47xx_machine_restart;
-       _machine_halt = bcm47xx_machine_halt;
-       pm_power_off = bcm47xx_machine_halt;
+ }
+ #endif
+