From patchwork Thu Apr 3 05:19:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 336512 X-Patchwork-Delegate: iwamatsu@nigauri.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 8D4B3140143 for ; Thu, 3 Apr 2014 16:20:46 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 926E94BA8B; Thu, 3 Apr 2014 07:20:32 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iRsufRbbRLWg; Thu, 3 Apr 2014 07:20:32 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EA1784BB81; Thu, 3 Apr 2014 07:20:03 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A1E2B4BB49 for ; Thu, 3 Apr 2014 07:20:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VD8Dq55UVXwG for ; Thu, 3 Apr 2014 07:19:57 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by theia.denx.de (Postfix) with ESMTPS id 598F34BB5D for ; Thu, 3 Apr 2014 07:19:44 +0200 (CEST) Received: by mail-pd0-f175.google.com with SMTP id x10so1232927pdj.34 for ; Wed, 02 Apr 2014 22:19:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=FMmL8cH5WxVZ8yTH7r6335siTPMyFTxR9hRC4nKiPVc=; b=MWWeishy7XSQnGHqNoC9b/ECUwQqzWluPtRhJqZgVAd01xycOZL3cmhRTazEjvxB1c yoKsrvkjRHHBsz7gMQ1oeHogT1gMdK+moJmSPfM8J3M323gJ/VfJ9lRpnZ3J76+Ya6ku NhxAMNnIwkk7pSl0WgTeXUeT3E+N3dLRWn8QYK1+WxONdFBSZ27FFSxI6iHc3Rmnxyvp CG0CJdW8JEFsUG5Z0fkeE6c6OuWUrUrYLGHs9ctMO7u7BCw6id1SCvg5g5g6JXddNKs8 jbPGy2qM4PVMk2dSAHHqsdtFtbDFsmP7K0FQ741kWFsDBzoW1keNtTERi5o+XkdxKrXq Bt/w== X-Gm-Message-State: ALoCoQm7wkyTP+S7tTi0Gb8ZmDiKD1c4YWrunLmSiS9Vka2psbmCi6zfB49d+kM3n9L+djLVoBre X-Received: by 10.68.229.68 with SMTP id so4mr4867146pbc.110.1396502383421; Wed, 02 Apr 2014 22:19:43 -0700 (PDT) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id vh2sm8293604pbc.72.2014.04.02.22.19.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Apr 2014 22:19:41 -0700 (PDT) From: Nobuhiro Iwamatsu To: iwamatsu@nigauri.org Date: Thu, 3 Apr 2014 14:19:09 +0900 Message-Id: <1396502350-13128-7-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1396502350-13128-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1396502350-13128-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> Cc: u-boot@lists.denx.de, Nobuhiro Iwamatsu Subject: [U-Boot] [PATCH 7/8] arm: rmobile: r8a7791: Add support ES2 revision X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de There is ES2 is a new revision to R8A7791. This adds support this revision. 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 7c8f19c..4791825 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 67f227b..371f0ed 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;