Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: omap2: n8x0: stop instantiating codec platform data

As of 0426370b58b2 ("ARM: dts: omap2420-n810: Correct the audio codec
(tlv320aic33) node") the DTS properly specifies reset GPIO, and the
device name in auxdata lookup table does not even match the one in
device tree anymore, so stop instantiating it.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20221102232004.1721864-1-dmitry.torokhov@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Dmitry Torokhov and committed by
Mark Brown
faf3b5cb 0d183c27

-8
-5
arch/arm/mach-omap2/board-n8x0.c
··· 22 22 #include <linux/platform_data/spi-omap2-mcspi.h> 23 23 #include <linux/platform_data/mmc-omap.h> 24 24 #include <linux/mfd/menelaus.h> 25 - #include <sound/tlv320aic3x.h> 26 25 27 26 #include <asm/mach/arch.h> 28 27 #include <asm/mach-types.h> ··· 564 565 565 566 struct menelaus_platform_data n8x0_menelaus_platform_data = { 566 567 .late_init = n8x0_menelaus_late_init, 567 - }; 568 - 569 - struct aic3x_pdata n810_aic33_data = { 570 - .gpio_reset = 118, 571 568 }; 572 569 573 570 static int __init n8x0_late_initcall(void)
-2
arch/arm/mach-omap2/common-board-devices.h
··· 2 2 #ifndef __OMAP_COMMON_BOARD_DEVICES__ 3 3 #define __OMAP_COMMON_BOARD_DEVICES__ 4 4 5 - #include <sound/tlv320aic3x.h> 6 5 #include <linux/mfd/menelaus.h> 7 6 8 7 void *n8x0_legacy_init(void); 9 8 10 9 extern struct menelaus_platform_data n8x0_menelaus_platform_data; 11 - extern struct aic3x_pdata n810_aic33_data; 12 10 13 11 #endif /* __OMAP_COMMON_BOARD_DEVICES__ */
-1
arch/arm/mach-omap2/pdata-quirks.c
··· 440 440 #ifdef CONFIG_MACH_NOKIA_N8X0 441 441 OF_DEV_AUXDATA("ti,omap2420-mmc", 0x4809c000, "mmci-omap.0", NULL), 442 442 OF_DEV_AUXDATA("menelaus", 0x72, "1-0072", &n8x0_menelaus_platform_data), 443 - OF_DEV_AUXDATA("tlv320aic3x", 0x18, "2-0018", &n810_aic33_data), 444 443 #endif 445 444 #ifdef CONFIG_ARCH_OMAP3 446 445 OF_DEV_AUXDATA("ti,omap2-iommu", 0x5d000000, "5d000000.mmu",