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

Commit 98fd1508 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'for-v3.17-rc/omap-dra72x-d74x-support-a' of... 

Merge tag 'for-v3.17-rc/omap-dra72x-d74x-support-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes

Pull "ARM: OMAP2+: DRA72x/DRA74x basic support" from Tony Lindgren:

Add basic subarchitecture support for the DRA72x and DRA74x.  These
are OMAP2+ derivative SoCs.  This should be low-risk to existing OMAP
platforms.

Basic build, boot, and PM test logs are available here:

http://www.pwsan.com/omap/testlogs/hwmod-a-early-v3.17-rc/20140827194314/

* tag 'for-v3.17-rc/omap-dra72x-d74x-support-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending

:
  ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
  ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0dc0d9e1 f7f7a29b

arch/arm/mach-omap2/omap_hwmod.c

+3 −0
Original line number Diff line number Diff line
@@ -3349,6 +3349,9 @@ int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois) 
	if (!ois)

		return 0;



	if (ois[0] == NULL) /* Empty list */

		return 0;



	if (!linkspace) {

		if (_alloc_linkspace(ois)) {

			pr_err("omap_hwmod: could not allocate link space\n");

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+20 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "i2c.h"

#include "mmc.h"

#include "wd_timer.h"

#include "soc.h"



/* Base offset for all DRA7XX interrupts external to MPUSS */

#define DRA7XX_IRQ_GIC_START	32
@@ -3261,7 +3262,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { 
	&dra7xx_l4_per3__usb_otg_ss1,

	&dra7xx_l4_per3__usb_otg_ss2,

	&dra7xx_l4_per3__usb_otg_ss3,

	&dra7xx_l4_per3__usb_otg_ss4,

	&dra7xx_l3_main_1__vcp1,

	&dra7xx_l4_per2__vcp1,

	&dra7xx_l3_main_1__vcp2,
@@ -3270,8 +3270,26 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { 
	NULL,

};



static struct omap_hwmod_ocp_if *dra74x_hwmod_ocp_ifs[] __initdata = {

	&dra7xx_l4_per3__usb_otg_ss4,

	NULL,

};



static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = {

	NULL,

};



int __init dra7xx_hwmod_init(void)

{

	int ret;



	omap_hwmod_init();

	return omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);

	ret = omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);



	if (!ret && soc_is_dra74x())

		return omap_hwmod_register_links(dra74x_hwmod_ocp_ifs);

	else if (!ret && soc_is_dra72x())

		return omap_hwmod_register_links(dra72x_hwmod_ocp_ifs);



	return ret;

}

arch/arm/mach-omap2/soc.h

+6 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ IS_AM_SUBCLASS(437x, 0x437) 
#define soc_is_omap54xx()		0

#define soc_is_omap543x()		0

#define soc_is_dra7xx()			0

#define soc_is_dra74x()			0

#define soc_is_dra72x()			0



#if defined(MULTI_OMAP2)

# if defined(CONFIG_ARCH_OMAP2)
@@ -393,7 +395,11 @@ IS_OMAP_TYPE(3430, 0x3430) 


#if defined(CONFIG_SOC_DRA7XX)

#undef soc_is_dra7xx

#undef soc_is_dra74x

#undef soc_is_dra72x

#define soc_is_dra7xx()	(of_machine_is_compatible("ti,dra7"))

#define soc_is_dra74x()	(of_machine_is_compatible("ti,dra74"))

#define soc_is_dra72x()	(of_machine_is_compatible("ti,dra72"))

#endif



/* Various silicon revisions for omap2 */