lkml.org 
[lkml]   [2012]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/10] ARM: OMAP3: hwmod: rename the smartreflex entries
    Date
    From: Jean Pihet <j-pihet@ti.com>

    Change the name field value to better reflect the smartreflex
    integration in the system

    Signed-off-by: Jean Pihet <j-pihet@ti.com>
    ---
    arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 ++++----
    arch/arm/mach-omap2/smartreflex.c | 2 +-
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
    index 1f681e8..728740d 100644
    --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
    +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
    @@ -2750,7 +2750,7 @@ static struct omap_hwmod_ocp_if *omap34xx_sr1_slaves[] = {
    };

    static struct omap_hwmod omap34xx_sr1_hwmod = {
    - .name = "sr1",
    + .name = "mpu_iva",
    .class = &omap34xx_smartreflex_hwmod_class,
    .main_clk = "sr1_fck",
    .prcm = {
    @@ -2774,7 +2774,7 @@ static struct omap_hwmod_ocp_if *omap36xx_sr1_slaves[] = {
    };

    static struct omap_hwmod omap36xx_sr1_hwmod = {
    - .name = "sr1",
    + .name = "mpu_iva",
    .class = &omap36xx_smartreflex_hwmod_class,
    .main_clk = "sr1_fck",
    .prcm = {
    @@ -2802,7 +2802,7 @@ static struct omap_hwmod_ocp_if *omap34xx_sr2_slaves[] = {
    };

    static struct omap_hwmod omap34xx_sr2_hwmod = {
    - .name = "sr2",
    + .name = "core",
    .class = &omap34xx_smartreflex_hwmod_class,
    .main_clk = "sr2_fck",
    .prcm = {
    @@ -2826,7 +2826,7 @@ static struct omap_hwmod_ocp_if *omap36xx_sr2_slaves[] = {
    };

    static struct omap_hwmod omap36xx_sr2_hwmod = {
    - .name = "sr2",
    + .name = "core",
    .class = &omap36xx_smartreflex_hwmod_class,
    .main_clk = "sr2_fck",
    .prcm = {
    diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
    index 8e3ef66..dd80fde 100644
    --- a/arch/arm/mach-omap2/smartreflex.c
    +++ b/arch/arm/mach-omap2/smartreflex.c
    @@ -184,7 +184,7 @@ static void sr_set_regfields(struct omap_sr *sr)
    sr->err_weight = OMAP3430_SR_ERRWEIGHT;
    sr->err_maxlimit = OMAP3430_SR_ERRMAXLIMIT;
    sr->accum_data = OMAP3430_SR_ACCUMDATA;
    - if (!(strcmp(sr->name, "sr1"))) {
    + if (!(strcmp(sr->name, "sr_mpu_iva"))) {
    sr->senn_avgweight = OMAP3430_SR1_SENNAVGWEIGHT;
    sr->senp_avgweight = OMAP3430_SR1_SENPAVGWEIGHT;
    } else {
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2012-03-15 17:47    [W:0.023 / U:123.448 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site