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

Commit b56b7bc8 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

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: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>
parent dc6d1cda

arch/arm/plat-omap/include/plat/omap_hwmod.h

+4 −12
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 * - add pinmuxing

 * - init_conn_id_bit (CONNID_BIT_VECTOR)

 * - 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
@@ -159,7 +159,7 @@ struct omap_hwmod_omap2_firewall { 
 * ADDR_MAP_ON_INIT: Map this address space during omap_hwmod init.

 * 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)



/**
@@ -200,8 +200,6 @@ struct omap_hwmod_addr_space { 
 * @fw: interface firewall data

 * @addr_cnt: ARRAY_SIZE(@addr)

 * @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)

 * @flags: OCP interface flags (see OCPIF_* macros above)

 *
@@ -221,8 +219,6 @@ struct omap_hwmod_ocp_if { 
	}				fw;

	u8				addr_cnt;

	u8				width;

	u8				thread_cnt;

	u8				max_burst_len;

	u8				user;

	u8				flags;

};
@@ -357,9 +353,9 @@ struct omap_hwmod_omap4_prcm { 
 * HWMOD_SWSUP_MSTDBY: omap_hwmod code should manually bring module in and out

 *     of standby, rather than relying on module smart-standby

 * 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

 *     controller, etc.

 *     controller, etc. XXX probably belongs outside the main hwmod file

 * HWMOD_NO_AUTOIDLE: disable module autoidle (OCP_SYSCONFIG.AUTOIDLE)

 *     when module is enabled, rather than the default, which is to

 *     enable autoidle
@@ -459,8 +455,6 @@ struct omap_hwmod_class { 
 * @_sysc_cache: internal-use hwmod flags

 * @_mpu_rt_va: cached register target start address (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

 * @sdma_reqs_cnt: number of @sdma_reqs

 * @opt_clks_cnt: number of @opt_clks
@@ -506,8 +500,6 @@ struct omap_hwmod { 
	struct list_head		node;

	u16				flags;

	u8				_mpu_port_index;

	u8				msuspendmux_reg_id;

	u8				msuspendmux_shift;

	u8				response_lat;

	u8				mpu_irqs_cnt;

	u8				sdma_reqs_cnt;