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

Commit 63aa945b authored by Tony Lindgren's avatar Tony Lindgren Committed by Paul Walmsley
Browse files

memory: omap-gpmc: Add Kconfig option for debug 



We support decoding the bootloader values if DEBUG is defined.
But we also need to change the struct omap_hwmod flags to have
HWMOD_INIT_NO_RESET to avoid the GPMC being reset during the
boot. Otherwise just the default timings will be displayed
instead of the bootloader configured timings.

This also allows us to clean up the various GPMC related
hwmod flags. For debugging, we only need HWMOD_INIT_NO_RESET,
and HWMOD_INIT_NO_IDLE is not needed.

Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Roger Quadros <rogerq@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent e2608180

arch/arm/mach-omap2/omap_hwmod.h

+6 −0
Original line number Diff line number Diff line
@@ -109,6 +109,12 @@ extern struct omap_hwmod_sysc_fields omap_hwmod_sysc_type3; 


#define DEBUG_OMAPUART_FLAGS	(HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET)



#ifdef CONFIG_OMAP_GPMC_DEBUG

#define DEBUG_OMAP_GPMC_HWMOD_FLAGS	HWMOD_INIT_NO_RESET

#else

#define DEBUG_OMAP_GPMC_HWMOD_FLAGS	0

#endif



#if defined(CONFIG_DEBUG_OMAP2UART1)

#undef DEBUG_OMAP2UART1_FLAGS

#define DEBUG_OMAP2UART1_FLAGS DEBUG_OMAPUART_FLAGS

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+2 −10
Original line number Diff line number Diff line
@@ -762,16 +762,8 @@ struct omap_hwmod omap2xxx_gpmc_hwmod = { 
	.name		= "gpmc",

	.class		= &omap2xxx_gpmc_hwmod_class,

	.main_clk	= "gpmc_fck",

	/*

	 * XXX HWMOD_INIT_NO_RESET should not be needed for this IP

	 * block.  It is not being added due to any known bugs with

	 * resetting the GPMC IP block, but rather because any timings

	 * set by the bootloader are not being correctly programmed by

	 * the kernel from the board file or DT data.

	 * HWMOD_INIT_NO_RESET should be removed ASAP.

	 */

	.flags		= (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET |

			   HWMOD_NO_IDLEST),

	/* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */

	.flags		= HWMOD_NO_IDLEST | DEBUG_OMAP_GPMC_HWMOD_FLAGS,

	.prcm		= {

		.omap2	= {

			.prcm_reg_id = 3,

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+2 −1
Original line number Diff line number Diff line
@@ -668,7 +668,8 @@ struct omap_hwmod am33xx_gpmc_hwmod = { 
	.name		= "gpmc",

	.class		= &am33xx_gpmc_hwmod_class,

	.clkdm_name	= "l3s_clkdm",

	.flags		= (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),

	/* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */

	.flags		= DEBUG_OMAP_GPMC_HWMOD_FLAGS,

	.main_clk	= "l3s_gclk",

	.prcm		= {

		.omap4	= {

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+2 −10
Original line number Diff line number Diff line
@@ -2169,16 +2169,8 @@ static struct omap_hwmod omap3xxx_gpmc_hwmod = { 
	.clkdm_name	= "core_l3_clkdm",

	.mpu_irqs	= omap3xxx_gpmc_irqs,

	.main_clk	= "gpmc_fck",

	/*

	 * XXX HWMOD_INIT_NO_RESET should not be needed for this IP

	 * block.  It is not being added due to any known bugs with

	 * resetting the GPMC IP block, but rather because any timings

	 * set by the bootloader are not being correctly programmed by

	 * the kernel from the board file or DT data.

	 * HWMOD_INIT_NO_RESET should be removed ASAP.

	 */

	.flags		= (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET |

			   HWMOD_NO_IDLEST),

	/* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */

	.flags		= HWMOD_NO_IDLEST | DEBUG_OMAP_GPMC_HWMOD_FLAGS,

};



/*

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+2 −9
Original line number Diff line number Diff line
@@ -1188,15 +1188,8 @@ static struct omap_hwmod omap44xx_gpmc_hwmod = { 
	.name		= "gpmc",

	.class		= &omap44xx_gpmc_hwmod_class,

	.clkdm_name	= "l3_2_clkdm",

	/*

	 * XXX HWMOD_INIT_NO_RESET should not be needed for this IP

	 * block.  It is not being added due to any known bugs with

	 * resetting the GPMC IP block, but rather because any timings

	 * set by the bootloader are not being correctly programmed by

	 * the kernel from the board file or DT data.

	 * HWMOD_INIT_NO_RESET should be removed ASAP.

	 */

	.flags		= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,

	/* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */

	.flags		= DEBUG_OMAP_GPMC_HWMOD_FLAGS,

	.prcm = {

		.omap4 = {

			.clkctrl_offs = OMAP4_CM_L3_2_GPMC_CLKCTRL_OFFSET,