brcm47xx: update patches

[openwrt.git] / target / linux / brcm47xx / patches-3.0 / 0009-bcm47xx-make-it-possible-to-build-bcm47xx-without-ss.patch

diff --git a/target/linux/brcm47xx/patches-3.0/0009-bcm47xx-make-it-possible-to-build-bcm47xx-without-ss.patch b/target/linux/brcm47xx/patches-3.0/0009-bcm47xx-make-it-possible-to-build-bcm47xx-without-ss.patch
index 2987ba7..5b5771a 100644 (file)
--- a/target/linux/brcm47xx/patches-3.0/0009-bcm47xx-make-it-possible-to-build-bcm47xx-without-ss.patch
+++ b/target/linux/brcm47xx/patches-3.0/0009-bcm47xx-make-it-possible-to-build-bcm47xx-without-ss.patch
@@ -1,7 +1,7 @@
-From 1f25ff1b0bb5a8deae3aba2ea9c58f9b83f367bb Mon Sep 17 00:00:00 2001
+From 1ba12ca9e05153fbc611918ec0ea4cd9ec97f2c8 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Wed, 22 Jun 2011 22:16:35 +0200
-Subject: [PATCH 09/22] bcm47xx: make it possible to build bcm47xx without ssb.
+Subject: [PATCH 09/26] bcm47xx: make it possible to build bcm47xx without ssb.
 
 
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
@@ -82,7 +82,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -21,6 +21,7 @@ static DECLARE_BITMAP(gpio_in_use, BCM47
  int gpio_request(unsigned gpio, const char *tag)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                if (ssb_chipco_available(&bcm47xx_bus.ssb.chipco) &&
@@ -98,7 +98,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -42,6 +44,7 @@ EXPORT_SYMBOL(gpio_request);
  void gpio_free(unsigned gpio)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                if (ssb_chipco_available(&bcm47xx_bus.ssb.chipco) &&
@@ -114,7 +114,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -60,6 +64,7 @@ EXPORT_SYMBOL(gpio_free);
  int gpio_to_irq(unsigned gpio)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                if (ssb_chipco_available(&bcm47xx_bus.ssb.chipco))
@@ -142,7 +142,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -35,11 +37,13 @@ static void early_nvram_init(void)
        u32 *src, *dst;
  
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                mcore_ssb = &bcm47xx_bus.ssb.mipscore;
@@ -171,7 +171,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
  static int __init uart8250_init(void)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                return uart8250_init_ssb();
@@ -184,7 +184,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -47,9 +47,11 @@ static void bcm47xx_machine_restart(char
        local_irq_disable();
        /* Set the watchdog timer to reset immediately */
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1);
@@ -196,7 +196,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -60,14 +62,17 @@ static void bcm47xx_machine_halt(void)
        /* Disable interrupts and watchdog and spin forever */
        local_irq_disable();
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0);
@@ -222,7 +222,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        struct cpuinfo_mips *c = &current_cpu_data;
  
 +#ifdef CONFIG_BCM47XX_SSB
-       bcm47xx_active_bus_type = BCM47XX_BUS_TYPE_SSB;
+       bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB;
        bcm47xx_register_ssb();
 +#endif
  
@@ -233,7 +233,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -40,9 +40,11 @@ void __init plat_time_init(void)
        write_c0_compare(0xffff);
  
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                hz = ssb_cpu_clock(&bcm47xx_bus.ssb.mipscore) / 2;
@@ -265,7 +265,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -22,8 +22,10 @@ extern int gpio_to_irq(unsigned gpio);
  static inline int gpio_get_value(unsigned gpio)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                return ssb_gpio_in(&bcm47xx_bus.ssb, 1 << gpio);
@@ -276,7 +276,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -31,18 +33,22 @@ static inline int gpio_get_value(unsigne
  static inline void gpio_set_value(unsigned gpio, int value)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                ssb_gpio_out(&bcm47xx_bus.ssb, 1 << gpio,
@@ -287,7 +287,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
  static inline int gpio_direction_input(unsigned gpio)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                ssb_gpio_outen(&bcm47xx_bus.ssb, 1 << gpio, 0);
@@ -299,7 +299,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -50,6 +56,7 @@ static inline int gpio_direction_input(u
  static inline int gpio_direction_output(unsigned gpio, int value)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                /* first set the gpio out value */
@@ -315,7 +315,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -64,10 +72,12 @@ static inline int gpio_direction_output(
  static inline int gpio_intmask(unsigned gpio, int value)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                ssb_gpio_intmask(&bcm47xx_bus.ssb, 1 << gpio,
@@ -328,7 +328,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -75,10 +85,12 @@ static inline int gpio_intmask(unsigned
  static inline int gpio_polarity(unsigned gpio, int value)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                ssb_gpio_polarity(&bcm47xx_bus.ssb, 1 << gpio,
@@ -356,7 +356,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        int res;
        u8 slot, pin;
  
-+      if (bcm47xx_active_bus_type !=  BCM47XX_BUS_TYPE_SSB)
++      if (bcm47xx_bus_type !=  BCM47XX_BUS_TYPE_SSB)
 +              return 0;
 +
        res = ssb_pcibios_plat_dev_init(dev);
@@ -374,7 +374,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 @@ -55,17 +55,21 @@ static inline void bcm47xx_wdt_hw_start(
  {
        /* this is 2,5s on 100Mhz clock  and 2s on 133 Mhz */
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff);
@@ -385,7 +385,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
  static inline int bcm47xx_wdt_hw_stop(void)
  {
-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
                return ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0);