Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_...

diff --cc arch/arm/mach-omap2/omap_hwmod_common_data.c
index 6dd922ef80ccd62adaca601ebdf57a272579433f,51e5418899fb446cd2317efe2622e3683860eec4,aff613852911aba50f3cab37a5eb3fd4ae945701..9f1ccdc8cc8cc0e137cc8b694a650f623c194646
--- 1/arch/arm/mach-omap2/omap_hwmod_common_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_common_data.c
--- 3/arch/arm/mach-omap2/omap_hwmod_common_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_common_data.c
@@@@ -47,17 -47,8 -47,9 +47,18 @@@@ struct omap_hwmod_sysc_fields omap_hwmo
        .midle_shift    = SYSC_TYPE2_MIDLEMODE_SHIFT,
        .sidle_shift    = SYSC_TYPE2_SIDLEMODE_SHIFT,
        .srst_shift     = SYSC_TYPE2_SOFTRESET_SHIFT,
++      .dmadisable_shift = SYSC_TYPE2_DMADISABLE_SHIFT,
 + };
 + 
 ++/**
 ++ * struct omap_hwmod_sysc_type3 - TYPE3 sysconfig scheme.
 ++ * Used by some IPs on AM33xx
 ++ */
 ++struct omap_hwmod_sysc_fields omap_hwmod_sysc_type3 = {
 ++     .midle_shift    = SYSC_TYPE3_MIDLEMODE_SHIFT,
 ++     .sidle_shift    = SYSC_TYPE3_SIDLEMODE_SHIFT,
  +};
  +
   struct omap_dss_dispc_dev_attr omap2_3_dss_dispc_dev_attr = {
        .manager_count          = 2,
        .has_framedonetv_irq    = 0

diff --cc arch/arm/plat-omap/include/plat/omap_hwmod.h
index 7cb8d7dddcc536de0c0c7c0902444d25bdd4258a,c835b7194ff57ba71d5448746ea21e6134e39ef7,27455ed0a2abc976a10e1d0321853145bb8bd4dc..35675b2160748d9e2f483616c64a6304db7a10d0
--- 1/arch/arm/plat-omap/include/plat/omap_hwmod.h
--- 2/arch/arm/plat-omap/include/plat/omap_hwmod.h
--- 3/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@@@ -70,16 -69,7 -69,9 +70,18 @@@@ extern struct omap_hwmod_sysc_fields om
   #define SYSC_TYPE2_SIDLEMODE_MASK    (0x3 << SYSC_TYPE2_SIDLEMODE_SHIFT)
   #define SYSC_TYPE2_MIDLEMODE_SHIFT   4
   #define SYSC_TYPE2_MIDLEMODE_MASK    (0x3 << SYSC_TYPE2_MIDLEMODE_SHIFT)
++ #define SYSC_TYPE2_DMADISABLE_SHIFT  16
++ #define SYSC_TYPE2_DMADISABLE_MASK   (0x1 << SYSC_TYPE2_DMADISABLE_SHIFT)
 + 
 ++/*
 ++ * OCP SYSCONFIG bit shifts/masks TYPE3.
 ++ * This is applicable for some IPs present in AM33XX
 ++ */
 ++#define SYSC_TYPE3_SIDLEMODE_SHIFT   0
 ++#define SYSC_TYPE3_SIDLEMODE_MASK    (0x3 << SYSC_TYPE3_SIDLEMODE_SHIFT)
 ++#define SYSC_TYPE3_MIDLEMODE_SHIFT   2
 ++#define SYSC_TYPE3_MIDLEMODE_MASK    (0x3 << SYSC_TYPE3_MIDLEMODE_SHIFT)
  +
   /* OCP SYSSTATUS bit shifts/masks */
   #define SYSS_RESETDONE_SHIFT         0
   #define SYSS_RESETDONE_MASK          (1 << SYSS_RESETDONE_SHIFT)