From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E17CC433EF for ; Sat, 23 Oct 2021 23:28:21 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2FA260C4D for ; Sat, 23 Oct 2021 23:28:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B2FA260C4D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1A23F8358A; Sun, 24 Oct 2021 01:27:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Fv5PaYPF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B05283539; Sun, 24 Oct 2021 01:27:02 +0200 (CEST) Received: from mail-ot1-x32b.google.com (mail-ot1-x32b.google.com [IPv6:2607:f8b0:4864:20::32b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E74A483461 for ; Sun, 24 Oct 2021 01:26:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-ot1-x32b.google.com with SMTP id w12-20020a056830410c00b0054e7ceecd88so9342710ott.2 for ; Sat, 23 Oct 2021 16:26:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/qcUXyYAbsI7XL71RS9tZucd8m3PjhIUpFxyFvL/648=; b=Fv5PaYPFgVAh1kZWV0SUPP4zoLbVyMGr0akZUi5fsrFTk+CqSa7bJYA5WHoQk7MRHK 4xYqOSRRdLlMbyS/bfJITNQlDUPjA2v/sWO8PLLRzmeS6O+O7KgF3eDmFmc9RMxjTe2f TifNEJPcOsCgB9fVEtY+m3MNl4ErZGMt5YSUQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/qcUXyYAbsI7XL71RS9tZucd8m3PjhIUpFxyFvL/648=; b=tElQsRseNLCMVOz9Q6BACyefZ7qeOA3+NncdfV0LzRqk2MHWh9wJnKj9BFnqGtrNtS M3nCzfRtp39jR6D5GTrNHFm67eBLNVJgp5TtRTgIqjVBympCnUBjUCo0Q0c2v4f/3rVD fSwjBAeJ7OKliSxbT9kuV7aLz0Qjq/2A1FHQQrXaB1jgEjUP+UGNrQ2XcJc+Zeu5k3y6 mmzf6w9H2xY9qo+2/8Zg2Gt44zUY4lBtwOr5noyr8wu8jrRMFVZbKGkEP1XOR/2lmtZJ BxJ0MQtihwIWTd0GdEZiCa15gliN6Ok5R5oaggIESHUfvUulEi4GmoJdbAIpBFHywKMr +AqQ== X-Gm-Message-State: AOAM533nA0W6gnXlB9XyKMZMHwphKhelnIQiwsxNSVF4NY3+K5n1ymwv v1XKx3ZD5JsX880tTOLun1X3IL7PA6k4kQ== X-Google-Smtp-Source: ABdhPJy0q4D7A7CUkUHyZBTl1NffOfCWf6kljkvQ5ZYqM4OxFxcC3Xx5PC712gmdyhW5OW/jJkPE4A== X-Received: by 2002:a9d:6c91:: with SMTP id c17mr6541992otr.114.1635031610445; Sat, 23 Oct 2021 16:26:50 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id l24sm2253885oop.4.2021.10.23.16.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Oct 2021 16:26:50 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Michal Simek , Heinrich Schuchardt , Tom Rini , Ilias Apalodimas , Daniel Schwierzeck , Steffen Jaeckel , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Lukas Auer , Dennis Gilmore , Simon Glass , Jaehoon Chung , Peng Fan Subject: [PATCH v2 06/41] mmc: Allow for children other than the block device Date: Sat, 23 Oct 2021 17:26:00 -0600 Message-Id: <20211023172618.v2.6.I3b044625feed74528dee0553a04dd0dc211877ef@changeid> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211023232635.9195-1-sjg@chromium.org> References: <20211023232635.9195-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean At present the MMC uclass assumes that the only child it can have is a block device. Update this so we can add a bootmethod too. Signed-off-by: Simon Glass --- (no changes since v1) drivers/mmc/mmc-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 3ee92d03ca2..b80e838066c 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -320,7 +320,7 @@ struct blk_desc *mmc_get_blk_desc(struct mmc *mmc) struct blk_desc *desc; struct udevice *dev; - device_find_first_child(mmc->dev, &dev); + device_find_first_child_by_uclass(mmc->dev, UCLASS_BLK, &dev); if (!dev) return NULL; desc = dev_get_uclass_plat(dev); @@ -425,7 +425,7 @@ int mmc_unbind(struct udevice *dev) { struct udevice *bdev; - device_find_first_child(dev, &bdev); + device_find_first_child_by_uclass(dev, UCLASS_BLK, &bdev); if (bdev) { device_remove(bdev, DM_REMOVE_NORMAL); device_unbind(bdev); -- 2.33.0.1079.g6e70778dc9-goog