From patchwork Mon Dec 6 00:12:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 376852 X-Patchwork-Delegate: lethal@linux-sh.org 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 oB60EWNG006802 for ; Mon, 6 Dec 2010 00:15:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752224Ab0LFAP1 (ORCPT ); Sun, 5 Dec 2010 19:15:27 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:59017 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751621Ab0LFAP1 (ORCPT ); Sun, 5 Dec 2010 19:15:27 -0500 Received: from ayumi.akashicho.tokyo.vergenet.net (219-109-213-121.bitcat.net [219.109.213.121]) by kirsty.vergenet.net (Postfix) with ESMTP id BA8F524062; Mon, 6 Dec 2010 11:15:24 +1100 (EST) Received: by ayumi.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 2D609EDE0D0; Mon, 6 Dec 2010 09:15:24 +0900 (JST) Message-Id: <20101206001310.658304531@vergenet.net> User-Agent: quilt/0.48-1 Date: Mon, 06 Dec 2010 09:12:44 +0900 From: Simon Horman To: linux-mmc@vger.kernel.org, linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Russell King - ARM Linux , Chris Ball , Yusuke Goda , Kuninori Morimoto , Magnus Damm , Paul Mundt Subject: [patch 1/3] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h References: <20101206001243.949375995@vergenet.net> Content-Disposition: inline; filename=MMCIF_PROGRESS-header.patch 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.3 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Dec 2010 00:15:28 +0000 (UTC) Index: linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c =================================================================== --- linux-2.6-ap4.orig/arch/sh/boot/romimage/mmcif-sh7724.c 2010-12-06 08:59:11.000000000 +0900 +++ linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c 2010-12-06 08:59:16.000000000 +0900 @@ -21,9 +21,6 @@ #define HIZCRC 0xa405015c #define DRVCRA 0xa405018a -enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT, - MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE }; - /* SH7724 specific MMCIF loader * * loads the romImage from an MMC card starting from block 512 Index: linux-2.6-ap4/include/linux/mmc/sh_mmcif.h =================================================================== --- linux-2.6-ap4.orig/include/linux/mmc/sh_mmcif.h 2010-12-06 08:59:11.000000000 +0900 +++ linux-2.6-ap4/include/linux/mmc/sh_mmcif.h 2010-12-06 08:59:16.000000000 +0900 @@ -97,6 +97,9 @@ static inline void sh_mmcif_writel(void #define SH_MMCIF_BBS 512 /* boot block size */ +enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT, + MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE }; + static inline void sh_mmcif_boot_cmd_send(void __iomem *base, unsigned long cmd, unsigned long arg) {