From patchwork Thu Jun 6 16:33:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Moj=C3=ADk?= X-Patchwork-Id: 1944728 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=nic.cz header.i=@nic.cz header.a=rsa-sha256 header.s=default header.b=ENV+7vX1; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vw8zy4J6rz20KL for ; Fri, 7 Jun 2024 02:34:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 77A1788477; Thu, 6 Jun 2024 18:33:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=nic.cz 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; secure) header.d=nic.cz header.i=@nic.cz header.b="ENV+7vX1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0ACFB88216; Thu, 6 Jun 2024 18:33:39 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail.nic.cz (mail.nic.cz [217.31.204.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9E6048843A for ; Thu, 6 Jun 2024 18:33:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.mojik@nic.cz Received: from marcharch.labs.office.nic.cz (unknown [IPv6:2001:1488:fffe:6:592e:6672:3345:e2e0]) by mail.nic.cz (Postfix) with ESMTPSA id 4EA551C2B75; Thu, 6 Jun 2024 18:33:33 +0200 (CEST) Authentication-Results: mail.nic.cz; auth=pass smtp.auth=marek.mojik@nic.cz smtp.mailfrom=marek.mojik@nic.cz DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1717691613; bh=P+tgm4SM/H5pV84x1Fmbl2Ps5ssk3T0WiK1XXjIPD1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:To:Cc; b=ENV+7vX1clyixFxnUnAAyeh8hTKYoixvhBju4QLTeXsoBpUtJPzm7VajJOiaZnyIJ PqW9fti1tnjm5hYhHKRcaybVbGuvt5Jl7LJy2icb0x8hjLFifVKyj79/nUOlhC9ZKI zYGTC9uzQPPXLbgTo3zJRMC8ZQnpjtONt+pfkeOU= From: =?utf-8?q?Marek_Moj=C3=ADk?= To: u-boot@lists.denx.de Cc: kabel@kernel.org, marek.mojik@nic.cz Subject: [PATCH 5/6] powerpc: use CONFIG_IS_ENABLED() when checking for DM_SERIAL in include/asm/config.h Date: Thu, 6 Jun 2024 18:33:25 +0200 Message-ID: <20240606163326.386950-6-marek.mojik@nic.cz> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240606163326.386950-1-marek.mojik@nic.cz> References: <20240606163326.386950-1-marek.mojik@nic.cz> MIME-Version: 1.0 X-Spamd-Result: default: False [-4.10 / 20.00]; REPLY(-4.00)[]; MIME_GOOD(-0.10)[text/plain]; WHITELISTED_IP(0.00)[2001:1488:fffe:6:592e:6672:3345:e2e0]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:25192, ipnet:2001:1488::/32, country:CZ]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com] X-Rspamd-Action: no action X-Rspamd-Server: mail X-Rspamd-Queue-Id: 4EA551C2B75 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=multimap; Matched map: WHITELISTED_IP X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Use the CONFIG_IS_ENABLED() macro when checking for DM_SERIAL so that CFG_SYS_NS16550_CLK is not defined as get_serial_clock() in SPL if SPL does not have DM_SERIAL enabled. Signed-off-by: Marek Mojík Reviewed-by: Marek Behún --- arch/powerpc/include/asm/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index f0702cab14..f61f4e1ea6 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -39,7 +39,7 @@ /* The FMAN driver uses the PHYLIB infrastructure */ -#if defined(CONFIG_DM_SERIAL) && !defined(CONFIG_CLK_MPC83XX) +#if CONFIG_IS_ENABLED(DM_SERIAL) && !defined(CONFIG_CLK_MPC83XX) /* * TODO: Convert this to a clock driver exists that can give us the UART * clock here.