| Message ID | 20221102232004.1721864-1-dmitry.torokhov@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] arm: omap2: n8x0: stop instantiating codec platform data | expand |
On Wed, Nov 02, 2022 at 04:20:02PM -0700, Dmitry Torokhov wrote: > 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. Tony, I guess it makes sense for this to go via ASoC if you're OK with it?
* Dmitry Torokhov <dmitry.torokhov@gmail.com> [221102 23:10]: > 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. Acked-by: Tony Lindgren <tony@atomide.com>
* Mark Brown <broonie@kernel.org> [221103 12:06]: > On Wed, Nov 02, 2022 at 04:20:02PM -0700, Dmitry Torokhov wrote: > > 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. > > Tony, I guess it makes sense for this to go via ASoC if you're OK with > it? Yes please pick it via ASoC, I've acked the first patch. Regards, Tony
On Wed, 2 Nov 2022 16:20:02 -0700, Dmitry Torokhov wrote: > 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. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/3] arm: omap2: n8x0: stop instantiating codec platform data commit: faf3b5cb59f84e4056bd84f115a958bc99c61e65 [2/3] ASoC: tlv320aic3x: remove support for platform data commit: 426c7bf45f207ac7a962e012dd482f7aaa3a3d5f [3/3] ASoC: tlv320aic3x: switch to using gpiod API commit: a984d8332d90afd2989e10b095ffdb2875d4bac8 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
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index 5e86145db0e2..8897364e550b 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -22,7 +22,6 @@ #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/mmc-omap.h> #include <linux/mfd/menelaus.h> -#include <sound/tlv320aic3x.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> @@ -567,10 +566,6 @@ struct menelaus_platform_data n8x0_menelaus_platform_data = { .late_init = n8x0_menelaus_late_init, }; -struct aic3x_pdata n810_aic33_data = { - .gpio_reset = 118, -}; - static int __init n8x0_late_initcall(void) { if (!board_caps) diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h index b23962c38fb2..69694af71475 100644 --- a/arch/arm/mach-omap2/common-board-devices.h +++ b/arch/arm/mach-omap2/common-board-devices.h @@ -2,12 +2,10 @@ #ifndef __OMAP_COMMON_BOARD_DEVICES__ #define __OMAP_COMMON_BOARD_DEVICES__ -#include <sound/tlv320aic3x.h> #include <linux/mfd/menelaus.h> void *n8x0_legacy_init(void); extern struct menelaus_platform_data n8x0_menelaus_platform_data; -extern struct aic3x_pdata n810_aic33_data; #endif /* __OMAP_COMMON_BOARD_DEVICES__ */ diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index 9409b9f5711c..baba73fd6f11 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -439,7 +439,6 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = { #ifdef CONFIG_MACH_NOKIA_N8X0 OF_DEV_AUXDATA("ti,omap2420-mmc", 0x4809c000, "mmci-omap.0", NULL), OF_DEV_AUXDATA("menelaus", 0x72, "1-0072", &n8x0_menelaus_platform_data), - OF_DEV_AUXDATA("tlv320aic3x", 0x18, "2-0018", &n810_aic33_data), #endif #ifdef CONFIG_ARCH_OMAP3 OF_DEV_AUXDATA("ti,omap2-iommu", 0x5d000000, "5d000000.mmu",
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> --- arch/arm/mach-omap2/board-n8x0.c | 5 ----- arch/arm/mach-omap2/common-board-devices.h | 2 -- arch/arm/mach-omap2/pdata-quirks.c | 1 - 3 files changed, 8 deletions(-)