From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH 5/9] ARM: OMAP3: hwmod: rename the smartreflex entries Date: Wed, 18 Apr 2012 10:33:03 -0700 Message-ID: <87k41dkks0.fsf@ti.com> References: <1332173578-27422-1-git-send-email-j-pihet@ti.com> <1332173578-27422-6-git-send-email-j-pihet@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from na3sys009aog119.obsmtp.com ([74.125.149.246]:33180 "EHLO na3sys009aog119.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753088Ab2DRRdG (ORCPT ); Wed, 18 Apr 2012 13:33:06 -0400 Received: by dacx6 with SMTP id x6so8457617dac.32 for ; Wed, 18 Apr 2012 10:33:04 -0700 (PDT) In-Reply-To: <1332173578-27422-6-git-send-email-j-pihet@ti.com> (jean pihet's message of "Mon, 19 Mar 2012 17:12:54 +0100") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: jean.pihet@newoldbits.com Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, "Rafael J. Wysocki" , LKML , Jean Pihet +Benoit jean.pihet@newoldbits.com writes: > From: Jean Pihet > > Change the name field value to better reflect the smartreflex > integration in the system > > Signed-off-by: Jean Pihet > --- > 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 d7d4c70..40f57c4 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > @@ -2751,7 +2751,7 @@ static struct omap_hwmod_ocp_if *omap34xx_sr1_slaves[] = { > }; > > static struct omap_hwmod omap34xx_sr1_hwmod = { > - .name = "sr1", > + .name = "mpu_iva", Should this be "smartreflex_mpu_iva"? The OMAP4 SR hwmods have a 'smartreflex_' prefix which seems better. > .class = &omap34xx_smartreflex_hwmod_class, > .main_clk = "sr1_fck", > .prcm = { > @@ -2775,7 +2775,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 = { > @@ -2803,7 +2803,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 = { > @@ -2827,7 +2827,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 c18d47d..b2728a5 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"))) { Why the 'sr_' prefix? > sr->senn_avgweight = OMAP3430_SR1_SENNAVGWEIGHT; > sr->senp_avgweight = OMAP3430_SR1_SENPAVGWEIGHT; > } else { Kevin From mboxrd@z Thu Jan 1 00:00:00 1970 From: khilman@ti.com (Kevin Hilman) Date: Wed, 18 Apr 2012 10:33:03 -0700 Subject: [PATCH 5/9] ARM: OMAP3: hwmod: rename the smartreflex entries In-Reply-To: <1332173578-27422-6-git-send-email-j-pihet@ti.com> (jean pihet's message of "Mon, 19 Mar 2012 17:12:54 +0100") References: <1332173578-27422-1-git-send-email-j-pihet@ti.com> <1332173578-27422-6-git-send-email-j-pihet@ti.com> Message-ID: <87k41dkks0.fsf@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org +Benoit jean.pihet at newoldbits.com writes: > From: Jean Pihet > > Change the name field value to better reflect the smartreflex > integration in the system > > Signed-off-by: Jean Pihet > --- > 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 d7d4c70..40f57c4 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > @@ -2751,7 +2751,7 @@ static struct omap_hwmod_ocp_if *omap34xx_sr1_slaves[] = { > }; > > static struct omap_hwmod omap34xx_sr1_hwmod = { > - .name = "sr1", > + .name = "mpu_iva", Should this be "smartreflex_mpu_iva"? The OMAP4 SR hwmods have a 'smartreflex_' prefix which seems better. > .class = &omap34xx_smartreflex_hwmod_class, > .main_clk = "sr1_fck", > .prcm = { > @@ -2775,7 +2775,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 = { > @@ -2803,7 +2803,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 = { > @@ -2827,7 +2827,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 c18d47d..b2728a5 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"))) { Why the 'sr_' prefix? > sr->senn_avgweight = OMAP3430_SR1_SENNAVGWEIGHT; > sr->senp_avgweight = OMAP3430_SR1_SENPAVGWEIGHT; > } else { Kevin