tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Linus Torvalds c5ef91ee a6733f2e

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