Changeset 42503


Ignore:
Timestamp:
2014-09-12T08:53:15+02:00 (3 years ago)
Author:
blogic
Message:

atheros: ar2315-pci: update host bridge resources

It seems that the PCI controller does not support I/O ports, so remove
the ports range. Also correct the beginning of the memory range and its
size.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@…>

Location:
trunk/target/linux/atheros/patches-3.14
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/atheros/patches-3.14/100-board.patch

    r42501 r42503  
    675675--- /dev/null 
    676676+++ b/arch/mips/include/asm/mach-ar231x/ar2315_regs.h 
    677 @@ -0,0 +1,624 @@ 
     677@@ -0,0 +1,625 @@ 
    678678+/* 
    679679+ * Register definitions for AR2315+ 
     
    739739+#define AR2315_SPI_MMR          0x11300000      /* SPI FLASH MMR */ 
    740740+#define AR2315_PCIEXT           0x80000000      /* pci external */ 
     741+#define AR2315_PCIEXT_SZ       0x40000000 
    741742+ 
    742743+/* MII registers offset inside Ethernet MMR region */ 
  • trunk/target/linux/atheros/patches-3.14/105-ar2315_pci.patch

    r42502 r42503  
    88--- /dev/null 
    99+++ b/arch/mips/ar231x/pci.c 
    10 @@ -0,0 +1,350 @@ 
     10@@ -0,0 +1,337 @@ 
    1111+/* 
    1212+ * This program is free software; you can redistribute it and/or 
     
    6262+#include "devices.h" 
    6363+ 
    64 +#define AR2315_MEM_BASE    0x80800000UL 
    65 +#define AR2315_MEM_SIZE    0x00ffffffUL 
    66 +#define AR2315_IO_SIZE     0x00007fffUL 
    67 + 
    6864+/* Arbitrary size of memory region to access the configuration space */ 
    6965+#define AR2315_PCI_CFG_SIZE    0x00100000 
     
    161157+static struct resource ar2315_mem_resource = { 
    162158+       .name   = "ar2315-pci-mem", 
    163 +       .start  = AR2315_MEM_BASE, 
    164 +       .end    = AR2315_MEM_BASE + AR2315_MEM_SIZE - AR2315_IO_SIZE - 1 + 
    165 +                 0x4000000, 
     159+       .start  = AR2315_PCIEXT, 
     160+       .end    = AR2315_PCIEXT + AR2315_PCIEXT_SZ - 1, 
    166161+       .flags  = IORESOURCE_MEM, 
    167162+}; 
    168163+ 
     164+/* PCI controller does not support I/O ports */ 
    169165+static struct resource ar2315_io_resource = { 
    170166+       .name   = "ar2315-pci-io", 
    171 +       .start  = AR2315_MEM_BASE + AR2315_MEM_SIZE - AR2315_IO_SIZE, 
    172 +       .end    = AR2315_MEM_BASE + AR2315_MEM_SIZE - 1, 
     167+       .start  = 0, 
     168+       .end    = 0, 
    173169+       .flags  = IORESOURCE_IO, 
    174170+}; 
     
    299295+       } 
    300296+ 
    301 +       ar2315_pci_controller.io_map_base = 
    302 +                       (unsigned long)ioremap_nocache(AR2315_MEM_BASE + 
    303 +                       AR2315_MEM_SIZE, AR2315_IO_SIZE); 
    304 +       set_io_port_base(ar2315_pci_controller.io_map_base); /* PCI I/O space*/ 
    305 + 
    306297+       /* Reset PCI DMA logic */ 
    307298+       reg = ar231x_mask_reg(AR2315_RESET, 0, AR2315_RESET_PCIDMA); 
     
    338329+ 
    339330+       msleep(500); 
    340 + 
    341 +       /* dirty hack - anyone with a datasheet that knows the memory map ? */ 
    342 +       ioport_resource.start = 0x10000000; 
    343 +       ioport_resource.end = 0xffffffff; 
    344331+ 
    345332+       res = ar2315_pci_host_setup(); 
Note: See TracChangeset for help on using the changeset viewer.