mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 13/15] mci: factor out mci/sd specific startup functions
Date: Thu,  9 Feb 2012 12:53:56 +0100	[thread overview]
Message-ID: <1328788438-19717-14-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1328788438-19717-1-git-send-email-s.hauer@pengutronix.de>

This saves an indention level and makes the code more readable.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mci/mci-core.c |  133 ++++++++++++++++++++++++++++--------------------
 1 files changed, 77 insertions(+), 56 deletions(-)

diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 799c5cb..9c9ed48 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -767,6 +767,76 @@ static void mci_extract_card_capacity_from_csd(struct mci *mci)
 	dev_dbg(mci->mci_dev, "Capacity: %u MiB\n", (unsigned)mci->capacity >> 20);
 }
 
+static int mci_startup_sd(struct mci *mci)
+{
+	struct mci_cmd cmd;
+	int err;
+
+	if (mci->card_caps & MMC_MODE_4BIT) {
+		dev_dbg(mci->mci_dev, "Prepare for bus width change\n");
+		mci_setup_cmd(&cmd, MMC_CMD_APP_CMD, mci->rca << 16, MMC_RSP_R1);
+		err = mci_send_cmd(mci, &cmd, NULL);
+		if (err) {
+			dev_dbg(mci->mci_dev, "Preparing SD for bus width change failed: %d\n", err);
+			return err;
+		}
+
+		dev_dbg(mci->mci_dev, "Set SD bus width to 4 bit\n");
+		mci_setup_cmd(&cmd, SD_CMD_APP_SET_BUS_WIDTH, 2, MMC_RSP_R1);
+		err = mci_send_cmd(mci, &cmd, NULL);
+		if (err) {
+			dev_dbg(mci->mci_dev, "Changing SD bus width failed: %d\n", err);
+			/* TODO continue with 1 bit? */
+			return err;
+		}
+		mci_set_bus_width(mci, MMC_BUS_WIDTH_4);
+	}
+	/* if possible, speed up the transfer */
+	if (mci->card_caps & MMC_MODE_HS)
+		mci_set_clock(mci, 50000000);
+	else
+		mci_set_clock(mci, 25000000);
+
+	return 0;
+}
+
+static int mci_startup_mmc(struct mci *mci)
+{
+	int err;
+
+	if (mci->card_caps & MMC_MODE_4BIT) {
+		dev_dbg(mci->mci_dev, "Set MMC bus width to 4 bit\n");
+		/* Set the card to use 4 bit*/
+		err = mci_switch(mci, EXT_CSD_CMD_SET_NORMAL,
+				EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_4);
+		if (err) {
+			dev_dbg(mci->mci_dev, "Changing MMC bus width failed: %d\n", err);
+			return err;
+		}
+		mci_set_bus_width(mci, MMC_BUS_WIDTH_4);
+	} else if (mci->card_caps & MMC_MODE_8BIT) {
+		dev_dbg(mci->mci_dev, "Set MMC bus width to 8 bit\n");
+		/* Set the card to use 8 bit*/
+		err = mci_switch(mci, EXT_CSD_CMD_SET_NORMAL,
+				EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_8);
+		if (err) {
+			dev_dbg(mci->mci_dev, "Changing MMC bus width failed: %d\n", err);
+			return err;
+		}
+		mci_set_bus_width(mci, MMC_BUS_WIDTH_8);
+	}
+	/* if possible, speed up the transfer */
+	if (mci->card_caps & MMC_MODE_HS) {
+		if (mci->card_caps & MMC_MODE_HS_52MHz)
+			mci_set_clock(mci, 52000000);
+		else
+			mci_set_clock(mci, 26000000);
+	} else
+		mci_set_clock(mci, 20000000);
+
+	return 0;
+}
+
 /**
  * Scan the given host interfaces and detect connected MMC/SD cards
  * @param mci MCI instance
@@ -881,62 +951,13 @@ static int mci_startup(struct mci *mci)
 	/* Restrict card's capabilities by what the host can do */
 	mci->card_caps &= host->host_caps;
 
-	if (IS_SD(mci)) {
-		if (mci->card_caps & MMC_MODE_4BIT) {
-			dev_dbg(mci->mci_dev, "Prepare for bus width change\n");
-			mci_setup_cmd(&cmd, MMC_CMD_APP_CMD, mci->rca << 16, MMC_RSP_R1);
-			err = mci_send_cmd(mci, &cmd, NULL);
-			if (err) {
-				dev_dbg(mci->mci_dev, "Preparing SD for bus width change failed: %d\n", err);
-				return err;
-			}
-
-			dev_dbg(mci->mci_dev, "Set SD bus width to 4 bit\n");
-			mci_setup_cmd(&cmd, SD_CMD_APP_SET_BUS_WIDTH, 2, MMC_RSP_R1);
-			err = mci_send_cmd(mci, &cmd, NULL);
-			if (err) {
-				dev_dbg(mci->mci_dev, "Changing SD bus width failed: %d\n", err);
-				/* TODO continue with 1 bit? */
-				return err;
-			}
-			mci_set_bus_width(mci, MMC_BUS_WIDTH_4);
-		}
-		/* if possible, speed up the transfer */
-		if (mci->card_caps & MMC_MODE_HS)
-			mci_set_clock(mci, 50000000);
-		else
-			mci_set_clock(mci, 25000000);
-	} else {
-		if (mci->card_caps & MMC_MODE_4BIT) {
-			dev_dbg(mci->mci_dev, "Set MMC bus width to 4 bit\n");
-			/* Set the card to use 4 bit*/
-			err = mci_switch(mci, EXT_CSD_CMD_SET_NORMAL,
-					EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_4);
-			if (err) {
-				dev_dbg(mci->mci_dev, "Changing MMC bus width failed: %d\n", err);
-				return err;
-			}
-			mci_set_bus_width(mci, MMC_BUS_WIDTH_4);
-		} else if (mci->card_caps & MMC_MODE_8BIT) {
-			dev_dbg(mci->mci_dev, "Set MMC bus width to 8 bit\n");
-			/* Set the card to use 8 bit*/
-			err = mci_switch(mci, EXT_CSD_CMD_SET_NORMAL,
-					EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_8);
-			if (err) {
-				dev_dbg(mci->mci_dev, "Changing MMC bus width failed: %d\n", err);
-				return err;
-			}
-			mci_set_bus_width(mci, MMC_BUS_WIDTH_8);
-		}
-		/* if possible, speed up the transfer */
-		if (mci->card_caps & MMC_MODE_HS) {
-			if (mci->card_caps & MMC_MODE_HS_52MHz)
-				mci_set_clock(mci, 52000000);
-			else
-				mci_set_clock(mci, 26000000);
-		} else
-			mci_set_clock(mci, 20000000);
-	}
+	if (IS_SD(mci))
+		err = mci_startup_sd(mci);
+	else
+		err = mci_startup_mmc(mci);
+
+	if (err)
+		return err;
 
 	/* we setup the blocklength only one times for all accesses to this media  */
 	err = mci_set_blocklen(mci, mci->read_bl_len);
-- 
1.7.9


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-02-09 11:54 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-09 11:53 [PATCH] mmc/sd patches Sascha Hauer
2012-02-09 11:53 ` [PATCH 01/15] mci: Add complete definitions for the card type Sascha Hauer
2012-02-09 11:53 ` [PATCH 02/15] mci: use card type definitions Sascha Hauer
2012-02-09 11:53 ` [PATCH 03/15] mci: fix high capacity detection Sascha Hauer
2012-02-09 11:53 ` [PATCH 04/15] mci mxs: do not use external define for internal use Sascha Hauer
2012-02-09 11:53 ` [PATCH 05/15] mci core: replace discrete ios values with struct ios Sascha Hauer
2012-02-09 11:53 ` [PATCH 06/15] mci s3c: Do not mess with struct mci_host Sascha Hauer
2012-02-09 11:53 ` [PATCH 07/15] mci s3c: allocate host struct dynamically Sascha Hauer
2012-02-09 11:53 ` [PATCH 08/15] mci s3c: pass around the right pointer Sascha Hauer
2012-02-09 11:53 ` [PATCH 09/15] mci: remove unused device argument from set_ios Sascha Hauer
2012-02-09 11:53 ` [PATCH 10/15] mci core: fix mixup of max write/read block len Sascha Hauer
2012-02-09 11:53 ` [PATCH 11/15] mci: Use struct mci for internal argument passing Sascha Hauer
2012-02-09 11:53 ` [PATCH 12/15] mci: replace pr_debug with dev_dbg Sascha Hauer
2012-02-09 11:53 ` Sascha Hauer [this message]
2012-02-09 11:53 ` [PATCH 14/15] mci: cdev_find_free_index won't fail, no need to check Sascha Hauer
2012-02-09 11:53 ` [PATCH 15/15] mci: Be more verbose on what device is associated to which disk Sascha Hauer
2012-02-09 13:32   ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1328788438-19717-14-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox