From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
linux-mips@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
"Maciej W . Rozycki" <macro@orcam.me.uk>,
Sander Vanheule <sander@svanheule.net>,
Bert Vermeulen <bert@biot.com>,
Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>,
Serge Semin <Sergey.Semin@baikalelectronics.ru>,
Paul Burton <paulburton@kernel.org>,
Daniel Silsby <dansilsby@gmail.com>,
Paul Cercueil <paul@crapouillou.net>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: [PATCH 8/9] mips: txx9: remove left-over for removed TXX9_ACLC configs
Date: Mon, 13 Dec 2021 12:16:41 +0100 [thread overview]
Message-ID: <20211213111642.11317-9-lukas.bulwahn@gmail.com> (raw)
In-Reply-To: <20211213111642.11317-1-lukas.bulwahn@gmail.com>
The patch series "Remove support for TX49xx" (see Link) was only partially
applied: The ASoC driver was removed with commit a8644292ea46 ("ASoC:
txx9: Remove driver"), which was patch 10/10 from that series. The mips
architecture code to be removed with patch 1/10 from that series was not
applied.
This partial patch series application leaves the build config setup and
code in the mips architecture in a slightly unclean, intermediate state.
The configs HAS_TXX9_ACLC and SND_SOC_TXX9ACLC were removed, but are still
referenced in the txx9-architecture Kconfig and generic setup.
The script ./scripts/checkkconfigsymbols.py warns about this:
HAS_TXX9_ACLC
Referencing files: arch/mips/txx9/Kconfig
SND_SOC_TXX9ACLC
Referencing files: arch/mips/txx9/generic/setup.c
Clean up the code for those removed references.
Link: https://lore.kernel.org/all/20210105140305.141401-1-tsbogend@alpha.franken.de/
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
arch/mips/txx9/Kconfig | 3 ---
arch/mips/txx9/generic/setup.c | 28 ----------------------------
2 files changed, 31 deletions(-)
diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig
index a5484c284353..d9710fddac4f 100644
--- a/arch/mips/txx9/Kconfig
+++ b/arch/mips/txx9/Kconfig
@@ -64,7 +64,6 @@ config SOC_TX4927
select IRQ_TXX9
select PCI_TX4927
select GPIO_TXX9
- imply HAS_TXX9_ACLC
config SOC_TX4938
bool
@@ -74,7 +73,6 @@ config SOC_TX4938
select IRQ_TXX9
select PCI_TX4927
select GPIO_TXX9
- imply HAS_TXX9_ACLC
config SOC_TX4939
bool
@@ -82,7 +80,6 @@ config SOC_TX4939
imply HAS_TXX9_SERIAL
select HAVE_PCI
select PCI_TX4927
- imply HAS_TXX9_ACLC
config TXX9_7SEGLED
bool
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 5c42da622b8b..c7c1e30e8f3b 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -835,34 +835,6 @@ void __init txx9_aclc_init(unsigned long baseaddr, int irq,
unsigned int dma_chan_out,
unsigned int dma_chan_in)
{
-#if IS_ENABLED(CONFIG_SND_SOC_TXX9ACLC)
- unsigned int dma_base = dmac_id * TXX9_DMA_MAX_NR_CHANNELS;
- struct resource res[] = {
- {
- .start = baseaddr,
- .end = baseaddr + 0x100 - 1,
- .flags = IORESOURCE_MEM,
- }, {
- .start = irq,
- .flags = IORESOURCE_IRQ,
- }, {
- .name = "txx9dmac-chan",
- .start = dma_base + dma_chan_out,
- .flags = IORESOURCE_DMA,
- }, {
- .name = "txx9dmac-chan",
- .start = dma_base + dma_chan_in,
- .flags = IORESOURCE_DMA,
- }
- };
- struct platform_device *pdev =
- platform_device_alloc("txx9aclc-ac97", -1);
-
- if (!pdev ||
- platform_device_add_resources(pdev, res, ARRAY_SIZE(res)) ||
- platform_device_add(pdev))
- platform_device_put(pdev);
-#endif
}
static struct bus_type txx9_sramc_subsys = {
--
2.26.2
next prev parent reply other threads:[~2021-12-13 11:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 11:16 [PATCH 0/9] Kconfig symbol clean-up on ./arch/mips/ Lukas Bulwahn
2021-12-13 11:16 ` [PATCH 1/9] mips: drop selecting the non-existing config SYS_HAS_EARLY_PRINTK_8250 Lukas Bulwahn
2021-12-13 18:52 ` Sander Vanheule
2021-12-14 12:25 ` Lukas Bulwahn
2021-12-15 20:17 ` Sander Vanheule
2021-12-13 11:16 ` [PATCH 2/9] mips: add SYS_HAS_CPU_MIPS64_R5 config for MIPS Release 5 support Lukas Bulwahn
2021-12-13 11:16 ` [PATCH 3/9] mips: drop selecting non-existing config NR_CPUS_DEFAULT_2 Lukas Bulwahn
2021-12-13 11:16 ` [PATCH 4/9] mips: dec: provide the correctly capitalized config CPU_R4X00 in init error message Lukas Bulwahn
2021-12-13 11:16 ` [PATCH 5/9] mips: kgdb: adjust the comment to the actual ifdef condition Lukas Bulwahn
2021-12-13 11:16 ` [PATCH 6/9] mips: remove obsolete selection of CPU_HAS_LOAD_STORE_LR Lukas Bulwahn
2021-12-13 11:16 ` [PATCH 7/9] mips: alchemy: remove historic comment on gpio build constraints Lukas Bulwahn
2021-12-13 11:16 ` Lukas Bulwahn [this message]
2021-12-13 11:16 ` [PATCH 9/9] mips: fix Kconfig reference to PHYS_ADDR_T_64BIT Lukas Bulwahn
2021-12-16 15:03 ` [PATCH 0/9] Kconfig symbol clean-up on ./arch/mips/ Thomas Bogendoerfer
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=20211213111642.11317-9-lukas.bulwahn@gmail.com \
--to=lukas.bulwahn@gmail.com \
--cc=Alexey.Malahov@baikalelectronics.ru \
--cc=Sergey.Semin@baikalelectronics.ru \
--cc=bert@biot.com \
--cc=dansilsby@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=macro@orcam.me.uk \
--cc=paul@crapouillou.net \
--cc=paulburton@kernel.org \
--cc=sander@svanheule.net \
--cc=tsbogend@alpha.franken.de \
/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;
as well as URLs for NNTP newsgroup(s).