Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c5ef91eee5015cc968996fb0d2974cbc41e4eccd

Authored by Linus Torvalds
2 parents a6733f2e14 b0d98dc504

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
  sh: Support PCI IO access of SH7780 base boards.
  sh: Fix PCI IO space base address of SH7780.

Showing 3 changed files Side-by-side Diff

arch/sh/drivers/pci/ops-r7780rp.c
Diff comments   View file @ c5ef91e
... ... @@ -40,8 +40,8 @@
40 40  
41 41 static struct resource sh7780_io_resource = {
42 42 .name = "SH7780_IO",
43   - .start = 0x2000,
44   - .end = 0x2000 + SH7780_PCI_IO_SIZE - 1,
  43 + .start = SH7780_PCI_IO_BASE,
  44 + .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
45 45 .flags = IORESOURCE_IO
46 46 };
47 47  
arch/sh/drivers/pci/ops-se7780.c
Diff comments   View file @ c5ef91e
... ... @@ -43,8 +43,8 @@
43 43  
44 44 static struct resource se7780_io_resource = {
45 45 .name = "SH7780_IO",
46   - .start = 0x2000,
47   - .end = 0x2000 + SH7780_PCI_IO_SIZE - 1,
  46 + .start = SH7780_PCI_IO_BASE,
  47 + .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
48 48 .flags = IORESOURCE_IO
49 49 };
50 50  
arch/sh/drivers/pci/pci-sh7780.h
Diff comments   View file @ c5ef91e
... ... @@ -30,7 +30,7 @@
30 30 #define SH7780_PCI_MEMORY_BASE 0xFD000000 /* Memory space base addr */
31 31 #define SH7780_PCI_MEM_SIZE 0x01000000 /* Size of Memory window */
32 32  
33   -#define SH7780_PCI_IO_BASE 0xFE400000 /* IO space base address */
  33 +#define SH7780_PCI_IO_BASE 0xFE200000 /* IO space base address */
34 34 #define SH7780_PCI_IO_SIZE 0x00400000 /* Size of IO window */
35 35  
36 36 #define SH7780_PCIREG_BASE 0xFE040000 /* PCI regs base address */