aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorpascal@pabr.org <pascal@pabr.org>2010-01-03 07:39:12 -0500
committerRalf Baechle <ralf@linux-mips.org>2010-02-27 06:53:17 -0500
commit60ec6571c5072cdea9e518d1dac8147b85ca93a2 (patch)
tree7543987848f6c00467bb5adea4ccfe096faf8835 /arch/mips
parentfc48c41af81b953578a54f80ad07d2f1efa81378 (diff)
MIPS: Support 36-bit iomem on 32-bit Au1x00
I believe these changes are needed on Alchemy SoCs in order to use iomem above 4G with the usual platform_device machinery: - Set CONFIG_ARCH_PHYS_ADDR_T_64BIT to make resource_size_t 64-bit. - Increase IOMEM_RESOURCE_END so that platforms can register resources. To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/814/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig3
-rw-r--r--arch/mips/include/asm/mach-au1x00/au1000.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index db0a85355be7..591ca0cd4c24 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1725,6 +1725,9 @@ config SB1_PASS_2_1_WORKAROUNDS
1725config 64BIT_PHYS_ADDR 1725config 64BIT_PHYS_ADDR
1726 bool 1726 bool
1727 1727
1728config ARCH_PHYS_ADDR_T_64BIT
1729 def_bool 64BIT_PHYS_ADDR
1730
1728config CPU_HAS_SMARTMIPS 1731config CPU_HAS_SMARTMIPS
1729 depends on SYS_SUPPORTS_SMARTMIPS 1732 depends on SYS_SUPPORTS_SMARTMIPS
1730 bool "Support for the SmartMIPS ASE" 1733 bool "Support for the SmartMIPS ASE"
diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h
index 088c8e0f43bb..2805fc56484d 100644
--- a/arch/mips/include/asm/mach-au1x00/au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/au1000.h
@@ -1659,7 +1659,7 @@ enum soc_au1200_ints {
1659#define IOPORT_RESOURCE_START 0x00001000 /* skip legacy probing */ 1659#define IOPORT_RESOURCE_START 0x00001000 /* skip legacy probing */
1660#define IOPORT_RESOURCE_END 0xffffffff 1660#define IOPORT_RESOURCE_END 0xffffffff
1661#define IOMEM_RESOURCE_START 0x10000000 1661#define IOMEM_RESOURCE_START 0x10000000
1662#define IOMEM_RESOURCE_END 0xffffffff 1662#define IOMEM_RESOURCE_END 0xfffffffffULL
1663 1663
1664#else /* Au1000 and Au1100 and Au1200 */ 1664#else /* Au1000 and Au1100 and Au1200 */
1665 1665
@@ -1667,7 +1667,7 @@ enum soc_au1200_ints {
1667#define IOPORT_RESOURCE_START 0x10000000 1667#define IOPORT_RESOURCE_START 0x10000000
1668#define IOPORT_RESOURCE_END 0xffffffff 1668#define IOPORT_RESOURCE_END 0xffffffff
1669#define IOMEM_RESOURCE_START 0x10000000 1669#define IOMEM_RESOURCE_START 0x10000000
1670#define IOMEM_RESOURCE_END 0xffffffff 1670#define IOMEM_RESOURCE_END 0xfffffffffULL
1671 1671
1672#define PCI_IO_START 0 1672#define PCI_IO_START 0
1673#define PCI_IO_END 0 1673#define PCI_IO_END 0