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

Commit b21be7bc authored by Tero Kristo's avatar Tero Kristo Committed by Paul Walmsley
Browse files

ARM: OMAP3: CM: remove a few OMAP34XX_CM_REGADDR defines 



Remove a few OMAP34XX_CM_REGADDR defines and replace these with offset
based register accesses instead.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent c9eaa447

arch/arm/mach-omap2/cm3xxx.c

+8 −4
Original line number Diff line number Diff line
@@ -388,7 +388,8 @@ void omap3_cm_save_context(void) 
		omap2_cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSEL1);

	cm_context.iva2_cm_clksel2 =

		omap2_cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSEL2);

	cm_context.cm_sysconfig = __raw_readl(OMAP3430_CM_SYSCONFIG);

	cm_context.cm_sysconfig =

		omap2_cm_read_mod_reg(OCP_MOD, OMAP3430_CM_SYSCONFIG);

	cm_context.sgx_cm_clksel =

		omap2_cm_read_mod_reg(OMAP3430ES2_SGX_MOD, CM_CLKSEL);

	cm_context.dss_cm_clksel =
@@ -418,7 +419,8 @@ void omap3_cm_save_context(void) 
		omap2_cm_read_mod_reg(PLL_MOD, OMAP3430ES2_CM_CLKSEL5);

	cm_context.pll_cm_clken2 =

		omap2_cm_read_mod_reg(PLL_MOD, OMAP3430ES2_CM_CLKEN2);

	cm_context.cm_polctrl = __raw_readl(OMAP3430_CM_POLCTRL);

	cm_context.cm_polctrl =

		omap2_cm_read_mod_reg(OCP_MOD, OMAP3430_CM_POLCTRL);

	cm_context.iva2_cm_fclken =

		omap2_cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_FCLKEN);

	cm_context.iva2_cm_clken_pll =
@@ -519,7 +521,8 @@ void omap3_cm_restore_context(void) 
			       CM_CLKSEL1);

	omap2_cm_write_mod_reg(cm_context.iva2_cm_clksel2, OMAP3430_IVA2_MOD,

			       CM_CLKSEL2);

	__raw_writel(cm_context.cm_sysconfig, OMAP3430_CM_SYSCONFIG);

	omap2_cm_write_mod_reg(cm_context.cm_sysconfig, OCP_MOD,

			       OMAP3430_CM_SYSCONFIG);

	omap2_cm_write_mod_reg(cm_context.sgx_cm_clksel, OMAP3430ES2_SGX_MOD,

			       CM_CLKSEL);

	omap2_cm_write_mod_reg(cm_context.dss_cm_clksel, OMAP3430_DSS_MOD,
@@ -547,7 +550,8 @@ void omap3_cm_restore_context(void) 
			       OMAP3430ES2_CM_CLKSEL5);

	omap2_cm_write_mod_reg(cm_context.pll_cm_clken2, PLL_MOD,

			       OMAP3430ES2_CM_CLKEN2);

	__raw_writel(cm_context.cm_polctrl, OMAP3430_CM_POLCTRL);

	omap2_cm_write_mod_reg(cm_context.cm_polctrl, OCP_MOD,

			       OMAP3430_CM_POLCTRL);

	omap2_cm_write_mod_reg(cm_context.iva2_cm_fclken, OMAP3430_IVA2_MOD,

			       CM_FCLKEN);

	omap2_cm_write_mod_reg(cm_context.iva2_cm_clken_pll, OMAP3430_IVA2_MOD,

arch/arm/mach-omap2/cm3xxx.h

+2 −3
Original line number Diff line number Diff line
@@ -29,9 +29,8 @@ 
 * These registers appear once per CM module.

 */



#define OMAP3430_CM_REVISION		OMAP34XX_CM_REGADDR(OCP_MOD, 0x0000)

#define OMAP3430_CM_SYSCONFIG		OMAP34XX_CM_REGADDR(OCP_MOD, 0x0010)

#define OMAP3430_CM_POLCTRL		OMAP34XX_CM_REGADDR(OCP_MOD, 0x009c)

#define OMAP3430_CM_SYSCONFIG		0x0010

#define OMAP3430_CM_POLCTRL		0x009c



#define OMAP3_CM_CLKOUT_CTRL_OFFSET	0x0070

#define OMAP3430_CM_CLKOUT_CTRL		OMAP_CM_REGADDR(OMAP3430_CCR_MOD, 0x0070)