Message ID | 20201219174018.1114146-9-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 332b98660f964895f05277dbbc2e0fd05d04ca9b |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org 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=mxyBClWB; 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 4CytNY0NPHz9sVm for <incoming@patchwork.ozlabs.org>; Sun, 20 Dec 2020 04:42:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B216082CFD; Sat, 19 Dec 2020 18:41:14 +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="mxyBClWB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 33B0782871; Sat, 19 Dec 2020 18:40:46 +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.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 C550982869 for <u-boot@lists.denx.de>; Sat, 19 Dec 2020 18:40:41 +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-io1-xd32.google.com with SMTP id m23so5155396ioy.2 for <u-boot@lists.denx.de>; Sat, 19 Dec 2020 09:40:41 -0800 (PST) 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=bUyeCEYSkOpI1BSBU64FH51MjZ3pTcM88WN2PRq1ihg=; b=mxyBClWBt0S54hC5KCgopPUZQ/WhVcGPwqjyhwPEaG6+axfxR3mUwMiCq7fxq6i533 NY+GGHYDcgu4IQcztuU/85E8md5tOy+L/T3i+U2BO/G/p0m6Yn+kdzQwQ6vMf3cHkGFB Iz142cqqoddY7ZmHC6aFUexe7F/hVij7EAYNI= 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=bUyeCEYSkOpI1BSBU64FH51MjZ3pTcM88WN2PRq1ihg=; b=NQ/j0pDbOvQxa+lDFumPkALQLRNIt/xg4JNLAtqbVehSe/XAM//kVn2449nIZ7soXI CO/Su2U0fH7gnE8+u4IZCVUB0cDM4ot91+31sahO8cfEQ5D+TStP+7cILYz2JDgwppDj tKqSvxt61of9yVwjh+hldymueocNbTXBqADbhKnsEz0jDPf+ZTeRmAl8OBKR/Q8MVc/k /w2VzIM+L1VQa3/26ZZF8LJhO+MpA4KXx3jH2zTg6pML7HbIdkRrC9vNg478nUIUGz+8 8C6JOGsJL7A0y0hWKYXFRP4VhKuUIyzaBJTtl01YFjIC64fWLKAsGFgeRlGrp9kvthPP ja8A== X-Gm-Message-State: AOAM530aP4Y1j4C3vsr5MvK5rwo/L5Nt7h1Jnk4Apy/I4xIMfoCLPU7P xz6yTbdv07siQ3ldqZLLUp28HcN6QcIfNdz3 X-Google-Smtp-Source: ABdhPJxF16C3WSdsHPiT6FkjbgpUmrFFqrFGOX7jiyjFJ1zEt+jUAB/jEigO8v1WYMq0ySSA4dnZfw== X-Received: by 2002:a05:6638:296:: with SMTP id c22mr9094014jaq.65.1608399640443; Sat, 19 Dec 2020 09:40:40 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id n10sm9781962ila.69.2020.12.19.09.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Dec 2020 09:40:40 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Simon Glass <sjg@chromium.org>, Bin Meng <bmeng.cn@gmail.com> Subject: [PATCH 10/26] x86: apl: Use struct spi_nor instead of struct spi_flash Date: Sat, 19 Dec 2020 10:40:02 -0700 Message-Id: <20201219174018.1114146-9-sjg@chromium.org> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog In-Reply-To: <20201219174018.1114146-1-sjg@chromium.org> References: <20201219174018.1114146-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
dm: Preparation for enhanced of-platdata (part C)
|
expand
|
This construct effectively uses struct spi_nor due to a #define in
spi-nor.h so we may as well use that struct here. This allows dtoc to
parse it correctly.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/x86/cpu/apollolake/spl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-dm/next, thanks!
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c index 16a2f15c6bc..8991d5e648e 100644 --- a/arch/x86/cpu/apollolake/spl.c +++ b/arch/x86/cpu/apollolake/spl.c @@ -97,7 +97,7 @@ U_BOOT_DRIVER(winbond_w25q128fw) = { .id = UCLASS_SPI_FLASH, .of_match = apl_flash_ids, .probe = apl_flash_probe, - .priv_auto = sizeof(struct spi_flash), + .priv_auto = sizeof(struct spi_nor), .ops = &apl_flash_ops, };
This construct effectively uses struct spi_nor due to a #define in spi-nor.h so we may as well use that struct here. This allows dtoc to parse it correctly. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/cpu/apollolake/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)