WE want to use MACROS in the config files for various DaVinci boards. At the moment this is not possible because we get compilation error when we include the hardware.h header file in the config file for various SOC's and then try to compile. This patch addresses comments received while submitting patches for the Leopard board.

Signed-off-by: Sandeep Paulraj s-paulraj@ti.com --- include/asm-arm/arch-davinci/hardware.h | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/asm-arm/arch-davinci/hardware.h b/include/asm-arm/arch-davinci/hardware.h index 313b3f3..2e941e2 100644 --- a/include/asm-arm/arch-davinci/hardware.h +++ b/include/asm-arm/arch-davinci/hardware.h @@ -34,6 +34,9 @@ #define __ASM_ARCH_HARDWARE_H

#include <config.h> + +#ifndef __ASSEMBLY__ + #include <asm/sizes.h>

#define REG(addr) (*(volatile unsigned int *)(addr)) @@ -42,6 +45,16 @@ typedef volatile unsigned int dv_reg; typedef volatile unsigned int * dv_reg_p;

+void lpsc_on(unsigned int id); +void dsp_on(void); + +void davinci_enable_uart0(void); +void davinci_enable_emac(void); +void davinci_enable_i2c(void); +void davinci_errata_workarounds(void); + +#endif + /* * Base register addresses * @@ -153,14 +166,6 @@ typedef volatile unsigned int * dv_reg_p; #define DAVINCI_LPSC_GEM 39 #define DAVINCI_LPSC_IMCOP 40

-void lpsc_on(unsigned int id); -void dsp_on(void); - -void davinci_enable_uart0(void); -void davinci_enable_emac(void); -void davinci_enable_i2c(void); -void davinci_errata_workarounds(void); - /* Some PSC defines */ #define PSC_CHP_SHRTSW (0x01c40038) #define PSC_GBLCTL (0x01c41010)