Commit 2028103f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-devel-am33xx-for-v3.6' of... 

Merge tag 'omap-devel-am33xx-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

From Tony Lindgren <tony@atomide.com>:

Here are changes to add support for am33xx processors for the
clock, power, and voltagedomains.

* tag 'omap-devel-am33xx-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations
  ARM: OMAP AM33xx: powerdomains: add AM335x support
  ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details
  ARM: OMAP AM33xx: PRM: add PRM support
  ARM: OMAP AM33xx: voltagedomain: Add voltage domain data
  ARM: OMAP2+: control: Add AM33XX control reg & sec clkctrl offset
  ARM: OMAP2+: am33xx: Add AM335XEVM machine support
  ARM: OMAP2+: am33xx: Add low level debugging support

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 47d4ed78 6fd8246b

arch/arm/mach-omap2/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ obj-$(CONFIG_ARCH_OMAP3) += vc3xxx_data.o vp3xxx_data.o 
obj-$(CONFIG_ARCH_OMAP4)		+= prcm.o cminst44xx.o cm44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= prcm_mpu44xx.o prminst44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= vc44xx_data.o vp44xx_data.o prm44xx.o

obj-$(CONFIG_SOC_AM33XX)		+= prcm.o prm33xx.o cm33xx.o



# OMAP voltage domains

voltagedomain-common			:= voltage.o vc.o vp.o
@@ -99,6 +100,7 @@ obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) 
obj-$(CONFIG_ARCH_OMAP3)		+= voltagedomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= voltagedomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)                += voltagedomains33xx_data.o



# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o
@@ -113,6 +115,8 @@ obj-$(CONFIG_ARCH_OMAP3) += powerdomains2xxx_3xxx_data.o 
obj-$(CONFIG_ARCH_OMAP4)		+= $(powerdomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= powerdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= powerdomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= powerdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= powerdomains33xx_data.o



# PRCM clockdomain control

clockdomain-common			+= clockdomain.o
@@ -129,6 +133,8 @@ obj-$(CONFIG_ARCH_OMAP3) += clockdomains3xxx_data.o 
obj-$(CONFIG_ARCH_OMAP4)		+= $(clockdomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= clockdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= clockdomains33xx_data.o



# Clock framework

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o

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

+18 −0
Original line number Diff line number Diff line
@@ -112,6 +112,24 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
MACHINE_END

#endif



#ifdef CONFIG_SOC_AM33XX

static const char *am33xx_boards_compat[] __initdata = {

	"ti,am33xx",

	NULL,

};



DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")

	.reserve	= omap_reserve,

	.map_io		= am33xx_map_io,

	.init_early	= am33xx_init_early,

	.init_irq	= omap_init_irq,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.timer		= &omap3_am33xx_timer,

	.dt_compat	= am33xx_boards_compat,

MACHINE_END

#endif



#ifdef CONFIG_ARCH_OMAP4

static const char *omap4_boards_compat[] __initdata = {

	"ti,omap4",

arch/arm/mach-omap2/clockdomain.h

+2 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ int clkdm_hwmod_disable(struct clockdomain *clkdm, struct omap_hwmod *oh); 
extern void __init omap242x_clockdomains_init(void);

extern void __init omap243x_clockdomains_init(void);

extern void __init omap3xxx_clockdomains_init(void);

extern void __init am33xx_clockdomains_init(void);

extern void __init omap44xx_clockdomains_init(void);

extern void _clkdm_add_autodeps(struct clockdomain *clkdm);

extern void _clkdm_del_autodeps(struct clockdomain *clkdm);
@@ -202,6 +203,7 @@ extern void _clkdm_del_autodeps(struct clockdomain *clkdm); 
extern struct clkdm_ops omap2_clkdm_operations;

extern struct clkdm_ops omap3_clkdm_operations;

extern struct clkdm_ops omap4_clkdm_operations;

extern struct clkdm_ops am33xx_clkdm_operations;



extern struct clkdm_dep gfx_24xx_wkdeps[];

extern struct clkdm_dep dsp_24xx_wkdeps[];

arch/arm/mach-omap2/clockdomain33xx.c

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * AM33XX clockdomain control

 *

 * Copyright (C) 2011-2012 Texas Instruments Incorporated - http://www.ti.com/

 * Vaibhav Hiremath <hvaibhav@ti.com>

 *

 * Derived from mach-omap2/clockdomain44xx.c written by Rajendra Nayak

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/kernel.h>



#include "clockdomain.h"

#include "cm33xx.h"





static int am33xx_clkdm_sleep(struct clockdomain *clkdm)

{

	am33xx_cm_clkdm_force_sleep(clkdm->cm_inst, clkdm->clkdm_offs);

	return 0;

}



static int am33xx_clkdm_wakeup(struct clockdomain *clkdm)

{

	am33xx_cm_clkdm_force_wakeup(clkdm->cm_inst, clkdm->clkdm_offs);

	return 0;

}



static void am33xx_clkdm_allow_idle(struct clockdomain *clkdm)

{

	am33xx_cm_clkdm_enable_hwsup(clkdm->cm_inst, clkdm->clkdm_offs);

}



static void am33xx_clkdm_deny_idle(struct clockdomain *clkdm)

{

	am33xx_cm_clkdm_disable_hwsup(clkdm->cm_inst, clkdm->clkdm_offs);

}



static int am33xx_clkdm_clk_enable(struct clockdomain *clkdm)

{

	if (clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)

		return am33xx_clkdm_wakeup(clkdm);



	return 0;

}



static int am33xx_clkdm_clk_disable(struct clockdomain *clkdm)

{

	bool hwsup = false;



	hwsup = am33xx_cm_is_clkdm_in_hwsup(clkdm->cm_inst, clkdm->clkdm_offs);



	if (!hwsup && (clkdm->flags & CLKDM_CAN_FORCE_SLEEP))

		am33xx_clkdm_sleep(clkdm);



	return 0;

}



struct clkdm_ops am33xx_clkdm_operations = {

	.clkdm_sleep		= am33xx_clkdm_sleep,

	.clkdm_wakeup		= am33xx_clkdm_wakeup,

	.clkdm_allow_idle	= am33xx_clkdm_allow_idle,

	.clkdm_deny_idle	= am33xx_clkdm_deny_idle,

	.clkdm_clk_enable	= am33xx_clkdm_clk_enable,

	.clkdm_clk_disable	= am33xx_clkdm_clk_disable,

};

arch/arm/mach-omap2/clockdomains33xx_data.c

0 → 100644
+196 −0
Original line number Diff line number Diff line 
/*

 * AM33XX Clock Domain data.

 *

 * Copyright (C) 2011-2012 Texas Instruments Incorporated - http://www.ti.com/

 * Vaibhav Hiremath <hvaibhav@ti.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/kernel.h>

#include <linux/io.h>



#include "clockdomain.h"

#include "cm.h"

#include "cm33xx.h"

#include "cm-regbits-33xx.h"



static struct clockdomain l4ls_am33xx_clkdm = {

	.name		= "l4ls_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_L4LS_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain l3s_am33xx_clkdm = {

	.name		= "l3s_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_L3S_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain l4fw_am33xx_clkdm = {

	.name		= "l4fw_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_L4FW_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain l3_am33xx_clkdm = {

	.name		= "l3_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_L3_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain l4hs_am33xx_clkdm = {

	.name		= "l4hs_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_L4HS_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain ocpwp_l3_am33xx_clkdm = {

	.name		= "ocpwp_l3_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_OCPWP_L3_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain pruss_ocp_am33xx_clkdm = {

	.name		= "pruss_ocp_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_PRUSS_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain cpsw_125mhz_am33xx_clkdm = {

	.name		= "cpsw_125mhz_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_CPSW_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain lcdc_am33xx_clkdm = {

	.name		= "lcdc_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_LCDC_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain clk_24mhz_am33xx_clkdm = {

	.name		= "clk_24mhz_clkdm",

	.pwrdm		= { .name = "per_pwrdm" },

	.cm_inst	= AM33XX_CM_PER_MOD,

	.clkdm_offs	= AM33XX_CM_PER_CLK_24MHZ_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain l4_wkup_am33xx_clkdm = {

	.name		= "l4_wkup_clkdm",

	.pwrdm		= { .name = "wkup_pwrdm" },

	.cm_inst	= AM33XX_CM_WKUP_MOD,

	.clkdm_offs	= AM33XX_CM_WKUP_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain l3_aon_am33xx_clkdm = {

	.name		= "l3_aon_clkdm",

	.pwrdm		= { .name = "wkup_pwrdm" },

	.cm_inst	= AM33XX_CM_WKUP_MOD,

	.clkdm_offs	= AM33XX_CM_L3_AON_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain l4_wkup_aon_am33xx_clkdm = {

	.name		= "l4_wkup_aon_clkdm",

	.pwrdm		= { .name = "wkup_pwrdm" },

	.cm_inst	= AM33XX_CM_WKUP_MOD,

	.clkdm_offs	= AM33XX_CM_L4_WKUP_AON_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain mpu_am33xx_clkdm = {

	.name		= "mpu_clkdm",

	.pwrdm		= { .name = "mpu_pwrdm" },

	.cm_inst	= AM33XX_CM_MPU_MOD,

	.clkdm_offs	= AM33XX_CM_MPU_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain l4_rtc_am33xx_clkdm = {

	.name		= "l4_rtc_clkdm",

	.pwrdm		= { .name = "rtc_pwrdm" },

	.cm_inst	= AM33XX_CM_RTC_MOD,

	.clkdm_offs	= AM33XX_CM_RTC_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain gfx_l3_am33xx_clkdm = {

	.name		= "gfx_l3_clkdm",

	.pwrdm		= { .name = "gfx_pwrdm" },

	.cm_inst	= AM33XX_CM_GFX_MOD,

	.clkdm_offs	= AM33XX_CM_GFX_L3_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain gfx_l4ls_gfx_am33xx_clkdm = {

	.name		= "gfx_l4ls_gfx_clkdm",

	.pwrdm		= { .name = "gfx_pwrdm" },

	.cm_inst	= AM33XX_CM_GFX_MOD,

	.clkdm_offs	= AM33XX_CM_GFX_L4LS_GFX_CLKSTCTRL__1_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain l4_cefuse_am33xx_clkdm = {

	.name		= "l4_cefuse_clkdm",

	.pwrdm		= { .name = "cefuse_pwrdm" },

	.cm_inst	= AM33XX_CM_CEFUSE_MOD,

	.clkdm_offs	= AM33XX_CM_CEFUSE_CLKSTCTRL_OFFSET,

	.flags		= CLKDM_CAN_SWSUP,

};



static struct clockdomain *clockdomains_am33xx[] __initdata = {

	&l4ls_am33xx_clkdm,

	&l3s_am33xx_clkdm,

	&l4fw_am33xx_clkdm,

	&l3_am33xx_clkdm,

	&l4hs_am33xx_clkdm,

	&ocpwp_l3_am33xx_clkdm,

	&pruss_ocp_am33xx_clkdm,

	&cpsw_125mhz_am33xx_clkdm,

	&lcdc_am33xx_clkdm,

	&clk_24mhz_am33xx_clkdm,

	&l4_wkup_am33xx_clkdm,

	&l3_aon_am33xx_clkdm,

	&l4_wkup_aon_am33xx_clkdm,

	&mpu_am33xx_clkdm,

	&l4_rtc_am33xx_clkdm,

	&gfx_l3_am33xx_clkdm,

	&gfx_l4ls_gfx_am33xx_clkdm,

	&l4_cefuse_am33xx_clkdm,

	NULL,

};



void __init am33xx_clockdomains_init(void)

{

	clkdm_register_platform_funcs(&am33xx_clkdm_operations);

	clkdm_register_clkdms(clockdomains_am33xx);

	clkdm_complete_init();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE