In order to avoid conflict with the new omap4-dt.c board file, remove the .dt_compat entry from the pandaboard regular board file. Any DT work for OMAP4 will have to be done on the generic DT board file to avoid breaking the legacy board support until DT migration is done.
Signed-off-by: Benoit Cousson <[email protected]> Cc: Tony Lindgren <[email protected]> --- arch/arm/mach-omap2/board-omap4panda.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 1c583c7..9aaa960 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -581,11 +581,6 @@ static void __init omap4_panda_map_io(void) omap44xx_map_common_io(); } -static const char *omap4_panda_match[] __initdata = { - "ti,omap4-panda", - NULL, -}; - MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") /* Maintainer: David Anders - Texas Instruments Inc */ .boot_params = 0x80000100, @@ -595,5 +590,4 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") .init_irq = gic_init_irq, .init_machine = omap4_panda_init, .timer = &omap4_timer, - .dt_compat = omap4_panda_match, MACHINE_END -- 1.7.0.4 _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
