Message ID | 20230130151612.212732-115-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.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=lrBLJNsM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Brx2YgPz1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:28:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E601D85A15; Mon, 30 Jan 2023 16:23:10 +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="lrBLJNsM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B60738593F; Mon, 30 Jan 2023 16:18:35 +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.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 EE94C85984 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:17:53 +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-il1-x136.google.com with SMTP id i17so5067425ils.11 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:17:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S0cJw+b+KnErPm1DwaLq68TgmjMOdogCRm8D0ft6hJU=; b=lrBLJNsM/YtXQl3klvMz+LanvQnKabd07/a36FLoaF2IzBUGM7ZdOm3oeUkydHtOnz mFRPlLkOiXM10QK5eM/3wf6xo/4LJb1nfNsTH/0y4+i59a1qQXKDNzbxqwSqefjMdyJT sggEmaZ0a+C7bc4TJMkuQb11aZ22aDThiPUkI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S0cJw+b+KnErPm1DwaLq68TgmjMOdogCRm8D0ft6hJU=; b=H5DK2FBFop+6YMRM6bNNYadewvw3Za84L7wPmN7U99zPomeF3dxVgIKgA1kH5ktPAp UpQqasOvkwr14lg2VDm6MlWUsdCzM+KFjZK1DBljPh2jZymBbKAHPlKUTX4OX9frWUAs 1wYJePSIkiYDCTE+BBSaU8BvtS5zTwpsOExxrN9Dah0Rt2dcx0QcLRoqe1PubkrGksnt NSPTauhwtlNTZOq7pbRWoKOQZnzjRIcivFeddPpvgwpLJqGRNDkyFH5Bu+BX/DAfJJdK kuodQgWlbO7QUGlBcedYqsXcSDQ8MFo9cNFNy7fOqM3Dk43OGQreQHFvH5ReA7hiYh+7 QWNA== X-Gm-Message-State: AO0yUKWizZc5WgAxLHXfRzhNZJYY+AMQBPx9aUE0OQVR/U35kslYBY3v ULpQ7oLxfHycGNU4dIfYQH0K1NUfnt/4ZDUq X-Google-Smtp-Source: AK7set90Y4WgMioRBt2e6MgedadJaCpLQi8R6Hf/h9wyb4E1uS7Pj+CwET7OAptTeSHs5Qze5k1Buw== X-Received: by 2002:a92:c546:0:b0:310:c16d:9611 with SMTP id a6-20020a92c546000000b00310c16d9611mr12042079ilj.25.1675091838764; Mon, 30 Jan 2023 07:17:18 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:18 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Lukasz Majewski <lukma@denx.de>, Sean Anderson <seanga2@gmail.com> Subject: [PATCH 114/171] Correct SPL uses of NXP_FSPI Date: Mon, 30 Jan 2023 08:15:15 -0700 Message-Id: <20230130151612.212732-115-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
None
|
expand
|
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index b5c253e4966..663b9a1bc7e 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -86,7 +86,7 @@ static const char *imx8mm_wdog_sels[] = {"clock-osc-24m", "sys_pll1_133m", "sys_ static const char *imx8mm_usdhc3_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m", "sys_pll3_out", "sys_pll1_266m", "audio_pll2_clk", "sys_pll1_100m", }; -#if CONFIG_IS_ENABLED(NXP_FSPI) +#if IS_ENABLED(CONFIG_NXP_FSPI) static const char *imx8mm_qspi_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll2_333m", "sys_pll2_500m", "audio_pll2_out", "sys_pll1_266m", "sys_pll3_out", "sys_pll1_100m", }; #endif @@ -355,7 +355,7 @@ static int imx8mm_clk_probe(struct udevice *dev) imx_clk_gate4("ecspi3_root_clk", "ecspi3", base + 0x4090, 0)); #endif -#if CONFIG_IS_ENABLED(NXP_FSPI) +#if IS_ENABLED(CONFIG_NXP_FSPI) clk_dm(IMX8MM_CLK_QSPI, imx8m_clk_composite("qspi", imx8mm_qspi_sels, base + 0xab80)); clk_dm(IMX8MM_CLK_QSPI_ROOT,
This converts 2 usages of this option to the non-SPL form, since there is no SPL_NXP_FSPI defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- drivers/clk/imx/clk-imx8mm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)