From patchwork Mon Mar 15 04:25:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1452903 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=QUS/xuSX; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DzNhQ4cZLz9sR4 for ; Mon, 15 Mar 2021 15:28:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0B8B282955; Mon, 15 Mar 2021 05:27:47 +0100 (CET) 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="QUS/xuSX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 334B782955; Mon, 15 Mar 2021 05:27:36 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) (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 57EDB82927 for ; Mon, 15 Mar 2021 05:27:32 +0100 (CET) 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-pg1-x534.google.com with SMTP id q5so7057585pgk.5 for ; Sun, 14 Mar 2021 21:27:32 -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=xZ150bm8NSCKgloNgBpdQLB2NGrC4FmygcXeGIImsEc=; b=QUS/xuSXlvtKZpi33CtLWiCWB7ukZd9Mzr23VXKD5UvxyEh/gxUsWK1WgdafuNX6+m YdUwIPPgSmxQ3L7MMCqIqORfJ6a1jBnBpSyhhhkL/UviHVTmgJGFN4vxaOKzBW8Jvvso ocgTU0Vdtiw44O0OIty11mtVfbBvoKG8lI/1w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xZ150bm8NSCKgloNgBpdQLB2NGrC4FmygcXeGIImsEc=; b=a1aA5cvwKVEMMr3l9Sp24bHQ9YaWc+Xup2dqKRRf0STO1sXf8OnLoVWObQ7vDE4P32 fK9zwxzFzB8WSZ2iyYeN8EEv8qWiadrWw9xctwX7HKSo8w5dWEg3Wncgv/P5jRRrT02j oGn0ivp78R5lGC4X7Pm5pm5eEujy6s3R21TmXX57Vn2VNfgwtvPZbc3wSWrpuaVJnvN9 wQJ+gwQ7l1cFd/+55TH7xGwL67bDQq6JgilxOc5uv7WhU2DHe/ZrmfPLc9sJVZEBvQms 8+cPQJljsMt7S1fUmW7+sP4/VOPuJY+YanpvpHH7hgqzan0fzNPOOkX+/dr9WD3OArTi xQvQ== X-Gm-Message-State: AOAM531kiqN/ho3TXXkChHYuIwdCkPKABczeC36xqgvPfYa/5NbUavvN qOTFlt3016FdLUhfuZxMKgCKFztMXby62bx6 X-Google-Smtp-Source: ABdhPJwv7C60pXHaGjesBfUhQStTMWGlI7WajEdjOMf/RkIoUkvi/mQNYg3Dn3QOt6MjB5V6GPW6Bw== X-Received: by 2002:a63:df09:: with SMTP id u9mr21585428pgg.64.1615782450597; Sun, 14 Mar 2021 21:27:30 -0700 (PDT) Received: from sjg1.roam.corp.google.com (85.72.69.111.dynamic.snap.net.nz. [111.69.72.85]) by smtp.gmail.com with ESMTPSA id u22sm11239481pgh.20.2021.03.14.21.27.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 21:27:30 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Marek Vasut , Bin Meng , Walter Lozano , Bernhard Messerklinger , Simon Glass , Pavel Herrmann Subject: [PATCH v4 06/42] dm: core: Adjust uclass setup with of-platdata Date: Mon, 15 Mar 2021 17:25:16 +1300 Message-Id: <20210315172537.v4.6.I30dc7335f97a218b7a30b5ffa6a4d254e7266238@changeid> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210315042553.1932494-1-sjg@chromium.org> References: <20210315042553.1932494-1-sjg@chromium.org> MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean When OF_PLATDATA_INST is enabled we don't need to create the uclass list. Instead we just need to point to the existing list. Update the code accordingly. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- (no changes since v1) drivers/core/root.c | 8 ++++++-- include/dm/root.h | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/core/root.c b/drivers/core/root.c index 9bc682cffea..3feadb77b56 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -140,8 +140,12 @@ int dm_init(bool of_live) dm_warn("Virtual root driver already exists!\n"); return -EINVAL; } - gd->uclass_root = &DM_UCLASS_ROOT_S_NON_CONST; - INIT_LIST_HEAD(DM_UCLASS_ROOT_NON_CONST); + if (CONFIG_IS_ENABLED(OF_PLATDATA_INST)) { + gd->uclass_root = &uclass_head; + } else { + gd->uclass_root = &DM_UCLASS_ROOT_S_NON_CONST; + INIT_LIST_HEAD(DM_UCLASS_ROOT_NON_CONST); + } if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) { fix_drivers(); diff --git a/include/dm/root.h b/include/dm/root.h index 89afbee6196..42510b106ab 100644 --- a/include/dm/root.h +++ b/include/dm/root.h @@ -11,6 +11,9 @@ struct udevice; +/* Head of the uclass list if CONFIG_OF_PLATDATA_INST is enabled */ +extern struct list_head uclass_head; + /** * dm_root() - Return pointer to the top of the driver tree *