Changeset 45717


Ignore:
Timestamp:
2015-05-23T17:25:51+02:00 (3 years ago)
Author:
blogic
Message:

lantiq: Fix PCIe bus when PCI is also enabled.

The PCIe bus seems to require a hack/workaround when PCI is enabled as
well. Unfortunately this is guarded by an CONFIG_IFX_PCI ifdef, which is
only defined in lantiq's BSP code. The config symbol for the upstream
lantiq PCI driver is CONFIG_PCI_LANTIQ.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch

    r44678 r45717  
    41164116+    u32 tbus_number = bus_number; 
    41174117+ 
    4118 +#ifdef CONFIG_IFX_PCI 
     4118+#ifdef CONFIG_PCI_LANTIQ 
    41194119+    if (pcibios_host_nr() > 1) { 
    41204120+        tbus_number -= pcibios_1st_host_bus_nr(); 
    41214121+    } 
    4122 +#endif /* CONFIG_IFX_PCI */ 
     4122+#endif /* CONFIG_PCI_LANTIQ */ 
    41234123+    return tbus_number; 
    41244124+} 
     
    41424142+ 
    41434143+    if (read) { /* Read hack */ 
    4144 +    #ifdef CONFIG_IFX_PCI 
     4144+    #ifdef CONFIG_PCI_LANTIQ 
    41454145+        if (pcibios_host_nr() > 1) { 
    41464146+            tvalue = ifx_pcie_bus_enum_read_hack(where, tvalue); 
    41474147+        } 
    4148 +    #endif /* CONFIG_IFX_PCI */   
     4148+    #endif /* CONFIG_PCI_LANTIQ */ 
    41494149+    } 
    41504150+    else { /* Write hack */ 
    4151 +    #ifdef CONFIG_IFX_PCI     
     4151+    #ifdef CONFIG_PCI_LANTIQ 
    41524152+        if (pcibios_host_nr() > 1) { 
    41534153+            tvalue = ifx_pcie_bus_enum_write_hack(where, tvalue); 
     
    54585458+    u32 tbus_number = bus_number; 
    54595459+ 
    5460 +#ifdef CONFIG_IFX_PCI 
     5460+#ifdef CONFIG_PCI_LANTIQ 
    54615461+    if (pcibios_host_nr() > 1) { 
    54625462+        tbus_number -= pcibios_1st_host_bus_nr(); 
    54635463+    } 
    5464 +#endif /* CONFIG_IFX_PCI */ 
     5464+#endif /* CONFIG_PCI_LANTIQ */ 
    54655465+    return tbus_number; 
    54665466+} 
     
    54845484+ 
    54855485+    if (read) { /* Read hack */ 
    5486 +    #ifdef CONFIG_IFX_PCI 
     5486+    #ifdef CONFIG_PCI_LANTIQ 
    54875487+        if (pcibios_host_nr() > 1) { 
    54885488+            tvalue = ifx_pcie_bus_enum_read_hack(where, tvalue); 
    54895489+        } 
    5490 +    #endif /* CONFIG_IFX_PCI */   
     5490+    #endif /* CONFIG_PCI_LANTIQ */ 
    54915491+    } 
    54925492+    else { /* Write hack */ 
    5493 +    #ifdef CONFIG_IFX_PCI     
     5493+    #ifdef CONFIG_PCI_LANTIQ 
    54945494+        if (pcibios_host_nr() > 1) { 
    54955495+            tvalue = ifx_pcie_bus_enum_write_hack(where, tvalue); 
Note: See TracChangeset for help on using the changeset viewer.