aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2007-07-01 22:44:05 +0000
committerPeter Denison <openwrt@marshadder.org>2007-07-01 22:44:05 +0000
commit46d194834b736d53a61a3ef3b7b2e0a521f73384 (patch)
tree71a8d15f23545a3eb32b0223c4cbbac4cb7969cb
parent6497e3b7689cd1502ff0f67893527f820b455bf4 (diff)
downloadupstream-46d194834b736d53a61a3ef3b7b2e0a521f73384.tar.gz
upstream-46d194834b736d53a61a3ef3b7b2e0a521f73384.tar.bz2
upstream-46d194834b736d53a61a3ef3b7b2e0a521f73384.zip
Move SSB out of brcm47xx target into generic-2.6 target
SVN-Revision: 7844
-rw-r--r--target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_fixes.patch (renamed from target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_merge.patch)49
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/Kconfig (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/Kconfig)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/Makefile (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/Makefile)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/driver_chipcommon.c (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/driver_chipcommon.c)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/driver_mipscore.c (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mipscore.c)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/driver_pcicore.c (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pcicore.c)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/main.c (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/main.c)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/pci.c (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/pci.c)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/pcihost_wrapper.c (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/pcihost_wrapper.c)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/pcmcia.c (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/pcmcia.c)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/scan.c (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c)0
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/ssb_private.h (renamed from target/linux/brcm47xx-2.6/files/drivers/ssb/ssb_private.h)0
-rw-r--r--target/linux/generic-2.6/files/drivers/usb/host/ohci-ssb.c (renamed from target/linux/brcm47xx-2.6/files/drivers/usb/host/ohci-ssb.c)0
-rw-r--r--target/linux/generic-2.6/files/include/linux/ssb/ssb.h (renamed from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb.h)0
-rw-r--r--target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_chipcommon.h (renamed from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_chipcommon.h)0
-rw-r--r--target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_extif.h (renamed from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_extif.h)0
-rw-r--r--target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_mips.h (renamed from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_mips.h)0
-rw-r--r--target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_pci.h (renamed from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_driver_pci.h)0
-rw-r--r--target/linux/generic-2.6/files/include/linux/ssb/ssb_regs.h (renamed from target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb_regs.h)0
-rw-r--r--target/linux/generic-2.6/patches-2.6.22/300-ssb_integrate.patch (renamed from target/linux/brcm47xx-2.6/patches-2.6.22/205-ssb_integrate.patch)0
-rw-r--r--target/linux/generic-2.6/patches-2.6.22/310-ssb_pcicore_fixes.patch49
21 files changed, 49 insertions, 49 deletions
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
index fbf22cb85d..273d8bb34f 100644
--- 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
index 03c4945868..03c4945868 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/Kconfig
+++ b/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
index 9a2b379fbf..9a2b379fbf 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/Makefile
+++ b/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
index a283de9e3a..a283de9e3a 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_chipcommon.c
+++ b/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
index 67d10178b6..67d10178b6 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mipscore.c
+++ b/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
index a59dff083e..a59dff083e 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pcicore.c
+++ b/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
index a892f1dafc..a892f1dafc 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/main.c
+++ b/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
index f9dc28f51f..f9dc28f51f 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/pci.c
+++ b/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
index 82a10abef6..82a10abef6 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/pcihost_wrapper.c
+++ b/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
index b9085633eb..b9085633eb 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/pcmcia.c
+++ b/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
index b5d909c3a5..b5d909c3a5 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c
+++ b/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
index d00d186074..d00d186074 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/ssb_private.h
+++ b/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
index 2b3ef36b14..2b3ef36b14 100644
--- 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
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
index a3d1f5114b..a3d1f5114b 100644
--- a/target/linux/brcm47xx-2.6/files/include/linux/ssb/ssb.h
+++ b/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
index 8856590230..8856590230 100644
--- 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
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
index 278a637e86..278a637e86 100644
--- 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
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
index 91f2373be4..91f2373be4 100644
--- 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
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
index 5132f26103..5132f26103 100644
--- 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
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
index 1fa4bf8a9d..1fa4bf8a9d 100644
--- 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
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
index 67882454d8..67882454d8 100644
--- 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
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
index 0000000000..7139f3c715
--- /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);
+ }
+