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 diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  20 index 215894f..2815a91 100644
  21 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  22 +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  23 @@ -52,7 +52,7 @@ static struct omap_hwmod am33xx_emif_hwmod = {
  24         .name           = "emif",
  25         .class          = &am33xx_emif_hwmod_class,
  26         .clkdm_name     = "l3_clkdm",
  27 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  28 +       .flags          = HWMOD_INIT_NO_IDLE,
  29         .main_clk       = "dpll_ddr_m2_div2_ck",
  30         .prcm           = {
  31                 .omap4  = {
  32 @@ -74,7 +74,7 @@ static struct omap_hwmod am33xx_l3_main_hwmod = {
  33         .name           = "l3_main",
  34         .class          = &am33xx_l3_hwmod_class,
  35         .clkdm_name     = "l3_clkdm",
  36 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  37 +       .flags          = HWMOD_INIT_NO_IDLE,
  38         .main_clk       = "l3_gclk",
  39         .prcm           = {
  40                 .omap4  = {
  41 @@ -96,7 +96,7 @@ static struct omap_hwmod am33xx_l3_instr_hwmod = {
  42         .name           = "l3_instr",
  43         .class          = &am33xx_l3_hwmod_class,
  44         .clkdm_name     = "l3_clkdm",
  45 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  46 +       .flags          = HWMOD_INIT_NO_IDLE,
  47         .main_clk       = "l3_gclk",
  48         .prcm           = {
  49                 .omap4  = {
  50 @@ -119,7 +119,7 @@ static struct omap_hwmod am33xx_l4_ls_hwmod = {
  51         .name           = "l4_ls",
  52         .class          = &am33xx_l4_hwmod_class,
  53         .clkdm_name     = "l4ls_clkdm",
  54 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  55 +       .flags          = HWMOD_INIT_NO_IDLE,
  56         .main_clk       = "l4ls_gclk",
  57         .prcm           = {
  58                 .omap4  = {
  59 @@ -134,7 +134,7 @@ static struct omap_hwmod am33xx_l4_hs_hwmod = {
  60         .name           = "l4_hs",
  61         .class          = &am33xx_l4_hwmod_class,
  62         .clkdm_name     = "l4hs_clkdm",
  63 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  64 +       .flags          = HWMOD_INIT_NO_IDLE,
  65         .main_clk       = "l4hs_gclk",
  66         .prcm           = {
  67                 .omap4  = {
  68 @@ -150,7 +150,7 @@ static struct omap_hwmod am33xx_l4_wkup_hwmod = {
  69         .name           = "l4_wkup",
  70         .class          = &am33xx_l4_hwmod_class,
  71         .clkdm_name     = "l4_wkup_clkdm",
  72 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  73 +       .flags          = HWMOD_INIT_NO_IDLE,
  74         .prcm           = {
  75                 .omap4  = {
  76                         .clkctrl_offs   = AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET,
  77 @@ -170,7 +170,7 @@ static struct omap_hwmod am33xx_mpu_hwmod = {
  78         .name           = "mpu",
  79         .class          = &am33xx_mpu_hwmod_class,
  80         .clkdm_name     = "mpu_clkdm",
  81 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  82 +       .flags          = HWMOD_INIT_NO_IDLE,
  83         .main_clk       = "dpll_mpu_m2_ck",
  84         .prcm           = {
  85                 .omap4  = {
  86 @@ -450,7 +450,7 @@ static struct omap_hwmod am33xx_ocmcram_hwmod = {
  87         .name           = "ocmcram",
  88         .class          = &am33xx_ocmcram_hwmod_class,
  89         .clkdm_name     = "l3_clkdm",
  90 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
  91 +       .flags          = HWMOD_INIT_NO_IDLE,
  92         .main_clk       = "l3_gclk",
  93         .prcm           = {
  94                 .omap4  = {
  95 @@ -532,7 +532,7 @@ static struct omap_hwmod am33xx_control_hwmod = {
  96         .name           = "control",
  97         .class          = &am33xx_control_hwmod_class,
  98         .clkdm_name     = "l4_wkup_clkdm",
  99 -       .flags          = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
 100 +       .flags          = HWMOD_INIT_NO_IDLE,
 101         .main_clk       = "dpll_core_m4_div2_ck",
 102         .prcm           = {
 103                 .omap4  = {
 104 diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 105 index 9c3b504..1e5b12c 100644
 106 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 107 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 108 @@ -914,7 +914,7 @@ static struct omap_hwmod omap44xx_emif1_hwmod = {
 109         .name           = "emif1",
 110         .class          = &omap44xx_emif_hwmod_class,
 111         .clkdm_name     = "l3_emif_clkdm",
 112 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 113 +       .flags          = HWMOD_INIT_NO_IDLE,
 114         .main_clk       = "ddrphy_ck",
 115         .prcm = {
 116                 .omap4 = {
 117 @@ -930,7 +930,7 @@ static struct omap_hwmod omap44xx_emif2_hwmod = {
 118         .name           = "emif2",
 119         .class          = &omap44xx_emif_hwmod_class,
 120         .clkdm_name     = "l3_emif_clkdm",
 121 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 122 +       .flags          = HWMOD_INIT_NO_IDLE,
 123         .main_clk       = "ddrphy_ck",
 124         .prcm = {
 125                 .omap4 = {
 126 @@ -2193,7 +2193,7 @@ static struct omap_hwmod omap44xx_mpu_hwmod = {
 127         .name           = "mpu",
 128         .class          = &omap44xx_mpu_hwmod_class,
 129         .clkdm_name     = "mpuss_clkdm",
 130 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 131 +       .flags          = HWMOD_INIT_NO_IDLE,
 132         .main_clk       = "dpll_mpu_m2_ck",
 133         .prcm = {
 134                 .omap4 = {
 135 diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 136 index cde4155..e3caee1 100644
 137 --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 138 +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 139 @@ -352,7 +352,7 @@ static struct omap_hwmod omap54xx_emif1_hwmod = {
 140         .name           = "emif1",
 141         .class          = &omap54xx_emif_hwmod_class,
 142         .clkdm_name     = "emif_clkdm",
 143 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 144 +       .flags          = HWMOD_INIT_NO_IDLE,
 145         .main_clk       = "dpll_core_h11x2_ck",
 146         .prcm = {
 147                 .omap4 = {
 148 @@ -368,7 +368,7 @@ static struct omap_hwmod omap54xx_emif2_hwmod = {
 149         .name           = "emif2",
 150         .class          = &omap54xx_emif_hwmod_class,
 151         .clkdm_name     = "emif_clkdm",
 152 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 153 +       .flags          = HWMOD_INIT_NO_IDLE,
 154         .main_clk       = "dpll_core_h11x2_ck",
 155         .prcm = {
 156                 .omap4 = {
 157 @@ -1135,7 +1135,7 @@ static struct omap_hwmod omap54xx_mpu_hwmod = {
 158         .name           = "mpu",
 159         .class          = &omap54xx_mpu_hwmod_class,
 160         .clkdm_name     = "mpu_clkdm",
 161 -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 162 +       .flags          = HWMOD_INIT_NO_IDLE,
 163         .main_clk       = "dpll_mpu_m2_ck",
 164         .prcm = {
 165                 .omap4 = {