openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

OMAP2+: hwmod: fix a warning, add some docs, remove unused fields 

Trivial cleanup and documentation changes on the hwmod code and data:

- add some hwmod documentation to indicate flags that should be moved
  outside the static hwmod data in a future patch

- remove some unused fields in the struct omap_hwmod_ocp_if and
  struct omap_hwmod structures

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>
This commit is contained in:
Paul Walmsley 2010-12-14 12:42:36 -07:00
parent dc6d1cda04
commit b56b7bc8d9
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/plat-omap/include/plat/omap_hwmod.h
View File

@ -23,7 +23,7 @@
* - add pinmuxing * - add pinmuxing
* - init_conn_id_bit (CONNID_BIT_VECTOR) * - init_conn_id_bit (CONNID_BIT_VECTOR)
* - implement default hwmod SMS/SDRC flags? * - implement default hwmod SMS/SDRC flags?
* - remove unused fields * - move Linux-specific data ("non-ROM data") out
* *
*/ */
#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD_H #ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD_H
@ -159,7 +159,7 @@ struct omap_hwmod_omap2_firewall {
* ADDR_MAP_ON_INIT: Map this address space during omap_hwmod init. * ADDR_MAP_ON_INIT: Map this address space during omap_hwmod init.
* ADDR_TYPE_RT: Address space contains module register target data. * ADDR_TYPE_RT: Address space contains module register target data.
*/ */
#define ADDR_MAP_ON_INIT (1 << 0) #define ADDR_MAP_ON_INIT (1 << 0) /* XXX does not belong */
#define ADDR_TYPE_RT (1 << 1) #define ADDR_TYPE_RT (1 << 1)
/** /**
@ -200,8 +200,6 @@ struct omap_hwmod_addr_space {
* @fw: interface firewall data * @fw: interface firewall data
* @addr_cnt: ARRAY_SIZE(@addr) * @addr_cnt: ARRAY_SIZE(@addr)
* @width: OCP data width * @width: OCP data width
* @thread_cnt: number of threads
* @max_burst_len: maximum burst length in @width sized words (0 if unlimited)
* @user: initiators using this interface (see OCP_USER_* macros above) * @user: initiators using this interface (see OCP_USER_* macros above)
* @flags: OCP interface flags (see OCPIF_* macros above) * @flags: OCP interface flags (see OCPIF_* macros above)
* *
@ -221,8 +219,6 @@ struct omap_hwmod_ocp_if {
} fw; } fw;
u8 addr_cnt; u8 addr_cnt;
u8 width; u8 width;
u8 thread_cnt;
u8 max_burst_len;
u8 user; u8 user;
u8 flags; u8 flags;
}; };
@ -357,9 +353,9 @@ struct omap_hwmod_omap4_prcm {
* HWMOD_SWSUP_MSTDBY: omap_hwmod code should manually bring module in and out * HWMOD_SWSUP_MSTDBY: omap_hwmod code should manually bring module in and out
* of standby, rather than relying on module smart-standby * of standby, rather than relying on module smart-standby
* HWMOD_INIT_NO_RESET: don't reset this module at boot - important for * HWMOD_INIT_NO_RESET: don't reset this module at boot - important for
* SDRAM controller, etc. * SDRAM controller, etc. XXX probably belongs outside the main hwmod file
* HWMOD_INIT_NO_IDLE: don't idle this module at boot - important for SDRAM * HWMOD_INIT_NO_IDLE: don't idle this module at boot - important for SDRAM
* controller, etc. * controller, etc. XXX probably belongs outside the main hwmod file
* HWMOD_NO_AUTOIDLE: disable module autoidle (OCP_SYSCONFIG.AUTOIDLE) * HWMOD_NO_AUTOIDLE: disable module autoidle (OCP_SYSCONFIG.AUTOIDLE)
* when module is enabled, rather than the default, which is to * when module is enabled, rather than the default, which is to
* enable autoidle * enable autoidle
@ -459,8 +455,6 @@ struct omap_hwmod_class {
* @_sysc_cache: internal-use hwmod flags * @_sysc_cache: internal-use hwmod flags
* @_mpu_rt_va: cached register target start address (internal use) * @_mpu_rt_va: cached register target start address (internal use)
* @_mpu_port_index: cached MPU register target slave ID (internal use) * @_mpu_port_index: cached MPU register target slave ID (internal use)
* @msuspendmux_reg_id: CONTROL_MSUSPENDMUX register ID (1-6)
* @msuspendmux_shift: CONTROL_MSUSPENDMUX register bit shift
* @mpu_irqs_cnt: number of @mpu_irqs * @mpu_irqs_cnt: number of @mpu_irqs
* @sdma_reqs_cnt: number of @sdma_reqs * @sdma_reqs_cnt: number of @sdma_reqs
* @opt_clks_cnt: number of @opt_clks * @opt_clks_cnt: number of @opt_clks
@ -506,8 +500,6 @@ struct omap_hwmod {
struct list_head node; struct list_head node;
u16 flags; u16 flags;
u8 _mpu_port_index; u8 _mpu_port_index;
u8 msuspendmux_reg_id;
u8 msuspendmux_shift;
u8 response_lat; u8 response_lat;
u8 mpu_irqs_cnt; u8 mpu_irqs_cnt;
u8 sdma_reqs_cnt; u8 sdma_reqs_cnt;