From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Max Filippov <jcmvbkbc@gmail.com>,
Sasha Levin <sashal@kernel.org>,
chris@zankel.net, linux@roeck-us.net,
linux-xtensa@linux-xtensa.org
Subject: [PATCH AUTOSEL 4.19 2/5] xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF
Date: Tue, 12 Oct 2021 20:56:15 -0400 [thread overview]
Message-ID: <20211013005619.700553-2-sashal@kernel.org> (raw)
In-Reply-To: <20211013005619.700553-1-sashal@kernel.org>
From: Max Filippov <jcmvbkbc@gmail.com>
[ Upstream commit f3d7c2cdf6dc0d5402ec29c3673893b3542c5ad1 ]
Use platform data to initialize xtfpga device drivers when CONFIG_USE_OF
is not selected. This fixes xtfpga networking when CONFIG_USE_OF is not
selected but CONFIG_OF is.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/xtensa/platforms/xtfpga/setup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/xtensa/platforms/xtfpga/setup.c b/arch/xtensa/platforms/xtfpga/setup.c
index 42285f35d313..982e7c22e7ca 100644
--- a/arch/xtensa/platforms/xtfpga/setup.c
+++ b/arch/xtensa/platforms/xtfpga/setup.c
@@ -85,7 +85,7 @@ void __init platform_calibrate_ccount(void)
#endif
-#ifdef CONFIG_OF
+#ifdef CONFIG_USE_OF
static void __init xtfpga_clk_setup(struct device_node *np)
{
@@ -303,4 +303,4 @@ static int __init xtavnet_init(void)
*/
arch_initcall(xtavnet_init);
-#endif /* CONFIG_OF */
+#endif /* CONFIG_USE_OF */
--
2.33.0
next prev parent reply other threads:[~2021-10-13 0:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 0:56 [PATCH AUTOSEL 4.19 1/5] ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default Sasha Levin
2021-10-13 0:56 ` Sasha Levin [this message]
2021-10-13 0:56 ` [PATCH AUTOSEL 4.19 3/5] xtensa: xtfpga: Try software restart before simulating CPU reset Sasha Levin
2021-10-13 0:56 ` [PATCH AUTOSEL 4.19 4/5] NFSD: Keep existing listeners on portlist error Sasha Levin
2021-10-13 0:56 ` [PATCH AUTOSEL 4.19 5/5] powerpc/security: Add a helper to query stf_barrier type Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211013005619.700553-2-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=chris@zankel.net \
--cc=jcmvbkbc@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@roeck-us.net \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox