1 files changed, 8 insertions, 15 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h
index 78904017f18c..a8f779381fd8 100644
--- a/arch/arm/mach-omap2/omap_hwmod.h
+++ b/arch/arm/mach-omap2/omap_hwmod.h
@@ -313,6 +313,7 @@ struct omap_hwmod_ocp_if {
         struct omap_hwmod_addr_space    *addr;
         const char                      *clk;
         struct clk                      *_clk;
+        struct list_head                node;
         union {
                 struct omap_hwmod_omap2_firewall omap2;
         }                               fw;
@@ -410,7 +411,6 @@ struct omap_hwmod_class_sysconfig {
         struct omap_hwmod_sysc_fields *sysc_fields;
         u8 srst_udelay;
         u8 idlemodes;
-        u8 clockact;
 };
 
 /**
@@ -531,6 +531,10 @@ struct omap_hwmod_omap4_prcm {
  *     operate and they need to be handled at the same time as the main_clk.
  * HWMOD_NO_IDLE: Do not idle the hwmod at all. Useful to handle certain
  *     IPs like CPSW on DRA7, where clocks to this module cannot be disabled.
+ * HWMOD_CLKDM_NOAUTO: Allows the hwmod's clockdomain to be prevented from
+ *     entering HW_AUTO while hwmod is active. This is needed to workaround
+ *     some modules which don't function correctly with HW_AUTO. For example,
+ *     DCAN on DRA7x SoC needs this to workaround errata i893.
  */
 #define HWMOD_SWSUP_SIDLE                       (1 << 0)
 #define HWMOD_SWSUP_MSTANDBY                    (1 << 1)
@@ -548,6 +552,7 @@ struct omap_hwmod_omap4_prcm {
 #define HWMOD_RECONFIG_IO_CHAIN                 (1 << 13)
 #define HWMOD_OPT_CLKS_NEEDED                   (1 << 14)
 #define HWMOD_NO_IDLE                           (1 << 15)
+#define HWMOD_CLKDM_NOAUTO                      (1 << 16)
 
 /*
  * omap_hwmod._int_flags definitions
@@ -617,16 +622,6 @@ struct omap_hwmod_class {
 };
 
 /**
- * struct omap_hwmod_link - internal structure linking hwmods with ocp_ifs
- * @ocp_if: OCP interface structure record pointer
- * @node: list_head pointing to next struct omap_hwmod_link in a list
- */
-struct omap_hwmod_link {
-        struct omap_hwmod_ocp_if        *ocp_if;
-        struct list_head                node;
-};
-
-/**
  * struct omap_hwmod - integration data for OMAP hardware "modules" (IP blocks)
  * @name: name of the hwmod
  * @class: struct omap_hwmod_class * to the class of this hwmod
@@ -686,9 +681,8 @@ struct omap_hwmod {
         const char                      *main_clk;
         struct clk                      *_clk;
         struct omap_hwmod_opt_clk       *opt_clks;
-        char                            *clkdm_name;
+        const char                      *clkdm_name;
         struct clockdomain              *clkdm;
-        struct list_head                master_ports; /* connect to *_IA */
         struct list_head                slave_ports; /* connect to *_TA */
         void                            *dev_attr;
         u32                             _sysc_cache;
@@ -698,12 +692,11 @@ struct omap_hwmod {
         struct list_head                node;
         struct omap_hwmod_ocp_if        *_mpu_port;
         unsigned int                    (*xlate_irq)(unsigned int);
-        u16                             flags;
+        u32                             flags;
         u8                              mpu_rt_idx;
         u8                              response_lat;
         u8                              rst_lines_cnt;
         u8                              opt_clks_cnt;
-        u8                              masters_cnt;
         u8                              slaves_cnt;
         u8                              hwmods_cnt;
         u8                              _int_flags;