Unverified Commit faf3b5cb authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Mark Brown
Browse files

ARM: omap2: n8x0: stop instantiating codec platform data 



As of 0426370b ("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: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20221102232004.1721864-1-dmitry.torokhov@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0d183c27

arch/arm/mach-omap2/board-n8x0.c

+0 −5
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-omap2/common-board-devices.h

+0 −2
Original line number Diff line number Diff line
@@ -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__ */

arch/arm/mach-omap2/pdata-quirks.c

+0 −1
Original line number Diff line number Diff line
@@ -440,7 +440,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",