Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=786d7cdd06581773ee7913560838d6f4487d2d9f
Commit: 786d7cdd06581773ee7913560838d6f4487d2d9f
Parent: e0daad449c5195fa4552c60392eeee4e5c58d31c
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 7 09:58:30 2006 +0000
Committer: Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Tue Feb 6 16:53:20 2007 +0000
[MIPS] Alchemy: Fix bunch of warnings
CC arch/mips/au1000/common/pci.o
arch/mips/au1000/common/pci.c:42: warning: large integer implicitly
truncated to unsigned type
arch/mips/au1000/common/pci.c:43: warning: large integer implicitly
truncated to unsigned type
arch/mips/au1000/common/pci.c:49: warning: large integer implicitly
truncated to unsigned type
arch/mips/au1000/common/pci.c:50: warning: large integer implicitly
truncated to unsigned type
arch/mips/au1000/common/pci.c: In function ‘au1x_pci_setup’:
arch/mips/au1000/common/pci.c:82: warning: ISO C90 forbids mixed
declarations and code
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
arch/mips/au1000/common/pci.c | 18 +++++++++++-------
include/asm-mips/mach-au1x00/au1000.h | 13 +++++++------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c
index 9f8ce08..6c25e6c 100644
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
@@ -76,13 +76,17 @@ static int __init au1x_pci_setup(void)
}
#ifdef CONFIG_DMA_NONCOHERENT
- /*
- * Set the NC bit in controller for Au1500 pre-AC silicon
- */
- u32 prid = read_c0_prid();
- if ( (prid & 0xFF000000) == 0x01000000 && prid < 0x01030202) {
- au_writel( 1<<16 | au_readl(Au1500_PCI_CFG), Au1500_PCI_CFG);
- printk("Non-coherent PCI accesses enabled\n");
+ {
+ /*
+ * Set the NC bit in controller for Au1500 pre-AC silicon
+ */
+ u32 prid = read_c0_prid();
+
+ if ((prid & 0xFF000000) == 0x01000000 && prid < 0x01030202) {
+ au_writel((1 << 16) | au_readl(Au1500_PCI_CFG),
+ Au1500_PCI_CFG);
+ printk("Non-coherent PCI accesses enabled\n");
+ }
}
#endif
diff --git a/include/asm-mips/mach-au1x00/au1000.h
b/include/asm-mips/mach-au1x00/au1000.h
index 582acd8..43beeaa 100644
--- a/include/asm-mips/mach-au1x00/au1000.h
+++ b/include/asm-mips/mach-au1x00/au1000.h
@@ -39,6 +39,7 @@
#ifndef _LANGUAGE_ASSEMBLY
#include <linux/delay.h>
+#include <linux/types.h>
#include <asm/io.h>
/* cpu pipeline flush */
@@ -1664,12 +1665,12 @@ extern au1xxx_irq_map_t au1xxx_irq_map[];
* addresses. For PCI IO, it's simpler because we get to do the ioremap
* ourselves and then adjust the device's resources.
*/
-#define Au1500_EXT_CFG 0x600000000ULL
-#define Au1500_EXT_CFG_TYPE1 0x680000000ULL
-#define Au1500_PCI_IO_START 0x500000000ULL
-#define Au1500_PCI_IO_END 0x5000FFFFFULL
-#define Au1500_PCI_MEM_START 0x440000000ULL
-#define Au1500_PCI_MEM_END 0x44FFFFFFFULL
+#define Au1500_EXT_CFG ((resource_size_t) 0x600000000ULL)
+#define Au1500_EXT_CFG_TYPE1 ((resource_size_t) 0x680000000ULL)
+#define Au1500_PCI_IO_START ((resource_size_t) 0x500000000ULL)
+#define Au1500_PCI_IO_END ((resource_size_t) 0x5000FFFFFULL)
+#define Au1500_PCI_MEM_START ((resource_size_t) 0x440000000ULL)
+#define Au1500_PCI_MEM_END ((resource_size_t) 0x44FFFFFFFULL)
#define PCI_IO_START (Au1500_PCI_IO_START + 0x1000)
#define PCI_IO_END (Au1500_PCI_IO_END)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
