From fb3af517ef12dc42729ecfbea3f9dd282cec62bd Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 28 Mar 2014 13:43:40 +0900 Subject: [PATCH] arm: rmobile: r8a7791: Add support ES2 revision There is ES2 is a new revision to R8A7791. This adds support this revision. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- arch/arm/include/asm/arch-rmobile/r8a7791.h | 4 ++++ arch/arm/include/asm/arch-rmobile/rcar-base.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-rmobile/r8a7791.h b/arch/arm/include/asm/arch-rmobile/r8a7791.h index 7c8f19cd43..479182571e 100644 --- a/arch/arm/include/asm/arch-rmobile/r8a7791.h +++ b/arch/arm/include/asm/arch-rmobile/r8a7791.h @@ -46,4 +46,8 @@ #define DBSC3_1_QOS_W14_BASE 0xE67A2E00 #define DBSC3_1_QOS_W15_BASE 0xE67A2F00 +#define R8A7791_CUT_ES2X 2 +#define IS_R8A7791_ES2() \ + (rmobile_get_cpu_rev_integer() == R8A7791_CUT_ES2X) + #endif /* __ASM_ARCH_R8A7791_H */ diff --git a/arch/arm/include/asm/arch-rmobile/rcar-base.h b/arch/arm/include/asm/arch-rmobile/rcar-base.h index 67f227b39c..371f0ed624 100644 --- a/arch/arm/include/asm/arch-rmobile/rcar-base.h +++ b/arch/arm/include/asm/arch-rmobile/rcar-base.h @@ -552,7 +552,7 @@ struct rcar_s3c { u32 s3cexclidmsk; u32 s3cadsplcr; u32 s3cmaar; - u32 s3carcr11; /* R8a7790 only */ + u32 s3carcr11; u32 s3crorr; u32 s3cworr; u32 s3carcr22;