|
@@ -18,9 +18,6 @@
|
|
|
#include <linux/err.h>
|
|
|
#include <linux/io.h>
|
|
|
|
|
|
-#include "soc.h"
|
|
|
-#include "iomap.h"
|
|
|
-#include "common.h"
|
|
|
#include "prm2xxx_3xxx.h"
|
|
|
#include "cm.h"
|
|
|
#include "cm3xxx.h"
|
|
@@ -388,7 +385,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 = readl_relaxed(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 +416,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 = readl_relaxed(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 +518,8 @@ void omap3_cm_restore_context(void)
|
|
|
CM_CLKSEL1);
|
|
|
omap2_cm_write_mod_reg(cm_context.iva2_cm_clksel2, OMAP3430_IVA2_MOD,
|
|
|
CM_CLKSEL2);
|
|
|
- writel_relaxed(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 +547,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);
|
|
|
- writel_relaxed(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,
|
|
@@ -669,19 +670,11 @@ static struct cm_ll_data omap3xxx_cm_ll_data = {
|
|
|
|
|
|
int __init omap3xxx_cm_init(void)
|
|
|
{
|
|
|
- if (!cpu_is_omap34xx())
|
|
|
- return 0;
|
|
|
-
|
|
|
return cm_register(&omap3xxx_cm_ll_data);
|
|
|
}
|
|
|
|
|
|
static void __exit omap3xxx_cm_exit(void)
|
|
|
{
|
|
|
- if (!cpu_is_omap34xx())
|
|
|
- return;
|
|
|
-
|
|
|
- /* Should never happen */
|
|
|
- WARN(cm_unregister(&omap3xxx_cm_ll_data),
|
|
|
- "%s: cm_ll_data function pointer mismatch\n", __func__);
|
|
|
+ cm_unregister(&omap3xxx_cm_ll_data);
|
|
|
}
|
|
|
__exitcall(omap3xxx_cm_exit);
|