target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch

   1 For modules/IPs/hwmods which do not have
   2 -1- sys->class->reset()
   3 and
   4 -2- hardreset lines
   5 and
   6 -3- No way to do an ocp reset (no sysc control)
   7 the flag 'HWMOD_INIT_NO_RESET' is not much useful.
   8
   9 Cleanup all such instances across various hwmod data files.
  10
  11 Signed-off-by: Rajendra Nayak <rnayak@ti.com>
  12
  13 ---
  14 arch/arm/mach-omap2/omap_hwmod_33xx_data.c |   18 +++++++++---------
  15  arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    6 +++---
  16  arch/arm/mach-omap2/omap_hwmod_54xx_data.c |    6 +++---
  17  3 files changed, 15 insertions(+), 15 deletions(-)
  18
  19 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  20 +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  21 @@ -52,7 +52,7 @@ static struct omap_hwmod am33xx_emif_hwm
  22         .name           = "emif",
  23         .class          = &am33xx_emif_hwmod_class,
  24         .clkdm_name     = "l3_clkdm",
  25 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  26 +       .flags          = HWMOD_INIT_NO_IDLE,
  27         .main_clk       = "dpll_ddr_m2_div2_ck",
  28         .prcm           = {
  29                 .omap4  = {
  30 @@ -74,7 +74,7 @@ static struct omap_hwmod am33xx_l3_main_
  31         .name           = "l3_main",
  32         .class          = &am33xx_l3_hwmod_class,
  33         .clkdm_name     = "l3_clkdm",
  34 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  35 +       .flags          = HWMOD_INIT_NO_IDLE,
  36         .main_clk       = "l3_gclk",
  37         .prcm           = {
  38                 .omap4  = {
  39 @@ -96,7 +96,7 @@ static struct omap_hwmod am33xx_l3_instr
  40         .name           = "l3_instr",
  41         .class          = &am33xx_l3_hwmod_class,
  42         .clkdm_name     = "l3_clkdm",
  43 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  44 +       .flags          = HWMOD_INIT_NO_IDLE,
  45         .main_clk       = "l3_gclk",
  46         .prcm           = {
  47                 .omap4  = {
  48 @@ -119,7 +119,7 @@ static struct omap_hwmod am33xx_l4_ls_hw
  49         .name           = "l4_ls",
  50         .class          = &am33xx_l4_hwmod_class,
  51         .clkdm_name     = "l4ls_clkdm",
  52 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  53 +       .flags          = HWMOD_INIT_NO_IDLE,
  54         .main_clk       = "l4ls_gclk",
  55         .prcm           = {
  56                 .omap4  = {
  57 @@ -134,7 +134,7 @@ static struct omap_hwmod am33xx_l4_hs_hw
  58         .name           = "l4_hs",
  59         .class          = &am33xx_l4_hwmod_class,
  60         .clkdm_name     = "l4hs_clkdm",
  61 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  62 +       .flags          = HWMOD_INIT_NO_IDLE,
  63         .main_clk       = "l4hs_gclk",
  64         .prcm           = {
  65                 .omap4  = {
  66 @@ -150,7 +150,7 @@ static struct omap_hwmod am33xx_l4_wkup_
  67         .name           = "l4_wkup",
  68         .class          = &am33xx_l4_hwmod_class,
  69         .clkdm_name     = "l4_wkup_clkdm",
  70 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  71 +       .flags          = HWMOD_INIT_NO_IDLE,
  72         .prcm           = {
  73                 .omap4  = {
  74                         .clkctrl_offs   = AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET,
  75 @@ -170,7 +170,7 @@ static struct omap_hwmod am33xx_mpu_hwmo
  76         .name           = "mpu",
  77         .class          = &am33xx_mpu_hwmod_class,
  78         .clkdm_name     = "mpu_clkdm",
  79 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  80 +       .flags          = HWMOD_INIT_NO_IDLE,
  81         .main_clk       = "dpll_mpu_m2_ck",
  82         .prcm           = {
  83                 .omap4  = {
  84 @@ -450,7 +450,7 @@ static struct omap_hwmod am33xx_ocmcram_
  85         .name           = "ocmcram",
  86         .class          = &am33xx_ocmcram_hwmod_class,
  87         .clkdm_name     = "l3_clkdm",
  88 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  89 +       .flags          = HWMOD_INIT_NO_IDLE,
  90         .main_clk       = "l3_gclk",
  91         .prcm           = {
  92                 .omap4  = {
  93 @@ -532,7 +532,7 @@ static struct omap_hwmod am33xx_control_
  94         .name           = "control",
  95         .class          = &am33xx_control_hwmod_class,
  96         .clkdm_name     = "l4_wkup_clkdm",
  97 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  98 +       .flags          = HWMOD_INIT_NO_IDLE,
  99         .main_clk       = "dpll_core_m4_div2_ck",
 100         .prcm           = {
 101                 .omap4  = {
 102 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 103 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 104 @@ -914,7 +914,7 @@ static struct omap_hwmod omap44xx_emif1_
 105         .name           = "emif1",
 106         .class          = &omap44xx_emif_hwmod_class,
 107         .clkdm_name     = "l3_emif_clkdm",
 108 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 109 +       .flags          = HWMOD_INIT_NO_IDLE,
 110         .main_clk       = "ddrphy_ck",
 111         .prcm = {
 112                 .omap4 = {
 113 @@ -930,7 +930,7 @@ static struct omap_hwmod omap44xx_emif2_
 114         .name           = "emif2",
 115         .class          = &omap44xx_emif_hwmod_class,
 116         .clkdm_name     = "l3_emif_clkdm",
 117 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 118 +       .flags          = HWMOD_INIT_NO_IDLE,
 119         .main_clk       = "ddrphy_ck",
 120         .prcm = {
 121                 .omap4 = {
 122 @@ -2193,7 +2193,7 @@ static struct omap_hwmod omap44xx_mpu_hw
 123         .name           = "mpu",
 124         .class          = &omap44xx_mpu_hwmod_class,
 125         .clkdm_name     = "mpuss_clkdm",
 126 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 127 +       .flags          = HWMOD_INIT_NO_IDLE,
 128         .main_clk       = "dpll_mpu_m2_ck",
 129         .prcm = {
 130                 .omap4 = {
 131 --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 132 +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 133 @@ -352,7 +352,7 @@ static struct omap_hwmod omap54xx_emif1_
 134         .name           = "emif1",
 135         .class          = &omap54xx_emif_hwmod_class,
 136         .clkdm_name     = "emif_clkdm",
 137 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 138 +       .flags          = HWMOD_INIT_NO_IDLE,
 139         .main_clk       = "dpll_core_h11x2_ck",
 140         .prcm = {
 141                 .omap4 = {
 142 @@ -368,7 +368,7 @@ static struct omap_hwmod omap54xx_emif2_
 143         .name           = "emif2",
 144         .class          = &omap54xx_emif_hwmod_class,
 145         .clkdm_name     = "emif_clkdm",
 146 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 147 +       .flags          = HWMOD_INIT_NO_IDLE,
 148         .main_clk       = "dpll_core_h11x2_ck",
 149         .prcm = {
 150                 .omap4 = {
 151 @@ -1135,7 +1135,7 @@ static struct omap_hwmod omap54xx_mpu_hw
 152         .name           = "mpu",
 153         .class          = &omap54xx_mpu_hwmod_class,
 154         .clkdm_name     = "mpu_clkdm",
 155 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 156 +       .flags          = HWMOD_INIT_NO_IDLE,
 157         .main_clk       = "dpll_mpu_m2_ck",
 158         .prcm = {
 159                 .omap4 = {