recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0057-OMAP4-clockdomain-data-Fix-data-order-and-wrong-name.patch

   1 From bbf7af412d82e488052f801f294687aaf1bf260e Mon Sep 17 00:00:00 2001
   2 From: Benoit Cousson <b-cousson@ti.com>
   3 Date: Sat, 9 Jul 2011 19:15:06 -0600
   4 Subject: [PATCH 057/149] OMAP4: clockdomain data: Fix data order and wrong name
   5
   6 MPUSS was renamed MPU and L3_D2D D2D.
   7 The rename will slightly change the order of the structure
   8 and thus generate some structures moves.
   9
  10 Add a comment and remove a comma.
  11
  12 Update Copyright for TI and Nokia and add back Paul
  13 in the author list.
  14
  15 Signed-off-by: Benoit Cousson <b-cousson@ti.com>
  16 Cc: Paul Walmsley <paul@pwsan.com>
  17 Cc: Rajendra Nayak <rnayak@ti.com>
  18 Signed-off-by: Paul Walmsley <paul@pwsan.com>
  19 ---
  20  arch/arm/mach-omap2/clockdomains44xx_data.c |  124 ++++++++++++++-------------
  21  1 files changed, 63 insertions(+), 61 deletions(-)
  22
  23 diff --git a/arch/arm/mach-omap2/clockdomains44xx_data.c b/arch/arm/mach-omap2/clockdomains44xx_data.c
  24 index a607ec1..66090f2 100644
  25 --- a/arch/arm/mach-omap2/clockdomains44xx_data.c
  26 +++ b/arch/arm/mach-omap2/clockdomains44xx_data.c
  27 @@ -1,11 +1,12 @@
  28  /*
  29   * OMAP4 Clock domains framework
  30   *
  31 - * Copyright (C) 2009 Texas Instruments, Inc.
  32 - * Copyright (C) 2009 Nokia Corporation
  33 + * Copyright (C) 2009-2011 Texas Instruments, Inc.
  34 + * Copyright (C) 2009-2011 Nokia Corporation
  35   *
  36   * Abhijit Pagare (abhijitpagare@ti.com)
  37   * Benoit Cousson (b-cousson@ti.com)
  38 + * Paul Walmsley (paul@pwsan.com)
  39   *
  40   * This file is automatically generated from the OMAP hardware databases.
  41   * We respectfully ask that any modifications to this file be coordinated
  42 @@ -32,7 +33,7 @@
  43
  44  /* Static Dependencies for OMAP4 Clock Domains */
  45
  46 -static struct clkdm_dep ducati_wkup_sleep_deps[] = {
  47 +static struct clkdm_dep d2d_wkup_sleep_deps[] = {
  48         {
  49                 .clkdm_name      = "abe_clkdm",
  50                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  51 @@ -50,103 +51,103 @@ static struct clkdm_dep ducati_wkup_sleep_deps[] = {
  52                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  53         },
  54         {
  55 -               .clkdm_name      = "l3_dss_clkdm",
  56 +               .clkdm_name      = "l3_emif_clkdm",
  57                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  58         },
  59         {
  60 -               .clkdm_name      = "l3_emif_clkdm",
  61 +               .clkdm_name      = "l3_init_clkdm",
  62                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  63         },
  64         {
  65 -               .clkdm_name      = "l3_gfx_clkdm",
  66 +               .clkdm_name      = "l4_cfg_clkdm",
  67                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  68         },
  69         {
  70 -               .clkdm_name      = "l3_init_clkdm",
  71 +               .clkdm_name      = "l4_per_clkdm",
  72                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  73         },
  74 +       { NULL },
  75 +};
  76 +
  77 +static struct clkdm_dep ducati_wkup_sleep_deps[] = {
  78         {
  79 -               .clkdm_name      = "l4_cfg_clkdm",
  80 +               .clkdm_name      = "abe_clkdm",
  81                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  82         },
  83         {
  84 -               .clkdm_name      = "l4_per_clkdm",
  85 +               .clkdm_name      = "ivahd_clkdm",
  86                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  87         },
  88         {
  89 -               .clkdm_name      = "l4_secure_clkdm",
  90 +               .clkdm_name      = "l3_1_clkdm",
  91                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  92         },
  93         {
  94 -               .clkdm_name      = "l4_wkup_clkdm",
  95 +               .clkdm_name      = "l3_2_clkdm",
  96                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
  97         },
  98         {
  99 -               .clkdm_name      = "tesla_clkdm",
 100 +               .clkdm_name      = "l3_dss_clkdm",
 101                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 102         },
 103 -       { NULL },
 104 -};
 105 -
 106 -static struct clkdm_dep iss_wkup_sleep_deps[] = {
 107         {
 108 -               .clkdm_name      = "ivahd_clkdm",
 109 +               .clkdm_name      = "l3_emif_clkdm",
 110                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 111         },
 112         {
 113 -               .clkdm_name      = "l3_1_clkdm",
 114 +               .clkdm_name      = "l3_gfx_clkdm",
 115                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 116         },
 117         {
 118 -               .clkdm_name      = "l3_emif_clkdm",
 119 +               .clkdm_name      = "l3_init_clkdm",
 120                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 121         },
 122 -       { NULL },
 123 -};
 124 -
 125 -static struct clkdm_dep ivahd_wkup_sleep_deps[] = {
 126         {
 127 -               .clkdm_name      = "l3_1_clkdm",
 128 +               .clkdm_name      = "l4_cfg_clkdm",
 129                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 130         },
 131         {
 132 -               .clkdm_name      = "l3_emif_clkdm",
 133 +               .clkdm_name      = "l4_per_clkdm",
 134                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 135         },
 136 -       { NULL },
 137 -};
 138 -
 139 -static struct clkdm_dep l3_d2d_wkup_sleep_deps[] = {
 140         {
 141 -               .clkdm_name      = "abe_clkdm",
 142 +               .clkdm_name      = "l4_secure_clkdm",
 143                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 144         },
 145         {
 146 -               .clkdm_name      = "ivahd_clkdm",
 147 +               .clkdm_name      = "l4_wkup_clkdm",
 148                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 149         },
 150         {
 151 -               .clkdm_name      = "l3_1_clkdm",
 152 +               .clkdm_name      = "tesla_clkdm",
 153                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 154         },
 155 +       { NULL },
 156 +};
 157 +
 158 +static struct clkdm_dep iss_wkup_sleep_deps[] = {
 159         {
 160 -               .clkdm_name      = "l3_2_clkdm",
 161 +               .clkdm_name      = "ivahd_clkdm",
 162                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 163         },
 164         {
 165 -               .clkdm_name      = "l3_emif_clkdm",
 166 +               .clkdm_name      = "l3_1_clkdm",
 167                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 168         },
 169         {
 170 -               .clkdm_name      = "l3_init_clkdm",
 171 +               .clkdm_name      = "l3_emif_clkdm",
 172                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 173         },
 174 +       { NULL },
 175 +};
 176 +
 177 +static struct clkdm_dep ivahd_wkup_sleep_deps[] = {
 178         {
 179 -               .clkdm_name      = "l4_cfg_clkdm",
 180 +               .clkdm_name      = "l3_1_clkdm",
 181                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 182         },
 183         {
 184 -               .clkdm_name      = "l4_per_clkdm",
 185 +               .clkdm_name      = "l3_emif_clkdm",
 186                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 187         },
 188         { NULL },
 189 @@ -280,7 +281,7 @@ static struct clkdm_dep l4_secure_wkup_sleep_deps[] = {
 190         { NULL },
 191  };
 192
 193 -static struct clkdm_dep mpuss_wkup_sleep_deps[] = {
 194 +static struct clkdm_dep mpu_wkup_sleep_deps[] = {
 195         {
 196                 .clkdm_name      = "abe_clkdm",
 197                 .omap_chip       = OMAP_CHIP_INIT(CHIP_IS_OMAP4430)
 198 @@ -497,14 +498,14 @@ static struct clockdomain l3_init_44xx_clkdm = {
 199         .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 200  };
 201
 202 -static struct clockdomain mpuss_44xx_clkdm = {
 203 -       .name             = "mpuss_clkdm",
 204 -       .pwrdm            = { .name = "mpu_pwrdm" },
 205 -       .prcm_partition   = OMAP4430_CM1_PARTITION,
 206 -       .cm_inst          = OMAP4430_CM1_MPU_INST,
 207 -       .clkdm_offs       = OMAP4430_CM1_MPU_MPU_CDOFFS,
 208 -       .wkdep_srcs       = mpuss_wkup_sleep_deps,
 209 -       .sleepdep_srcs    = mpuss_wkup_sleep_deps,
 210 +static struct clockdomain d2d_44xx_clkdm = {
 211 +       .name             = "d2d_clkdm",
 212 +       .pwrdm            = { .name = "core_pwrdm" },
 213 +       .prcm_partition   = OMAP4430_CM2_PARTITION,
 214 +       .cm_inst          = OMAP4430_CM2_CORE_INST,
 215 +       .clkdm_offs       = OMAP4430_CM2_CORE_D2D_CDOFFS,
 216 +       .wkdep_srcs       = d2d_wkup_sleep_deps,
 217 +       .sleepdep_srcs    = d2d_wkup_sleep_deps,
 218         .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
 219         .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 220  };
 221 @@ -563,6 +564,18 @@ static struct clockdomain ducati_44xx_clkdm = {
 222         .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 223  };
 224
 225 +static struct clockdomain mpu_44xx_clkdm = {
 226 +       .name             = "mpu_clkdm",
 227 +       .pwrdm            = { .name = "mpu_pwrdm" },
 228 +       .prcm_partition   = OMAP4430_CM1_PARTITION,
 229 +       .cm_inst          = OMAP4430_CM1_MPU_INST,
 230 +       .clkdm_offs       = OMAP4430_CM1_MPU_MPU_CDOFFS,
 231 +       .wkdep_srcs       = mpu_wkup_sleep_deps,
 232 +       .sleepdep_srcs    = mpu_wkup_sleep_deps,
 233 +       .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
 234 +       .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 235 +};
 236 +
 237  static struct clockdomain l3_2_44xx_clkdm = {
 238         .name             = "l3_2_clkdm",
 239         .pwrdm            = { .name = "core_pwrdm" },
 240 @@ -585,18 +598,6 @@ static struct clockdomain l3_1_44xx_clkdm = {
 241         .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 242  };
 243
 244 -static struct clockdomain l3_d2d_44xx_clkdm = {
 245 -       .name             = "l3_d2d_clkdm",
 246 -       .pwrdm            = { .name = "core_pwrdm" },
 247 -       .prcm_partition   = OMAP4430_CM2_PARTITION,
 248 -       .cm_inst          = OMAP4430_CM2_CORE_INST,
 249 -       .clkdm_offs       = OMAP4430_CM2_CORE_D2D_CDOFFS,
 250 -       .wkdep_srcs       = l3_d2d_wkup_sleep_deps,
 251 -       .sleepdep_srcs    = l3_d2d_wkup_sleep_deps,
 252 -       .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
 253 -       .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 254 -};
 255 -
 256  static struct clockdomain iss_44xx_clkdm = {
 257         .name             = "iss_clkdm",
 258         .pwrdm            = { .name = "cam_pwrdm" },
 259 @@ -655,6 +656,7 @@ static struct clockdomain l3_dma_44xx_clkdm = {
 260         .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 261  };
 262
 263 +/* As clockdomains are added or removed above, this list must also be changed */
 264  static struct clockdomain *clockdomains_omap44xx[] __initdata = {
 265         &l4_cefuse_44xx_clkdm,
 266         &l4_cfg_44xx_clkdm,
 267 @@ -666,21 +668,21 @@ static struct clockdomain *clockdomains_omap44xx[] __initdata = {
 268         &abe_44xx_clkdm,
 269         &l3_instr_44xx_clkdm,
 270         &l3_init_44xx_clkdm,
 271 -       &mpuss_44xx_clkdm,
 272 +       &d2d_44xx_clkdm,
 273         &mpu0_44xx_clkdm,
 274         &mpu1_44xx_clkdm,
 275         &l3_emif_44xx_clkdm,
 276         &l4_ao_44xx_clkdm,
 277         &ducati_44xx_clkdm,
 278 +       &mpu_44xx_clkdm,
 279         &l3_2_44xx_clkdm,
 280         &l3_1_44xx_clkdm,
 281 -       &l3_d2d_44xx_clkdm,
 282         &iss_44xx_clkdm,
 283         &l3_dss_44xx_clkdm,
 284         &l4_wkup_44xx_clkdm,
 285         &emu_sys_44xx_clkdm,
 286         &l3_dma_44xx_clkdm,
 287 -       NULL,
 288 +       NULL
 289  };
 290
 291  void __init omap44xx_clockdomains_init(void)
 292 --
 293 1.7.2.5
 294