From 9e2538e11fc87fb51cfde707fd5ffae086f1b467 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Fri, 23 Sep 2011 04:29:15 +0000 Subject: DaVinci: correct MDSTAT.STATE mask MDSTAT.STATE occupies bits 0..5 according to all available documentation, so fix the mask which previously was leaving out the intermediate state indicator bit. While at it, introduce two #define's for that mask -- unfortunately, we can't use a single #define as the assembly code can't include due to C-specfic constructs in it. Signed-off-by: Sergei Shtylyov Signed-off-by: Sandeep Paulraj --- arch/arm/include/asm/arch-davinci/hardware.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/include/asm/arch-davinci/hardware.h') diff --git a/arch/arm/include/asm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h index b6a3209..8e7b847 100644 --- a/arch/arm/include/asm/arch-davinci/hardware.h +++ b/arch/arm/include/asm/arch-davinci/hardware.h @@ -356,6 +356,8 @@ struct davinci_psc_regs { #endif /* CONFIG_SOC_DA8XX */ +#define PSC_MDSTAT_STATE 0x3f + #ifndef CONFIG_SOC_DA8XX /* Miscellania... */ -- cgit v1.1 From 2bc3acb10a80c41fa2b14d82f70ca35842e369c4 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Tue, 27 Sep 2011 19:40:41 +0000 Subject: arm, davinci: add missing LSPC define for MMC/SD1 Signed-off-by: Heiko Schocher Cc: Paulraj Sandeep Cc: Albert ARIBAUD Signed-off-by: Sandeep Paulraj --- arch/arm/include/asm/arch-davinci/hardware.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/include/asm/arch-davinci/hardware.h') diff --git a/arch/arm/include/asm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h index 8e7b847..431e87b 100644 --- a/arch/arm/include/asm/arch-davinci/hardware.h +++ b/arch/arm/include/asm/arch-davinci/hardware.h @@ -260,6 +260,7 @@ typedef volatile unsigned int * dv_reg_p; #define DAVINCI_LPSC_UART2 (DAVINCI_LPSC_PSC1_BASE + 13) #define DAVINCI_LPSC_LCDC (DAVINCI_LPSC_PSC1_BASE + 16) #define DAVINCI_LPSC_ePWM (DAVINCI_LPSC_PSC1_BASE + 17) +#define DAVINCI_LPSC_MMCSD1 (DAVINCI_LPSC_PSC1_BASE + 18) #define DAVINCI_LPSC_eCAP (DAVINCI_LPSC_PSC1_BASE + 20) #define DAVINCI_LPSC_L3_CBA_RAM (DAVINCI_LPSC_PSC1_BASE + 31) -- cgit v1.1