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

Commit f5a60d4e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-fixes-for-v3.6-rc4' of... 

Merge tag 'omap-fixes-for-v3.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for timer, sram, memory corruption, and one board file that affect
booting on various omaps. Then some PM related fixes for reset, sleep
and wakeup.

* tag 'omap-fixes-for-v3.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4: Fix array size for irq_target_cpu
  ARM: OMAP4: hwmod data: temporarily comment out data for the sl2if IP block
  ARM: OMAP: hwmod code: Disable module when hwmod enable fails
  ARM: OMAP3: hwmod data: fix iva2 reset info
  ARM: OMAP3xxx: clockdomain: fix software supervised wakeup/sleep
  ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention
  ARM: OMAP: Config fix for omap3-touchbook board
  ARM: OMAP: sram: skip the first 16K on OMAP3 HS
  ARM: OMAP: sram: fix OMAP4 errata handling
  ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER
parents eeea3ac9 6ab019b6

arch/arm/mach-omap2/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -232,10 +232,11 @@ config MACH_OMAP3_PANDORA 
	select OMAP_PACKAGE_CBB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_OMAP3_TOUCHBOOK

config MACH_TOUCHBOOK

	bool "OMAP3 Touch Book"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB



config MACH_OMAP_3430SDP

	bool "OMAP 3430 SDP board"

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ obj-$(CONFIG_MACH_OMAP_3630SDP) += board-zoom-display.o 
obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o

obj-$(CONFIG_MACH_CM_T3517)		+= board-cm-t3517.o

obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o

obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o

obj-$(CONFIG_MACH_TOUCHBOOK)		+= board-omap3touchbook.o

obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o

obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o

arch/arm/mach-omap2/clock33xx_data.c

+7 −7
Original line number Diff line number Diff line
@@ -1036,13 +1036,13 @@ static struct omap_clk am33xx_clks[] = { 
	CLK(NULL,	"mmu_fck",		&mmu_fck,	CK_AM33XX),

	CLK(NULL,	"smartreflex0_fck",	&smartreflex0_fck,	CK_AM33XX),

	CLK(NULL,	"smartreflex1_fck",	&smartreflex1_fck,	CK_AM33XX),

	CLK(NULL,	"gpt1_fck",		&timer1_fck,	CK_AM33XX),

	CLK(NULL,	"gpt2_fck",		&timer2_fck,	CK_AM33XX),

	CLK(NULL,	"gpt3_fck",		&timer3_fck,	CK_AM33XX),

	CLK(NULL,	"gpt4_fck",		&timer4_fck,	CK_AM33XX),

	CLK(NULL,	"gpt5_fck",		&timer5_fck,	CK_AM33XX),

	CLK(NULL,	"gpt6_fck",		&timer6_fck,	CK_AM33XX),

	CLK(NULL,	"gpt7_fck",		&timer7_fck,	CK_AM33XX),

	CLK(NULL,	"timer1_fck",		&timer1_fck,	CK_AM33XX),

	CLK(NULL,	"timer2_fck",		&timer2_fck,	CK_AM33XX),

	CLK(NULL,	"timer3_fck",		&timer3_fck,	CK_AM33XX),

	CLK(NULL,	"timer4_fck",		&timer4_fck,	CK_AM33XX),

	CLK(NULL,	"timer5_fck",		&timer5_fck,	CK_AM33XX),

	CLK(NULL,	"timer6_fck",		&timer6_fck,	CK_AM33XX),

	CLK(NULL,	"timer7_fck",		&timer7_fck,	CK_AM33XX),

	CLK(NULL,	"usbotg_fck",		&usbotg_fck,	CK_AM33XX),

	CLK(NULL,	"ieee5000_fck",		&ieee5000_fck,	CK_AM33XX),

	CLK(NULL,	"wdt1_fck",		&wdt1_fck,	CK_AM33XX),

arch/arm/mach-omap2/clockdomain2xxx_3xxx.c

+48 −2
Original line number Diff line number Diff line
@@ -241,6 +241,52 @@ static void omap3_clkdm_deny_idle(struct clockdomain *clkdm) 
		_clkdm_del_autodeps(clkdm);

}



static int omap3xxx_clkdm_clk_enable(struct clockdomain *clkdm)

{

	bool hwsup = false;



	if (!clkdm->clktrctrl_mask)

		return 0;



	hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,

				clkdm->clktrctrl_mask);



	if (hwsup) {

		/* Disable HW transitions when we are changing deps */

		_disable_hwsup(clkdm);

		_clkdm_add_autodeps(clkdm);

		_enable_hwsup(clkdm);

	} else {

		if (clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)

			omap3_clkdm_wakeup(clkdm);

	}



	return 0;

}



static int omap3xxx_clkdm_clk_disable(struct clockdomain *clkdm)

{

	bool hwsup = false;



	if (!clkdm->clktrctrl_mask)

		return 0;



	hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,

				clkdm->clktrctrl_mask);



	if (hwsup) {

		/* Disable HW transitions when we are changing deps */

		_disable_hwsup(clkdm);

		_clkdm_del_autodeps(clkdm);

		_enable_hwsup(clkdm);

	} else {

		if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP)

			omap3_clkdm_sleep(clkdm);

	}



	return 0;

}



struct clkdm_ops omap2_clkdm_operations = {

	.clkdm_add_wkdep	= omap2_clkdm_add_wkdep,

	.clkdm_del_wkdep	= omap2_clkdm_del_wkdep,
@@ -267,6 +313,6 @@ struct clkdm_ops omap3_clkdm_operations = { 
	.clkdm_wakeup		= omap3_clkdm_wakeup,

	.clkdm_allow_idle	= omap3_clkdm_allow_idle,

	.clkdm_deny_idle	= omap3_clkdm_deny_idle,

	.clkdm_clk_enable	= omap2_clkdm_clk_enable,

	.clkdm_clk_disable	= omap2_clkdm_clk_disable,

	.clkdm_clk_enable	= omap3xxx_clkdm_clk_enable,

	.clkdm_clk_disable	= omap3xxx_clkdm_clk_disable,

};

arch/arm/mach-omap2/cm-regbits-34xx.h

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#define OMAP3430_EN_IVA2_DPLL_MASK			(0x7 << 0)



/* CM_IDLEST_IVA2 */

#define OMAP3430_ST_IVA2_SHIFT				0

#define OMAP3430_ST_IVA2_MASK				(1 << 0)



/* CM_IDLEST_PLL_IVA2 */