Move SSB out of brcm47xx target into generic-2.6 target

SVN-Revision: 7844

diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_merge.patch b/target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_fixes.patch
similarity index 89%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_merge.patch
rename to target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_fixes.patch
index fbf22cb85d6025891343a8754ff8ebd2de5887b5..273d8bb34f9e9cd0b026e710da90e625f8f17707 100644 (file)
--- a/target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_merge.patch
+++ b/target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_fixes.patch
@@ -217,55 +217,6 @@ Index: linux-2.6.22-rc5/drivers/ssb/driver_mipscore.c
  }
 +
 +EXPORT_SYMBOL(ssb_mips_irq);
-Index: linux-2.6.22-rc5/drivers/ssb/driver_pcicore.c
-===================================================================
---- linux-2.6.22-rc5.orig/drivers/ssb/driver_pcicore.c 2007-06-10 16:44:31.000000000 +0100
-+++ linux-2.6.22-rc5/drivers/ssb/driver_pcicore.c      2007-06-24 20:07:15.000000000 +0100
-@@ -93,6 +93,9 @@
- 
-       /* Enable PCI bridge BAR1 prefetch and burst */
-       pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3);
-+
-+      /* Make sure our latency is high enough to handle the devices behind us */
-+      pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xa8);
- }
- DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_fixup_pcibridge);
- 
-@@ -110,7 +113,7 @@
- 
-       if (unlikely(pc->cardbusmode && dev > 1))
-               goto out;
--      if (bus == 0) {
-+      if (bus == 0) {//FIXME busnumber ok?
-               /* Type 0 transaction */
-               if (unlikely(dev >= SSB_PCI_SLOT_MAX))
-                       goto out;
-@@ -224,7 +227,7 @@
-               val = *((const u32 *)buf);
-               break;
-       }
--      writel(*((const u32 *)buf), mmio);
-+      writel(val, mmio);
- 
-       err = 0;
- unmap:
-@@ -307,6 +310,8 @@
-       udelay(150);
-       val |= SSB_PCICORE_CTL_RST; /* Deassert RST# */
-       pcicore_write32(pc, SSB_PCICORE_CTL, val);
-+      val = SSB_PCICORE_ARBCTL_INTERN;
-+      pcicore_write32(pc, SSB_PCICORE_ARBCTL, val); 
-       udelay(1);
- 
-       //TODO cardbus mode
-@@ -336,6 +341,7 @@
-        * The following needs change, if we want to port hostmode
-        * to non-MIPS platform. */
-       set_io_port_base((unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000));
-+      mdelay(300);
-       register_pci_controller(&ssb_pcicore_controller);
- }
- 
 Index: linux-2.6.22-rc5/include/linux/ssb/ssb_driver_chipcommon.h
 ===================================================================
 --- linux-2.6.22-rc5.orig/include/linux/ssb/ssb_driver_chipcommon.h    2007-06-10 16:44:47.000000000 +0100

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/Kconfig b/target/linux/generic-2.6/files/drivers/ssb/Kconfig
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/Kconfig
rename to target/linux/generic-2.6/files/drivers/ssb/Kconfig

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/Makefile b/target/linux/generic-2.6/files/drivers/ssb/Makefile
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/Makefile
rename to target/linux/generic-2.6/files/drivers/ssb/Makefile

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_chipcommon.c b/target/linux/generic-2.6/files/drivers/ssb/driver_chipcommon.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/driver_chipcommon.c
rename to target/linux/generic-2.6/files/drivers/ssb/driver_chipcommon.c

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mipscore.c b/target/linux/generic-2.6/files/drivers/ssb/driver_mipscore.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mipscore.c
rename to target/linux/generic-2.6/files/drivers/ssb/driver_mipscore.c

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pcicore.c b/target/linux/generic-2.6/files/drivers/ssb/driver_pcicore.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pcicore.c
rename to target/linux/generic-2.6/files/drivers/ssb/driver_pcicore.c

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/main.c b/target/linux/generic-2.6/files/drivers/ssb/main.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/main.c
rename to target/linux/generic-2.6/files/drivers/ssb/main.c

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/pci.c b/target/linux/generic-2.6/files/drivers/ssb/pci.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/pci.c
rename to target/linux/generic-2.6/files/drivers/ssb/pci.c

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/pcihost_wrapper.c b/target/linux/generic-2.6/files/drivers/ssb/pcihost_wrapper.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/pcihost_wrapper.c
rename to target/linux/generic-2.6/files/drivers/ssb/pcihost_wrapper.c

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/pcmcia.c b/target/linux/generic-2.6/files/drivers/ssb/pcmcia.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/pcmcia.c
rename to target/linux/generic-2.6/files/drivers/ssb/pcmcia.c

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c b/target/linux/generic-2.6/files/drivers/ssb/scan.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c
rename to target/linux/generic-2.6/files/drivers/ssb/scan.c

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/ssb_private.h b/target/linux/generic-2.6/files/drivers/ssb/ssb_private.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/ssb/ssb_private.h
rename to target/linux/generic-2.6/files/drivers/ssb/ssb_private.h

diff --git a/target/linux/brcm47xx-2.6/files/drivers/usb/host/ohci-ssb.c b/target/linux/generic-2.6/files/drivers/usb/host/ohci-ssb.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/usb/host/ohci-ssb.c
rename to target/linux/generic-2.6/files/drivers/usb/host/ohci-ssb.c

diff --git a/target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb.h b/target/linux/generic-2.6/files/include/linux/ssb/ssb.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb.h
rename to target/linux/generic-2.6/files/include/linux/ssb/ssb.h

diff --git a/target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_chipcommon.h b/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_chipcommon.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_chipcommon.h
rename to target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_chipcommon.h

diff --git a/target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_extif.h b/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_extif.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_extif.h
rename to target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_extif.h

diff --git a/target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_mips.h b/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_mips.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_mips.h
rename to target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_mips.h

diff --git a/target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_pci.h b/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_pci.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_pci.h
rename to target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_pci.h

diff --git a/target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_regs.h b/target/linux/generic-2.6/files/include/linux/ssb/ssb_regs.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_regs.h
rename to target/linux/generic-2.6/files/include/linux/ssb/ssb_regs.h

diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/205-ssb_integrate.patch b/target/linux/generic-2.6/patches-2.6.22/300-ssb_integrate.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/205-ssb_integrate.patch
rename to target/linux/generic-2.6/patches-2.6.22/300-ssb_integrate.patch

diff --git a/target/linux/generic-2.6/patches-2.6.22/310-ssb_pcicore_fixes.patch b/target/linux/generic-2.6/patches-2.6.22/310-ssb_pcicore_fixes.patch
new file mode 100644 (file)
index 0000000..7139f3c
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.22/310-ssb_pcicore_fixes.patch
@@ -0,0 +1,49 @@
+Index: linux-2.6.22-rc5/drivers/ssb/driver_pcicore.c
+===================================================================
+--- linux-2.6.22-rc5.orig/drivers/ssb/driver_pcicore.c 2007-06-10 16:44:31.000000000 +0100
++++ linux-2.6.22-rc5/drivers/ssb/driver_pcicore.c      2007-06-24 20:07:15.000000000 +0100
+@@ -93,6 +93,9 @@
+ 
+       /* Enable PCI bridge BAR1 prefetch and burst */
+       pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3);
++
++      /* Make sure our latency is high enough to handle the devices behind us */
++      pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xa8);
+ }
+ DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_fixup_pcibridge);
+ 
+@@ -110,7 +113,7 @@
+ 
+       if (unlikely(pc->cardbusmode && dev > 1))
+               goto out;
+-      if (bus == 0) {
++      if (bus == 0) {//FIXME busnumber ok?
+               /* Type 0 transaction */
+               if (unlikely(dev >= SSB_PCI_SLOT_MAX))
+                       goto out;
+@@ -224,7 +227,7 @@
+               val = *((const u32 *)buf);
+               break;
+       }
+-      writel(*((const u32 *)buf), mmio);
++      writel(val, mmio);
+ 
+       err = 0;
+ unmap:
+@@ -307,6 +310,8 @@
+       udelay(150);
+       val |= SSB_PCICORE_CTL_RST; /* Deassert RST# */
+       pcicore_write32(pc, SSB_PCICORE_CTL, val);
++      val = SSB_PCICORE_ARBCTL_INTERN;
++      pcicore_write32(pc, SSB_PCICORE_ARBCTL, val); 
+       udelay(1);
+ 
+       //TODO cardbus mode
+@@ -336,6 +341,7 @@
+        * The following needs change, if we want to port hostmode
+        * to non-MIPS platform. */
+       set_io_port_base((unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000));
++      mdelay(300);
+       register_pci_controller(&ssb_pcicore_controller);
+ }
+