ASoC: fsl: eukrea-tlv320: update board checks to use the DT
PATCH v2 1/1 ASoC: fsl: eukrea-tlv320: update board checks to use the DT
The eukrea-tlv320 driver contains checks for ARM machine IDs via machine_is_*() macros. The boards concerned now support only FDT booting, which does not use machine IDs, and therefore the code should be updated to check the DT compatible property instead. Non-DT booting support for these machines was removed in these commits:
commit f2f55499942a ("ARM: imx: Remove eukrea_mbimxsd35 non-dt support") commit 3877942b0c7f ("ARM: imx25: Remove eukrea mx25 board files") commit 7c5deaf77526 ("ARM: i.MX: Remove mach-cpuimx27sd board file") commit 8da4d6b2f798 ("ARM: mx51: Remove mach-cpuimx51sd board file")
The presence of these machine ID checks prevents the removal of machine IDs no longer used by the kernel from arch/arm/tools/mach-types, because the machine_is_*() macros are generated from mach-types. To resolve this issue, use of_machine_is_compatible() instead.
---
Changes in v2:
Remove unused <asm/mach-types.h> inclusion
Adjust commit message style to match subsystem
sound/soc/fsl/eukrea-tlv320.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
sound/soc/fsl/eukrea-tlv320.c +5 -6
@@ -19,7 +19,6 @@#include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> -#include <asm/mach-types.h> #include "../codecs/tlv320aic23.h" #include "imx-ssi.h"
@@ -142,7 +141,7 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) eukrea_tlv320.name ="cpuimx-audio" ; } -if (machine_is_eukrea_cpuimx27 () || +if (of_machine_is_compatible ("eukrea,cpuimx27" ) || (tmp_np =of_find_compatible_node (NULL ,NULL ,"fsl,imx21-audmux" ))) { imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, IMX_AUDMUX_V1_PCR_SYN |
@@ -159,12 +158,12 @@ static int eukrea_tlv320_probe(struct platform_device *pdev)IMX_AUDMUX_V1_PCR_RXDSEL (MX27_AUDMUX_HPCR1_SSI0 ) );of_node_put (tmp_np); - }else if (machine_is_eukrea_cpuimx25sd () || -machine_is_eukrea_cpuimx35sd () || -machine_is_eukrea_cpuimx51sd () || + }else if (of_machine_is_compatible ("eukrea,cpuimx25" ) || +of_machine_is_compatible ("eukrea,cpuimx35" ) || +of_machine_is_compatible ("eukrea,cpuimx51" ) || (tmp_np =of_find_compatible_node (NULL ,NULL ,"fsl,imx31-audmux" ))) {if (!np) - ext_port =machine_is_eukrea_cpuimx25sd () ? + ext_port =of_machine_is_compatible ("eukrea,cpuimx25" ) ?4 :3 ; imx_audmux_v2_configure_port(int_port,
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 1 line · Ethan Nelson-Moore
ASoC: fsl: eukrea-tlv320: update board checks to use the DT
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.2
Thanks!
[1/1] ASoC: fsl: eukrea-tlv320: update board checks to use the DT
https://git.kernel.org/broonie/sound/c/3760befa5c08
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark