From patchwork Wed Jul 24 09:09:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Trumtrar X-Patchwork-Id: 2832607 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E52B89F4E2 for ; Wed, 24 Jul 2013 09:10:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3692D20264 for ; Wed, 24 Jul 2013 09:10:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB1F72018A for ; Wed, 24 Jul 2013 09:10:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190Ab3GXJKA (ORCPT ); Wed, 24 Jul 2013 05:10:00 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:56703 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751758Ab3GXJJ7 (ORCPT ); Wed, 24 Jul 2013 05:09:59 -0400 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1V1v4t-0006OF-0V; Wed, 24 Jul 2013 11:09:47 +0200 Received: from str by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1V1v4s-0006As-Cz; Wed, 24 Jul 2013 11:09:46 +0200 From: Steffen Trumtrar To: linux-mmc@vger.kernel.org Cc: Chris Ball , devicetree@vger.kernel.org, kernel@pengutronix.de, Steffen Trumtrar Subject: [RFC 1/2] mmc: block: allow setting name_idx via devicetree Date: Wed, 24 Jul 2013 11:09:32 +0200 Message-Id: <1374656973-16250-2-git-send-email-s.trumtrar@pengutronix.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1374656973-16250-1-git-send-email-s.trumtrar@pengutronix.de> References: <1374656973-16250-1-git-send-email-s.trumtrar@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: str@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mmc@vger.kernel.org Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As with gpio, uart and others, allow specifying the name_idx via the aliases-node in the devicetree. On embedded devices, there is often a combination of removable (e.g. SD card) and non-removable mmc devices (e.g. eMMC). Therefore the name_idx might change depending on - host of removable device - removable card present or not This makes it difficult to hard code the root device, if it is on the non-removable device. E.g. if SD card is present eMMC will be mmcblk1, if SD card is not present at boot, eMMC will be mmcblk0. If the aliases-node is not found, the driver will act as before. Signed-off-by: Steffen Trumtrar --- drivers/mmc/card/block.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index cd0b7f4..5853c59 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -2005,7 +2006,11 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, * index anymore so we keep track of a name index. */ if (!subname) { - md->name_idx = find_first_zero_bit(name_use, max_devices); + ret = of_alias_get_id(card->host->parent->of_node, "mmc"); + if (ret < 0) + md->name_idx = find_first_zero_bit(name_use, max_devices); + else + md->name_idx = ret; __set_bit(md->name_idx, name_use); } else md->name_idx = ((struct mmc_blk_data *)