From: John Crispin <john@openwrt.org>
Date: Thu, 11 Jul 2013 21:16:34 +0000 (+0000)
Subject: lantiq: revert 36778 as it breaks irq assignment to pci devices
X-Git-Tag: reboot~9950
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=93c4359512528fe6036a965ef93f4d0e11d10d4d;p=openwrt%2Fstaging%2Fjogo.git

lantiq: revert 36778 as it breaks irq assignment to pci devices

Reported-by: Matti Laakso
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37258
---

diff --git a/target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
index e98a4c08ae..ca88c74330 100644
--- a/target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
+++ b/target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
@@ -194,7 +194,7 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
 +{
 +	return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
 +}
-+late_initcall(of_ath9k_eeprom_init);
++arch_initcall(of_ath9k_eeprom_init);
 +
 +
 +static int ath5k_pci_plat_dev_init(struct pci_dev *dev)
@@ -298,7 +298,7 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
 +{
 +	return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe);
 +}
-+late_initcall(of_ath5k_eeprom_init);
++device_initcall(of_ath5k_eeprom_init);
 --- /dev/null
 +++ b/arch/mips/lantiq/xway/eth_mac.c
 @@ -0,0 +1,76 @@
@@ -586,11 +586,3 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
  
  	priv->clk_ppe = clk_get(&pdev->dev, NULL);
  	if (IS_ERR(priv->clk_ppe))
---- a/arch/mips/pci/pci-lantiq.c
-+++ b/arch/mips/pci/pci-lantiq.c
-@@ -260,4 +260,4 @@ int __init pcibios_init(void)
- 	return ret;
- }
- 
--arch_initcall(pcibios_init);
-+late_initcall(pcibios_init);