diff options
| author | Lukas Bulwahn <lukas.bulwahn@gmail.com> | 2021-12-13 12:16:41 +0100 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2021-12-16 15:53:21 +0100 |
| commit | ddc18bd714188bc9b9a09f42317b8050c6ea5160 (patch) | |
| tree | a0f47116e7f06b21a16a33322f262fa24b76d793 /arch/mips | |
| parent | a51f0824d8bb08884ee2106dbbe68f4b8d860bc4 (diff) | |
mips: txx9: remove left-over for removed TXX9_ACLC configs
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>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/txx9/Kconfig | 3 | ||||
| -rw-r--r-- | arch/mips/txx9/generic/setup.c | 28 |
2 files changed, 0 insertions, 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 = { |