Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e7a3185 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Use pdata quirk support for board-generic.c 



Let's use platform data quirk support for board-generic.c.
This removes all board specific hacks out of board-generic.c.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 6a08e1e6

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

+0 −32
Original line number Diff line number Diff line
@@ -15,13 +15,10 @@ 
#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/irqdomain.h>

#include <linux/clk.h>



#include <asm/mach/arch.h>



#include "common.h"

#include "common-board-devices.h"

#include "dss-common.h"



#if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))

#define intc_of_init	NULL
@@ -36,41 +33,12 @@ static struct of_device_id omap_dt_match_table[] __initdata = { 
	{ }

};



/*

 * Create alias for USB host PHY clock.

 * Remove this when clock phandle can be provided via DT

 */

static void __init legacy_init_ehci_clk(char *clkname)

{

	int ret;



	ret = clk_add_alias("main_clk", NULL, clkname, NULL);

	if (ret) {

		pr_err("%s:Failed to add main_clk alias to %s :%d\n",

						__func__, clkname, ret);

	}

}



static void __init omap_generic_init(void)

{

	omap_sdrc_init(NULL, NULL);



	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);

	pdata_quirks_init();



	/*

	 * HACK: call display setup code for selected boards to enable omapdss.

	 * This will be removed when omapdss supports DT.

	 */

	if (of_machine_is_compatible("ti,omap4-panda")) {

		omap4_panda_display_init_of();

		legacy_init_ehci_clk("auxclk3_ck");



	}

	else if (of_machine_is_compatible("ti,omap4-sdp"))

		omap_4430sdp_display_init_of();

	else if (of_machine_is_compatible("ti,omap5-uevm"))

		legacy_init_ehci_clk("auxclk1_ck");

}



#ifdef CONFIG_SOC_OMAP2420

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

+41 −0
Original line number Diff line number Diff line
@@ -20,7 +20,48 @@ struct pdata_init { 
	void (*fn)(void);

};



/*

 * Create alias for USB host PHY clock.

 * Remove this when clock phandle can be provided via DT

 */

static void __init __used legacy_init_ehci_clk(char *clkname)

{

	int ret;



	ret = clk_add_alias("main_clk", NULL, clkname, NULL);

	if (ret)

		pr_err("%s:Failed to add main_clk alias to %s :%d\n",

		       __func__, clkname, ret);

}



#ifdef CONFIG_ARCH_OMAP4

static void __init omap4_sdp_legacy_init(void)

{

	omap_4430sdp_display_init_of();

}



static void __init omap4_panda_legacy_init(void)

{

	omap4_panda_display_init_of();

	legacy_init_ehci_clk("auxclk3_ck");

}

#endif



#ifdef CONFIG_SOC_OMAP5

static void __init omap5_uevm_legacy_init(void)

{

	legacy_init_ehci_clk("auxclk1_ck");

}

#endif



static struct pdata_init pdata_quirks[] __initdata = {

#ifdef CONFIG_ARCH_OMAP4

	{ "ti,omap4-sdp", omap4_sdp_legacy_init, },

	{ "ti,omap4-panda", omap4_panda_legacy_init, },

#endif

#ifdef CONFIG_SOC_OMAP5

	{ "ti,omap5-uevm", omap5_uevm_legacy_init, },

#endif

	{ /* sentinel */ },

};