recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0100-OMAP3-voltage-rename-mpu-voltagedomain-to-mpu_iva.patch

   1 From 34c219d2ab8537e9d9ec98d8516d352eda68ce7a Mon Sep 17 00:00:00 2001
   2 From: Kevin Hilman <khilman@ti.com>
   3 Date: Wed, 23 Mar 2011 11:18:08 -0700
   4 Subject: [PATCH 100/149] OMAP3: voltage: rename "mpu" voltagedomain to "mpu_iva"
   5
   6 This voltage domain (a.k.a. VDD1) contains both the MPU and the IVA, so
   7 rename appropriately.
   8
   9 Also fixup any users of the "mpu" name to use "mpu_iva"
  10
  11 Signed-off-by: Kevin Hilman <khilman@ti.com>
  12 ---
  13  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c    |    4 ++--
  14  arch/arm/mach-omap2/omap_twl.c                |    2 +-
  15  arch/arm/mach-omap2/pm.c                      |    2 +-
  16  arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
  17  4 files changed, 5 insertions(+), 5 deletions(-)
  18
  19 diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
  20 index 25bf43b..59fdb9f 100644
  21 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
  22 +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
  23 @@ -2597,7 +2597,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = {
  24         .name           = "sr1_hwmod",
  25         .class          = &omap34xx_smartreflex_hwmod_class,
  26         .main_clk       = "sr1_fck",
  27 -       .vdd_name       = "mpu",
  28 +       .vdd_name       = "mpu_iva",
  29         .prcm           = {
  30                 .omap2 = {
  31                         .prcm_reg_id = 1,
  32 @@ -2619,7 +2619,7 @@ static struct omap_hwmod omap36xx_sr1_hwmod = {
  33         .name           = "sr1_hwmod",
  34         .class          = &omap36xx_smartreflex_hwmod_class,
  35         .main_clk       = "sr1_fck",
  36 -       .vdd_name       = "mpu",
  37 +       .vdd_name       = "mpu_iva",
  38         .prcm           = {
  39                 .omap2 = {
  40                         .prcm_reg_id = 1,
  41 diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
  42 index fcd2f62..760487b 100644
  43 --- a/arch/arm/mach-omap2/omap_twl.c
  44 +++ b/arch/arm/mach-omap2/omap_twl.c
  45 @@ -288,7 +288,7 @@ int __init omap3_twl_init(void)
  46         if (!twl_sr_enable_autoinit)
  47                 omap3_twl_set_sr_bit(true);
  48
  49 -       voltdm = voltdm_lookup("mpu");
  50 +       voltdm = voltdm_lookup("mpu_iva");
  51         omap_voltage_register_pmic(voltdm, &omap3_mpu_volt_info);
  52
  53         voltdm = voltdm_lookup("core");
  54 diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
  55 index 3bce29b..f81340e 100644
  56 --- a/arch/arm/mach-omap2/pm.c
  57 +++ b/arch/arm/mach-omap2/pm.c
  58 @@ -228,7 +228,7 @@ static void __init omap3_init_voltages(void)
  59         if (!cpu_is_omap34xx())
  60                 return;
  61
  62 -       omap2_set_init_voltage("mpu", "dpll1_ck", mpu_dev);
  63 +       omap2_set_init_voltage("mpu_iva", "dpll1_ck", mpu_dev);
  64         omap2_set_init_voltage("core", "l3_ick", l3_dev);
  65  }
  66
  67 diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
  68 index 4bee412..2167ef4 100644
  69 --- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
  70 +++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
  71 @@ -60,7 +60,7 @@ static struct omap_vdd_info omap3_vdd2_info = {
  72  };
  73
  74  static struct voltagedomain omap3_voltdm_mpu = {
  75 -       .name = "mpu",
  76 +       .name = "mpu_iva",
  77         .vdd = &omap3_vdd1_info,
  78  };
  79
  80 --
  81 1.6.6.1
  82