|
|
@@ -166,6 +166,31 @@
|
|
|
*/
|
|
|
#define LINKS_PER_OCP_IF 2
|
|
|
|
|
|
+/**
|
|
|
+ * struct omap_hwmod_soc_ops - fn ptrs for some SoC-specific operations
|
|
|
+ * @enable_module: function to enable a module (via MODULEMODE)
|
|
|
+ * @disable_module: function to disable a module (via MODULEMODE)
|
|
|
+ *
|
|
|
+ * XXX Eventually this functionality will be hidden inside the PRM/CM
|
|
|
+ * device drivers. Until then, this should avoid huge blocks of cpu_is_*()
|
|
|
+ * conditionals in this code.
|
|
|
+ */
|
|
|
+struct omap_hwmod_soc_ops {
|
|
|
+ void (*enable_module)(struct omap_hwmod *oh);
|
|
|
+ int (*disable_module)(struct omap_hwmod *oh);
|
|
|
+ int (*wait_target_ready)(struct omap_hwmod *oh);
|
|
|
+ int (*assert_hardreset)(struct omap_hwmod *oh,
|
|
|
+ struct omap_hwmod_rst_info *ohri);
|
|
|
+ int (*deassert_hardreset)(struct omap_hwmod *oh,
|
|
|
+ struct omap_hwmod_rst_info *ohri);
|
|
|
+ int (*is_hardreset_asserted)(struct omap_hwmod *oh,
|
|
|
+ struct omap_hwmod_rst_info *ohri);
|
|
|
+ int (*init_clkdm)(struct omap_hwmod *oh);
|
|
|
+};
|
|
|
+
|
|
|
+/* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
|
|
|
+static struct omap_hwmod_soc_ops soc_ops;
|
|
|
+
|
|
|
/* omap_hwmod_list contains all registered struct omap_hwmods */
|
|
|
static LIST_HEAD(omap_hwmod_list);
|
|
|
|
|
|
@@ -186,6 +211,9 @@ static struct omap_hwmod_link *linkspace;
|
|
|
*/
|
|
|
static unsigned short free_ls, max_ls, ls_supp;
|
|
|
|
|
|
+/* inited: set to true once the hwmod code is initialized */
|
|
|
+static bool inited;
|
|
|
+
|
|
|
/* Private functions */
|
|
|
|
|
|
/**
|
|
|
@@ -771,23 +799,19 @@ static void _disable_optional_clocks(struct omap_hwmod *oh)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * _enable_module - enable CLKCTRL modulemode on OMAP4
|
|
|
+ * _omap4_enable_module - enable CLKCTRL modulemode on OMAP4
|
|
|
* @oh: struct omap_hwmod *
|
|
|
*
|
|
|
* Enables the PRCM module mode related to the hwmod @oh.
|
|
|
* No return value.
|
|
|
*/
|
|
|
-static void _enable_module(struct omap_hwmod *oh)
|
|
|
+static void _omap4_enable_module(struct omap_hwmod *oh)
|
|
|
{
|
|
|
- /* The module mode does not exist prior OMAP4 */
|
|
|
- if (cpu_is_omap24xx() || cpu_is_omap34xx())
|
|
|
- return;
|
|
|
-
|
|
|
if (!oh->clkdm || !oh->prcm.omap4.modulemode)
|
|
|
return;
|
|
|
|
|
|
- pr_debug("omap_hwmod: %s: _enable_module: %d\n",
|
|
|
- oh->name, oh->prcm.omap4.modulemode);
|
|
|
+ pr_debug("omap_hwmod: %s: %s: %d\n",
|
|
|
+ oh->name, __func__, oh->prcm.omap4.modulemode);
|
|
|
|
|
|
omap4_cminst_module_enable(oh->prcm.omap4.modulemode,
|
|
|
oh->clkdm->prcm_partition,
|
|
|
@@ -807,10 +831,7 @@ static void _enable_module(struct omap_hwmod *oh)
|
|
|
*/
|
|
|
static int _omap4_wait_target_disable(struct omap_hwmod *oh)
|
|
|
{
|
|
|
- if (!cpu_is_omap44xx())
|
|
|
- return 0;
|
|
|
-
|
|
|
- if (!oh)
|
|
|
+ if (!oh || !oh->clkdm)
|
|
|
return -EINVAL;
|
|
|
|
|
|
if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
|
|
|
@@ -1285,24 +1306,20 @@ static struct omap_hwmod *_lookup(const char *name)
|
|
|
|
|
|
return oh;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* _init_clkdm - look up a clockdomain name, store pointer in omap_hwmod
|
|
|
* @oh: struct omap_hwmod *
|
|
|
*
|
|
|
* Convert a clockdomain name stored in a struct omap_hwmod into a
|
|
|
* clockdomain pointer, and save it into the struct omap_hwmod.
|
|
|
- * return -EINVAL if clkdm_name does not exist or if the lookup failed.
|
|
|
+ * Return -EINVAL if the clkdm_name lookup failed.
|
|
|
*/
|
|
|
static int _init_clkdm(struct omap_hwmod *oh)
|
|
|
{
|
|
|
- if (cpu_is_omap24xx() || cpu_is_omap34xx())
|
|
|
+ if (!oh->clkdm_name)
|
|
|
return 0;
|
|
|
|
|
|
- if (!oh->clkdm_name) {
|
|
|
- pr_warning("omap_hwmod: %s: no clkdm_name\n", oh->name);
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
-
|
|
|
oh->clkdm = clkdm_lookup(oh->clkdm_name);
|
|
|
if (!oh->clkdm) {
|
|
|
pr_warning("omap_hwmod: %s: could not associate to clkdm %s\n",
|
|
|
@@ -1338,7 +1355,8 @@ static int _init_clocks(struct omap_hwmod *oh, void *data)
|
|
|
ret |= _init_main_clk(oh);
|
|
|
ret |= _init_interface_clks(oh);
|
|
|
ret |= _init_opt_clks(oh);
|
|
|
- ret |= _init_clkdm(oh);
|
|
|
+ if (soc_ops.init_clkdm)
|
|
|
+ ret |= soc_ops.init_clkdm(oh);
|
|
|
|
|
|
if (!ret)
|
|
|
oh->_state = _HWMOD_STATE_CLKS_INITED;
|
|
|
@@ -1348,53 +1366,6 @@ static int _init_clocks(struct omap_hwmod *oh, void *data)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * _wait_target_ready - wait for a module to leave slave idle
|
|
|
- * @oh: struct omap_hwmod *
|
|
|
- *
|
|
|
- * Wait for a module @oh to leave slave idle. Returns 0 if the module
|
|
|
- * does not have an IDLEST bit or if the module successfully leaves
|
|
|
- * slave idle; otherwise, pass along the return value of the
|
|
|
- * appropriate *_cm*_wait_module_ready() function.
|
|
|
- */
|
|
|
-static int _wait_target_ready(struct omap_hwmod *oh)
|
|
|
-{
|
|
|
- struct omap_hwmod_ocp_if *os;
|
|
|
- int ret;
|
|
|
-
|
|
|
- if (!oh)
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
- if (oh->flags & HWMOD_NO_IDLEST)
|
|
|
- return 0;
|
|
|
-
|
|
|
- os = _find_mpu_rt_port(oh);
|
|
|
- if (!os)
|
|
|
- return 0;
|
|
|
-
|
|
|
- /* XXX check module SIDLEMODE */
|
|
|
-
|
|
|
- /* XXX check clock enable states */
|
|
|
-
|
|
|
- if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
|
|
|
- ret = omap2_cm_wait_module_ready(oh->prcm.omap2.module_offs,
|
|
|
- oh->prcm.omap2.idlest_reg_id,
|
|
|
- oh->prcm.omap2.idlest_idle_bit);
|
|
|
- } else if (cpu_is_omap44xx()) {
|
|
|
- if (!oh->clkdm)
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
- ret = omap4_cminst_wait_module_ready(oh->clkdm->prcm_partition,
|
|
|
- oh->clkdm->cm_inst,
|
|
|
- oh->clkdm->clkdm_offs,
|
|
|
- oh->prcm.omap4.clkctrl_offs);
|
|
|
- } else {
|
|
|
- BUG();
|
|
|
- };
|
|
|
-
|
|
|
- return ret;
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* _lookup_hardreset - fill register bit info for this hwmod/reset line
|
|
|
* @oh: struct omap_hwmod *
|
|
|
@@ -1431,32 +1402,31 @@ static u8 _lookup_hardreset(struct omap_hwmod *oh, const char *name,
|
|
|
* @oh: struct omap_hwmod *
|
|
|
* @name: name of the reset line to lookup and assert
|
|
|
*
|
|
|
- * Some IP like dsp, ipu or iva contain processor that require
|
|
|
- * an HW reset line to be assert / deassert in order to enable fully
|
|
|
- * the IP.
|
|
|
+ * Some IP like dsp, ipu or iva contain processor that require an HW
|
|
|
+ * reset line to be assert / deassert in order to enable fully the IP.
|
|
|
+ * Returns -EINVAL if @oh is null, -ENOSYS if we have no way of
|
|
|
+ * asserting the hardreset line on the currently-booted SoC, or passes
|
|
|
+ * along the return value from _lookup_hardreset() or the SoC's
|
|
|
+ * assert_hardreset code.
|
|
|
*/
|
|
|
static int _assert_hardreset(struct omap_hwmod *oh, const char *name)
|
|
|
{
|
|
|
struct omap_hwmod_rst_info ohri;
|
|
|
- u8 ret;
|
|
|
+ u8 ret = -EINVAL;
|
|
|
|
|
|
if (!oh)
|
|
|
return -EINVAL;
|
|
|
|
|
|
+ if (!soc_ops.assert_hardreset)
|
|
|
+ return -ENOSYS;
|
|
|
+
|
|
|
ret = _lookup_hardreset(oh, name, &ohri);
|
|
|
if (IS_ERR_VALUE(ret))
|
|
|
return ret;
|
|
|
|
|
|
- if (cpu_is_omap24xx() || cpu_is_omap34xx())
|
|
|
- return omap2_prm_assert_hardreset(oh->prcm.omap2.module_offs,
|
|
|
- ohri.rst_shift);
|
|
|
- else if (cpu_is_omap44xx())
|
|
|
- return omap4_prminst_assert_hardreset(ohri.rst_shift,
|
|
|
- oh->clkdm->pwrdm.ptr->prcm_partition,
|
|
|
- oh->clkdm->pwrdm.ptr->prcm_offs,
|
|
|
- oh->prcm.omap4.rstctrl_offs);
|
|
|
- else
|
|
|
- return -EINVAL;
|
|
|
+ ret = soc_ops.assert_hardreset(oh, &ohri);
|
|
|
+
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -1465,38 +1435,29 @@ static int _assert_hardreset(struct omap_hwmod *oh, const char *name)
|
|
|
* @oh: struct omap_hwmod *
|
|
|
* @name: name of the reset line to look up and deassert
|
|
|
*
|
|
|
- * Some IP like dsp, ipu or iva contain processor that require
|
|
|
- * an HW reset line to be assert / deassert in order to enable fully
|
|
|
- * the IP.
|
|
|
+ * Some IP like dsp, ipu or iva contain processor that require an HW
|
|
|
+ * reset line to be assert / deassert in order to enable fully the IP.
|
|
|
+ * Returns -EINVAL if @oh is null, -ENOSYS if we have no way of
|
|
|
+ * deasserting the hardreset line on the currently-booted SoC, or passes
|
|
|
+ * along the return value from _lookup_hardreset() or the SoC's
|
|
|
+ * deassert_hardreset code.
|
|
|
*/
|
|
|
static int _deassert_hardreset(struct omap_hwmod *oh, const char *name)
|
|
|
{
|
|
|
struct omap_hwmod_rst_info ohri;
|
|
|
- int ret;
|
|
|
+ int ret = -EINVAL;
|
|
|
|
|
|
if (!oh)
|
|
|
return -EINVAL;
|
|
|
|
|
|
+ if (!soc_ops.deassert_hardreset)
|
|
|
+ return -ENOSYS;
|
|
|
+
|
|
|
ret = _lookup_hardreset(oh, name, &ohri);
|
|
|
if (IS_ERR_VALUE(ret))
|
|
|
return ret;
|
|
|
|
|
|
- if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
|
|
|
- ret = omap2_prm_deassert_hardreset(oh->prcm.omap2.module_offs,
|
|
|
- ohri.rst_shift,
|
|
|
- ohri.st_shift);
|
|
|
- } else if (cpu_is_omap44xx()) {
|
|
|
- if (ohri.st_shift)
|
|
|
- pr_err("omap_hwmod: %s: %s: hwmod data error: OMAP4 does not support st_shift\n",
|
|
|
- oh->name, name);
|
|
|
- ret = omap4_prminst_deassert_hardreset(ohri.rst_shift,
|
|
|
- oh->clkdm->pwrdm.ptr->prcm_partition,
|
|
|
- oh->clkdm->pwrdm.ptr->prcm_offs,
|
|
|
- oh->prcm.omap4.rstctrl_offs);
|
|
|
- } else {
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
-
|
|
|
+ ret = soc_ops.deassert_hardreset(oh, &ohri);
|
|
|
if (ret == -EBUSY)
|
|
|
pr_warning("omap_hwmod: %s: failed to hardreset\n", oh->name);
|
|
|
|
|
|
@@ -1509,31 +1470,28 @@ static int _deassert_hardreset(struct omap_hwmod *oh, const char *name)
|
|
|
* @oh: struct omap_hwmod *
|
|
|
* @name: name of the reset line to look up and read
|
|
|
*
|
|
|
- * Return the state of the reset line.
|
|
|
+ * Return the state of the reset line. Returns -EINVAL if @oh is
|
|
|
+ * null, -ENOSYS if we have no way of reading the hardreset line
|
|
|
+ * status on the currently-booted SoC, or passes along the return
|
|
|
+ * value from _lookup_hardreset() or the SoC's is_hardreset_asserted
|
|
|
+ * code.
|
|
|
*/
|
|
|
static int _read_hardreset(struct omap_hwmod *oh, const char *name)
|
|
|
{
|
|
|
struct omap_hwmod_rst_info ohri;
|
|
|
- u8 ret;
|
|
|
+ u8 ret = -EINVAL;
|
|
|
|
|
|
if (!oh)
|
|
|
return -EINVAL;
|
|
|
|
|
|
+ if (!soc_ops.is_hardreset_asserted)
|
|
|
+ return -ENOSYS;
|
|
|
+
|
|
|
ret = _lookup_hardreset(oh, name, &ohri);
|
|
|
if (IS_ERR_VALUE(ret))
|
|
|
return ret;
|
|
|
|
|
|
- if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
|
|
|
- return omap2_prm_is_hardreset_asserted(oh->prcm.omap2.module_offs,
|
|
|
- ohri.st_shift);
|
|
|
- } else if (cpu_is_omap44xx()) {
|
|
|
- return omap4_prminst_is_hardreset_asserted(ohri.rst_shift,
|
|
|
- oh->clkdm->pwrdm.ptr->prcm_partition,
|
|
|
- oh->clkdm->pwrdm.ptr->prcm_offs,
|
|
|
- oh->prcm.omap4.rstctrl_offs);
|
|
|
- } else {
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
+ return soc_ops.is_hardreset_asserted(oh, &ohri);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -1571,10 +1529,6 @@ static int _omap4_disable_module(struct omap_hwmod *oh)
|
|
|
{
|
|
|
int v;
|
|
|
|
|
|
- /* The module mode does not exist prior OMAP4 */
|
|
|
- if (!cpu_is_omap44xx())
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
if (!oh->clkdm || !oh->prcm.omap4.modulemode)
|
|
|
return -EINVAL;
|
|
|
|
|
|
@@ -1814,9 +1768,11 @@ static int _enable(struct omap_hwmod *oh)
|
|
|
}
|
|
|
|
|
|
_enable_clocks(oh);
|
|
|
- _enable_module(oh);
|
|
|
+ if (soc_ops.enable_module)
|
|
|
+ soc_ops.enable_module(oh);
|
|
|
|
|
|
- r = _wait_target_ready(oh);
|
|
|
+ r = (soc_ops.wait_target_ready) ? soc_ops.wait_target_ready(oh) :
|
|
|
+ -EINVAL;
|
|
|
if (!r) {
|
|
|
/*
|
|
|
* Set the clockdomain to HW_AUTO only if the target is ready,
|
|
|
@@ -1870,7 +1826,8 @@ static int _idle(struct omap_hwmod *oh)
|
|
|
_idle_sysc(oh);
|
|
|
_del_initiator_dep(oh, mpu_oh);
|
|
|
|
|
|
- _omap4_disable_module(oh);
|
|
|
+ if (soc_ops.disable_module)
|
|
|
+ soc_ops.disable_module(oh);
|
|
|
|
|
|
/*
|
|
|
* The module must be in idle mode before disabling any parents
|
|
|
@@ -1975,7 +1932,8 @@ static int _shutdown(struct omap_hwmod *oh)
|
|
|
if (oh->_state == _HWMOD_STATE_ENABLED) {
|
|
|
_del_initiator_dep(oh, mpu_oh);
|
|
|
/* XXX what about the other system initiators here? dma, dsp */
|
|
|
- _omap4_disable_module(oh);
|
|
|
+ if (soc_ops.disable_module)
|
|
|
+ soc_ops.disable_module(oh);
|
|
|
_disable_clocks(oh);
|
|
|
if (oh->clkdm)
|
|
|
clkdm_hwmod_disable(oh->clkdm, oh);
|
|
|
@@ -2431,6 +2389,194 @@ static int __init _alloc_linkspace(struct omap_hwmod_ocp_if **ois)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+/* Static functions intended only for use in soc_ops field function pointers */
|
|
|
+
|
|
|
+/**
|
|
|
+ * _omap2_wait_target_ready - wait for a module to leave slave idle
|
|
|
+ * @oh: struct omap_hwmod *
|
|
|
+ *
|
|
|
+ * Wait for a module @oh to leave slave idle. Returns 0 if the module
|
|
|
+ * does not have an IDLEST bit or if the module successfully leaves
|
|
|
+ * slave idle; otherwise, pass along the return value of the
|
|
|
+ * appropriate *_cm*_wait_module_ready() function.
|
|
|
+ */
|
|
|
+static int _omap2_wait_target_ready(struct omap_hwmod *oh)
|
|
|
+{
|
|
|
+ if (!oh)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ if (oh->flags & HWMOD_NO_IDLEST)
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ if (!_find_mpu_rt_port(oh))
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ /* XXX check module SIDLEMODE, hardreset status, enabled clocks */
|
|
|
+
|
|
|
+ return omap2_cm_wait_module_ready(oh->prcm.omap2.module_offs,
|
|
|
+ oh->prcm.omap2.idlest_reg_id,
|
|
|
+ oh->prcm.omap2.idlest_idle_bit);
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * _omap4_wait_target_ready - wait for a module to leave slave idle
|
|
|
+ * @oh: struct omap_hwmod *
|
|
|
+ *
|
|
|
+ * Wait for a module @oh to leave slave idle. Returns 0 if the module
|
|
|
+ * does not have an IDLEST bit or if the module successfully leaves
|
|
|
+ * slave idle; otherwise, pass along the return value of the
|
|
|
+ * appropriate *_cm*_wait_module_ready() function.
|
|
|
+ */
|
|
|
+static int _omap4_wait_target_ready(struct omap_hwmod *oh)
|
|
|
+{
|
|
|
+ if (!oh || !oh->clkdm)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ if (oh->flags & HWMOD_NO_IDLEST)
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ if (!_find_mpu_rt_port(oh))
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ /* XXX check module SIDLEMODE, hardreset status */
|
|
|
+
|
|
|
+ return omap4_cminst_wait_module_ready(oh->clkdm->prcm_partition,
|
|
|
+ oh->clkdm->cm_inst,
|
|
|
+ oh->clkdm->clkdm_offs,
|
|
|
+ oh->prcm.omap4.clkctrl_offs);
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * _omap2_assert_hardreset - call OMAP2 PRM hardreset fn with hwmod args
|
|
|
+ * @oh: struct omap_hwmod * to assert hardreset
|
|
|
+ * @ohri: hardreset line data
|
|
|
+ *
|
|
|
+ * Call omap2_prm_assert_hardreset() with parameters extracted from
|
|
|
+ * the hwmod @oh and the hardreset line data @ohri. Only intended for
|
|
|
+ * use as an soc_ops function pointer. Passes along the return value
|
|
|
+ * from omap2_prm_assert_hardreset(). XXX This function is scheduled
|
|
|
+ * for removal when the PRM code is moved into drivers/.
|
|
|
+ */
|
|
|
+static int _omap2_assert_hardreset(struct omap_hwmod *oh,
|
|
|
+ struct omap_hwmod_rst_info *ohri)
|
|
|
+{
|
|
|
+ return omap2_prm_assert_hardreset(oh->prcm.omap2.module_offs,
|
|
|
+ ohri->rst_shift);
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * _omap2_deassert_hardreset - call OMAP2 PRM hardreset fn with hwmod args
|
|
|
+ * @oh: struct omap_hwmod * to deassert hardreset
|
|
|
+ * @ohri: hardreset line data
|
|
|
+ *
|
|
|
+ * Call omap2_prm_deassert_hardreset() with parameters extracted from
|
|
|
+ * the hwmod @oh and the hardreset line data @ohri. Only intended for
|
|
|
+ * use as an soc_ops function pointer. Passes along the return value
|
|
|
+ * from omap2_prm_deassert_hardreset(). XXX This function is
|
|
|
+ * scheduled for removal when the PRM code is moved into drivers/.
|
|
|
+ */
|
|
|
+static int _omap2_deassert_hardreset(struct omap_hwmod *oh,
|
|
|
+ struct omap_hwmod_rst_info *ohri)
|
|
|
+{
|
|
|
+ return omap2_prm_deassert_hardreset(oh->prcm.omap2.module_offs,
|
|
|
+ ohri->rst_shift,
|
|
|
+ ohri->st_shift);
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * _omap2_is_hardreset_asserted - call OMAP2 PRM hardreset fn with hwmod args
|
|
|
+ * @oh: struct omap_hwmod * to test hardreset
|
|
|
+ * @ohri: hardreset line data
|
|
|
+ *
|
|
|
+ * Call omap2_prm_is_hardreset_asserted() with parameters extracted
|
|
|
+ * from the hwmod @oh and the hardreset line data @ohri. Only
|
|
|
+ * intended for use as an soc_ops function pointer. Passes along the
|
|
|
+ * return value from omap2_prm_is_hardreset_asserted(). XXX This
|
|
|
+ * function is scheduled for removal when the PRM code is moved into
|
|
|
+ * drivers/.
|
|
|
+ */
|
|
|
+static int _omap2_is_hardreset_asserted(struct omap_hwmod *oh,
|
|
|
+ struct omap_hwmod_rst_info *ohri)
|
|
|
+{
|
|
|
+ return omap2_prm_is_hardreset_asserted(oh->prcm.omap2.module_offs,
|
|
|
+ ohri->st_shift);
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * _omap4_assert_hardreset - call OMAP4 PRM hardreset fn with hwmod args
|
|
|
+ * @oh: struct omap_hwmod * to assert hardreset
|
|
|
+ * @ohri: hardreset line data
|
|
|
+ *
|
|
|
+ * Call omap4_prminst_assert_hardreset() with parameters extracted
|
|
|
+ * from the hwmod @oh and the hardreset line data @ohri. Only
|
|
|
+ * intended for use as an soc_ops function pointer. Passes along the
|
|
|
+ * return value from omap4_prminst_assert_hardreset(). XXX This
|
|
|
+ * function is scheduled for removal when the PRM code is moved into
|
|
|
+ * drivers/.
|
|
|
+ */
|
|
|
+static int _omap4_assert_hardreset(struct omap_hwmod *oh,
|
|
|
+ struct omap_hwmod_rst_info *ohri)
|
|
|
+{
|
|
|
+ if (!oh->clkdm)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ return omap4_prminst_assert_hardreset(ohri->rst_shift,
|
|
|
+ oh->clkdm->pwrdm.ptr->prcm_partition,
|
|
|
+ oh->clkdm->pwrdm.ptr->prcm_offs,
|
|
|
+ oh->prcm.omap4.rstctrl_offs);
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * _omap4_deassert_hardreset - call OMAP4 PRM hardreset fn with hwmod args
|
|
|
+ * @oh: struct omap_hwmod * to deassert hardreset
|
|
|
+ * @ohri: hardreset line data
|
|
|
+ *
|
|
|
+ * Call omap4_prminst_deassert_hardreset() with parameters extracted
|
|
|
+ * from the hwmod @oh and the hardreset line data @ohri. Only
|
|
|
+ * intended for use as an soc_ops function pointer. Passes along the
|
|
|
+ * return value from omap4_prminst_deassert_hardreset(). XXX This
|
|
|
+ * function is scheduled for removal when the PRM code is moved into
|
|
|
+ * drivers/.
|
|
|
+ */
|
|
|
+static int _omap4_deassert_hardreset(struct omap_hwmod *oh,
|
|
|
+ struct omap_hwmod_rst_info *ohri)
|
|
|
+{
|
|
|
+ if (!oh->clkdm)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ if (ohri->st_shift)
|
|
|
+ pr_err("omap_hwmod: %s: %s: hwmod data error: OMAP4 does not support st_shift\n",
|
|
|
+ oh->name, ohri->name);
|
|
|
+ return omap4_prminst_deassert_hardreset(ohri->rst_shift,
|
|
|
+ oh->clkdm->pwrdm.ptr->prcm_partition,
|
|
|
+ oh->clkdm->pwrdm.ptr->prcm_offs,
|
|
|
+ oh->prcm.omap4.rstctrl_offs);
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * _omap4_is_hardreset_asserted - call OMAP4 PRM hardreset fn with hwmod args
|
|
|
+ * @oh: struct omap_hwmod * to test hardreset
|
|
|
+ * @ohri: hardreset line data
|
|
|
+ *
|
|
|
+ * Call omap4_prminst_is_hardreset_asserted() with parameters
|
|
|
+ * extracted from the hwmod @oh and the hardreset line data @ohri.
|
|
|
+ * Only intended for use as an soc_ops function pointer. Passes along
|
|
|
+ * the return value from omap4_prminst_is_hardreset_asserted(). XXX
|
|
|
+ * This function is scheduled for removal when the PRM code is moved
|
|
|
+ * into drivers/.
|
|
|
+ */
|
|
|
+static int _omap4_is_hardreset_asserted(struct omap_hwmod *oh,
|
|
|
+ struct omap_hwmod_rst_info *ohri)
|
|
|
+{
|
|
|
+ if (!oh->clkdm)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ return omap4_prminst_is_hardreset_asserted(ohri->rst_shift,
|
|
|
+ oh->clkdm->pwrdm.ptr->prcm_partition,
|
|
|
+ oh->clkdm->pwrdm.ptr->prcm_offs,
|
|
|
+ oh->prcm.omap4.rstctrl_offs);
|
|
|
+}
|
|
|
+
|
|
|
/* Public functions */
|
|
|
|
|
|
u32 omap_hwmod_read(struct omap_hwmod *oh, u16 reg_offs)
|
|
|
@@ -2563,12 +2709,18 @@ int omap_hwmod_for_each(int (*fn)(struct omap_hwmod *oh, void *data),
|
|
|
*
|
|
|
* Intended to be called early in boot before the clock framework is
|
|
|
* initialized. If @ois is not null, will register all omap_hwmods
|
|
|
- * listed in @ois that are valid for this chip. Returns 0.
|
|
|
+ * listed in @ois that are valid for this chip. Returns -EINVAL if
|
|
|
+ * omap_hwmod_init() hasn't been called before calling this function,
|
|
|
+ * -ENOMEM if the link memory area can't be allocated, or 0 upon
|
|
|
+ * success.
|
|
|
*/
|
|
|
int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois)
|
|
|
{
|
|
|
int r, i;
|
|
|
|
|
|
+ if (!inited)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
if (!ois)
|
|
|
return 0;
|
|
|
|
|
|
@@ -3401,3 +3553,32 @@ int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx)
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
+
|
|
|
+/**
|
|
|
+ * omap_hwmod_init - initialize the hwmod code
|
|
|
+ *
|
|
|
+ * Sets up some function pointers needed by the hwmod code to operate on the
|
|
|
+ * currently-booted SoC. Intended to be called once during kernel init
|
|
|
+ * before any hwmods are registered. No return value.
|
|
|
+ */
|
|
|
+void __init omap_hwmod_init(void)
|
|
|
+{
|
|
|
+ if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
|
|
|
+ soc_ops.wait_target_ready = _omap2_wait_target_ready;
|
|
|
+ soc_ops.assert_hardreset = _omap2_assert_hardreset;
|
|
|
+ soc_ops.deassert_hardreset = _omap2_deassert_hardreset;
|
|
|
+ soc_ops.is_hardreset_asserted = _omap2_is_hardreset_asserted;
|
|
|
+ } else if (cpu_is_omap44xx()) {
|
|
|
+ soc_ops.enable_module = _omap4_enable_module;
|
|
|
+ soc_ops.disable_module = _omap4_disable_module;
|
|
|
+ soc_ops.wait_target_ready = _omap4_wait_target_ready;
|
|
|
+ soc_ops.assert_hardreset = _omap4_assert_hardreset;
|
|
|
+ soc_ops.deassert_hardreset = _omap4_deassert_hardreset;
|
|
|
+ soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted;
|
|
|
+ soc_ops.init_clkdm = _init_clkdm;
|
|
|
+ } else {
|
|
|
+ WARN(1, "omap_hwmod: unknown SoC type\n");
|
|
|
+ }
|
|
|
+
|
|
|
+ inited = true;
|
|
|
+}
|
Paul Walmsley
13 years ago