Commit 234c91d4 authored by Lokesh Vutla's avatar Lokesh Vutla Committed by Tony Lindgren
Browse files

ARM: OMAP2+: dra762: Register package specific hwmod 



Register dra762 abz package specific hwmod. Also move registering rtc hwmod
into respective SoC conditional statements instead of doing it separately.

Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 987d13f6

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+19 −8
Original line number Diff line number Diff line
@@ -4019,6 +4019,10 @@ static struct omap_hwmod_ocp_if *dra76x_hwmod_ocp_ifs[] __initdata = { 
	NULL,

};



static struct omap_hwmod_ocp_if *acd_76x_hwmod_ocp_ifs[] __initdata = {

	NULL,

};



static struct omap_hwmod_ocp_if *dra74x_hwmod_ocp_ifs[] __initdata = {

	&dra7xx_l4_per3__usb_otg_ss4,

	NULL,
@@ -4028,7 +4032,7 @@ static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = { 
	NULL,

};



static struct omap_hwmod_ocp_if *dra74x_dra72x_hwmod_ocp_ifs[] __initdata = {

static struct omap_hwmod_ocp_if *rtc_hwmod_ocp_ifs[] __initdata = {

	&dra7xx_l4_per3__rtcss,

	NULL,

};
@@ -4040,19 +4044,26 @@ int __init dra7xx_hwmod_init(void) 
	omap_hwmod_init();

	ret = omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);



	if (!ret && soc_is_dra74x())

	if (!ret && soc_is_dra74x()) {

		ret = omap_hwmod_register_links(dra74x_hwmod_ocp_ifs);

	else if (!ret && soc_is_dra72x())

		if (!ret)

			ret = omap_hwmod_register_links(rtc_hwmod_ocp_ifs);

	} else if (!ret && soc_is_dra72x()) {

		ret = omap_hwmod_register_links(dra72x_hwmod_ocp_ifs);

	else if (!ret && soc_is_dra76x())

		if (!ret && !of_machine_is_compatible("ti,dra718"))

			ret = omap_hwmod_register_links(rtc_hwmod_ocp_ifs);

	} else if (!ret && soc_is_dra76x()) {

		ret = omap_hwmod_register_links(dra76x_hwmod_ocp_ifs);



		if (!ret && soc_is_dra76x_acd()) {

			ret = omap_hwmod_register_links(acd_76x_hwmod_ocp_ifs);

		} else if (!ret && soc_is_dra76x_abz()) {

			ret = omap_hwmod_register_links(rtc_hwmod_ocp_ifs);

		}

	}



	if (!ret && omap_type() == OMAP2_DEVICE_TYPE_GP)

		ret = omap_hwmod_register_links(dra7xx_gp_hwmod_ocp_ifs);



	/* now for the IPs available only in dra74 and dra72 */

	if (!ret && !of_machine_is_compatible("ti,dra718") && !soc_is_dra76x())

		ret = omap_hwmod_register_links(dra74x_dra72x_hwmod_ocp_ifs);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE