From patchwork Mon Apr 4 06:45:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 684581 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p346jaUm027362 for ; Mon, 4 Apr 2011 06:45:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753758Ab1DDGpg (ORCPT ); Mon, 4 Apr 2011 02:45:36 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:35371 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753719Ab1DDGpf (ORCPT ); Mon, 4 Apr 2011 02:45:35 -0400 Received: from joe.akashicho.tokyo.vergenet.net (219-109-213-121.bitcat.net [219.109.213.121]) by kirsty.vergenet.net (Postfix) with ESMTP id 058F1245AE; Mon, 4 Apr 2011 16:45:33 +1000 (EST) Received: by joe.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 7CECD28A03E; Mon, 4 Apr 2011 15:45:28 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: Magnus Damm , Paul Mundt , Simon Horman Subject: [PATCH 2/2] ARM: mach-shmobile: rename mmc-ap4eb.h as mmc-ap4evb.h Date: Mon, 4 Apr 2011 15:45:22 +0900 Message-Id: <1301899522-20546-3-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1301899522-20546-1-git-send-email-horms@verge.net.au> References: <1301899522-20546-1-git-send-email-horms@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 04 Apr 2011 06:45:37 +0000 (UTC) The convention is to use the name of the board printedon the PCB, in this case ap4evb. At the very least this is consistent with usage elsewhere in the code. Reported-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h | 29 ---------------------- arch/arm/mach-shmobile/include/mach/mmc-ap4evb.h | 29 ++++++++++++++++++++++ arch/arm/mach-shmobile/include/mach/mmc.h | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h create mode 100644 arch/arm/mach-shmobile/include/mach/mmc-ap4evb.h diff --git a/arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h b/arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h deleted file mode 100644 index db59fdb..0000000 --- a/arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef MMC_AP4EB_H -#define MMC_AP4EB_H - -#define PORT185CR (void __iomem *)0xe60520b9 -#define PORT186CR (void __iomem *)0xe60520ba -#define PORT187CR (void __iomem *)0xe60520bb -#define PORT188CR (void __iomem *)0xe60520bc - -#define PORTR191_160DR (void __iomem *)0xe6056014 - -static inline void mmc_init_progress(void) -{ - /* Initialise LEDS1-4 - * registers: PORT185CR-PORT188CR (LED1-LED4 Control) - * value: 0x10 - enable output - */ - __raw_writeb(0x10, PORT185CR); - __raw_writeb(0x10, PORT186CR); - __raw_writeb(0x10, PORT187CR); - __raw_writeb(0x10, PORT188CR); -} - -static inline void mmc_update_progress(int n) -{ - __raw_writel((__raw_readl(PORTR191_160DR) & ~(0xf << 25)) | - (1 << (25 + n)), PORTR191_160DR); -} - -#endif /* MMC_AP4EB_H */ diff --git a/arch/arm/mach-shmobile/include/mach/mmc-ap4evb.h b/arch/arm/mach-shmobile/include/mach/mmc-ap4evb.h new file mode 100644 index 0000000..32d6ec3 --- /dev/null +++ b/arch/arm/mach-shmobile/include/mach/mmc-ap4evb.h @@ -0,0 +1,29 @@ +#ifndef MMC_AP4EVB_H +#define MMC_AP4EVB_H + +#define PORT185CR (void __iomem *)0xe60520b9 +#define PORT186CR (void __iomem *)0xe60520ba +#define PORT187CR (void __iomem *)0xe60520bb +#define PORT188CR (void __iomem *)0xe60520bc + +#define PORTR191_160DR (void __iomem *)0xe6056014 + +static inline void mmc_init_progress(void) +{ + /* Initialise LEDS1-4 + * registers: PORT185CR-PORT188CR (LED1-LED4 Control) + * value: 0x10 - enable output + */ + __raw_writeb(0x10, PORT185CR); + __raw_writeb(0x10, PORT186CR); + __raw_writeb(0x10, PORT187CR); + __raw_writeb(0x10, PORT188CR); +} + +static inline void mmc_update_progress(int n) +{ + __raw_writel((__raw_readl(PORTR191_160DR) & ~(0xf << 25)) | + (1 << (25 + n)), PORTR191_160DR); +} + +#endif /* MMC_AP4EVB_H */ diff --git a/arch/arm/mach-shmobile/include/mach/mmc.h b/arch/arm/mach-shmobile/include/mach/mmc.h index 21a59db..906db06 100644 --- a/arch/arm/mach-shmobile/include/mach/mmc.h +++ b/arch/arm/mach-shmobile/include/mach/mmc.h @@ -8,7 +8,7 @@ **************************************************/ #ifdef CONFIG_MACH_AP4EVB -#include "mach/mmc-ap4eb.h" +#include "mach/mmc-ap4evb.h" #elif defined(CONFIG_MACH_MACKEREL) #include "mach/mmc-mackerel.h" #else