[backfire] merge r22614

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22615 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic-2.6/patches-2.6.30/976-ssb_increase_pci_delay.patch b/target/linux/generic-2.6/patches-2.6.30/976-ssb_increase_pci_delay.patch
new file mode 100644 (file)
index 0000000..f51e3bc
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.30/976-ssb_increase_pci_delay.patch
@@ -0,0 +1,11 @@
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -399,7 +399,7 @@ static void ssb_pcicore_init_hostmode(st
+       set_io_port_base(ssb_pcicore_controller.io_map_base);
+       /* Give some time to the PCI controller to configure itself with the new
+        * values. Not waiting at this point causes crashes of the machine. */
+-      mdelay(10);
++      mdelay(300);
+       register_pci_controller(&ssb_pcicore_controller);
+ }
+ 

diff --git a/target/linux/generic-2.6/patches-2.6.32/976-ssb_increase_pci_delay.patch b/target/linux/generic-2.6/patches-2.6.32/976-ssb_increase_pci_delay.patch
new file mode 100644 (file)
index 0000000..af67367
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.32/976-ssb_increase_pci_delay.patch
@@ -0,0 +1,11 @@
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -370,7 +370,7 @@ static void ssb_pcicore_init_hostmode(st
+       set_io_port_base(ssb_pcicore_controller.io_map_base);
+       /* Give some time to the PCI controller to configure itself with the new
+        * values. Not waiting at this point causes crashes of the machine. */
+-      mdelay(10);
++      mdelay(300);
+       register_pci_controller(&ssb_pcicore_controller);
+ }
+