From a79c3e8d9c31db25d5ca3ec8e08a97f323410dd4 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Wed, 23 Jul 2008 10:52:19 +0200 Subject: avr32: asm/io.h needs asm/types.h map_physmem() takes a phys_addr_t as parameter. This type is defined in asm/types.h, so we need to include that file. Signed-off-by: Haavard Skinnemoen --- include/asm-avr32/io.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/asm-avr32/io.h b/include/asm-avr32/io.h index d030c262a58..06e52b137f5 100644 --- a/include/asm-avr32/io.h +++ b/include/asm-avr32/io.h @@ -22,6 +22,8 @@ #ifndef __ASM_AVR32_IO_H #define __ASM_AVR32_IO_H +#include + #ifdef __KERNEL__ /* -- cgit v1.2.3 From 7f4b009f4232d57084ce0ec5aeb3b57bccb08e4c Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Wed, 23 Jul 2008 10:55:15 +0200 Subject: avr32: Fix printf() format warnings Signed-off-by: Haavard Skinnemoen --- include/asm-avr32/sysreg.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/asm-avr32/sysreg.h b/include/asm-avr32/sysreg.h index 72ad49e5e2d..4f6970448b8 100644 --- a/include/asm-avr32/sysreg.h +++ b/include/asm-avr32/sysreg.h @@ -273,7 +273,9 @@ | SYSREG_BF(name,value)) /* Register access macros */ -#define sysreg_read(reg) __builtin_mfsr(SYSREG_##reg) -#define sysreg_write(reg, value) __builtin_mtsr(SYSREG_##reg, value) +#define sysreg_read(reg) \ + ((unsigned long)__builtin_mfsr(SYSREG_##reg)) +#define sysreg_write(reg, value) \ + __builtin_mtsr(SYSREG_##reg, value) #endif /* __ASM_AVR32_SYSREG_H__ */ -- cgit v1.2.3 From 2cb9080427fe641dcb71da46cd0634dd406f37ed Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Tue, 22 Jul 2008 08:01:43 +0900 Subject: Remove unused I2C at apollon board There are no I2C devices on this board. Signed-off-by: Kyungmin Park --- include/configs/apollon.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'include') diff --git a/include/configs/apollon.h b/include/configs/apollon.h index 89732968ade..5884611b9ad 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -103,14 +103,6 @@ */ #define CONFIG_SERIAL1 1 /* UART1 on H4 */ - /* - * I2C configuration - */ -#define CONFIG_HARD_I2C -#define CFG_I2C_SPEED 100000 -#define CFG_I2C_SLAVE 1 -#define CONFIG_DRIVER_OMAP24XX_I2C - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -- cgit v1.2.3 From 6361ad4b596f5a940a01c91ae0297d98f790cbe0 Mon Sep 17 00:00:00 2001 From: Matvejchikov Ilya Date: Wed, 30 Jul 2008 23:20:32 +0400 Subject: PPC: Add pci_clk in the global_data for CPM2 processors This patch adds pci_clk field to the global_data structure for the processors which have CPM2 module in case the CONFIG_PCI is defined. Signed-off-by: Matvejchikov Ilya --- include/asm-ppc/global_data.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index c5ac6584acb..be2ce247782 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -51,6 +51,9 @@ typedef struct global_data { unsigned long cpm_clk; unsigned long scc_clk; unsigned long brg_clk; +#ifdef CONFIG_PCI + unsigned long pci_clk; +#endif #endif unsigned long mem_clk; #if defined(CONFIG_MPC83XX) -- cgit v1.2.3