[PATCH] ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data

[PATCH] ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data

[Nishanth Menon]

commit 20d49e9ccfece526db755940721aa13e331936d4
(ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data)

Introduced dummy volt data for OMAP5 with OMAP4460 voltage information.

However with the fixes introduced in later patches

commit cd8abed1da91a3250aa4b3857479613a2b446f84
(ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm
 associated to a pwrdm)

We are no longer restricted in that respect. Further, OPP voltage
information is supposed to be provided by dts information. This needs
to be added in future patches as various voltage modules are converted
to dts.

This also fixes the build breakage for voltagedomains54xx_data.c when just
OMAP5 SoC is enabled: https://patchwork.kernel.org/patch/2764191/

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Nishanth Menon <nm@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
---

Discussed in thread: http://marc.info/?t=137184664400002&r=1&w=2

Tested against 
linux-next-20130625 + git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux.git
for_3.11/out_of_tree/omap5_clk_data with omap2plus_defconfig
on OMAP5432 uEVM.
NOTE: we still have the issue reported in https://patchwork.kernel.org/patch/2568091/
and "ARM: OMAP2+: AM43x: resolve SMP related build error" does not help solve
the problem either for OMAP5.

 arch/arm/mach-omap2/voltagedomains54xx_data.c |   10 ----------
 1 file changed, 10 deletions(-)

diff --git a/arch/arm/mach-omap2/voltagedomains54xx_data.c b/arch/arm/mach-omap2/voltagedomains54xx_data.c
index 72b8971..33d22b8 100644
--- a/arch/arm/mach-omap2/voltagedomains54xx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains54xx_data.c
@@ -85,16 +85,6 @@ void __init omap54xx_voltagedomains_init(void)
 	struct voltagedomain *voltdm;
 	int i;
 
-	/*
-	 * XXX Will depend on the process, validation, and binning
-	 * for the currently-running IC. Use OMAP4 data for time being.
-	 */
-#ifdef CONFIG_PM_OPP
-	omap5_voltdm_mpu.volt_data = omap446x_vdd_mpu_volt_data;
-	omap5_voltdm_mm.volt_data = omap446x_vdd_iva_volt_data;
-	omap5_voltdm_core.volt_data = omap446x_vdd_core_volt_data;
-#endif
-
 	for (i = 0; voltdm = voltagedomains_omap5[i], voltdm; i++)
 		voltdm->sys_clk.name = sys_clk_name;
 
-- 
1.7.9.5

Re: [PATCH] ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data

[Santosh Shilimkar]

On Tuesday 25 June 2013 07:56 PM, Nishanth Menon wrote:
> commit 20d49e9ccfece526db755940721aa13e331936d4
> (ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data)
> 
> Introduced dummy volt data for OMAP5 with OMAP4460 voltage information.
> 
> However with the fixes introduced in later patches
> 
> commit cd8abed1da91a3250aa4b3857479613a2b446f84
> (ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm
>  associated to a pwrdm)
> 
> We are no longer restricted in that respect. Further, OPP voltage
> information is supposed to be provided by dts information. This needs
> to be added in future patches as various voltage modules are converted
> to dts.
> 
> This also fixes the build breakage for voltagedomains54xx_data.c when just
> OMAP5 SoC is enabled: https://patchwork.kernel.org/patch/2764191/
> 
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Benoit Cousson <b-cousson@ti.com>
> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: linux-omap@vger.kernel.org
> ---
> 
Thanks Nishant for the patch.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

Re: [PATCH] ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data

[Kevin Hilman]

Nishanth Menon <nm@ti.com> writes:

> commit 20d49e9ccfece526db755940721aa13e331936d4
> (ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data)
>
> Introduced dummy volt data for OMAP5 with OMAP4460 voltage information.
>
> However with the fixes introduced in later patches
>
> commit cd8abed1da91a3250aa4b3857479613a2b446f84
> (ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm
>  associated to a pwrdm)
>
> We are no longer restricted in that respect. Further, OPP voltage
> information is supposed to be provided by dts information. This needs
> to be added in future patches as various voltage modules are converted
> to dts.
>
> This also fixes the build breakage for voltagedomains54xx_data.c when just
> OMAP5 SoC is enabled: https://patchwork.kernel.org/patch/2764191/
>
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Benoit Cousson <b-cousson@ti.com>
> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: linux-omap@vger.kernel.org

Acked-by: Kevin Hilman <khilman@linaro.org>

Arnd, to make it easy, below is a pull request for this fix on top of
arm-soc/omap/omap5.

Kevin



The following changes since commit 6503a8e109a639760408f874c1251060d563942e:

  ARM: OMAP5: Remove unused include for ocp2scp (2013-06-09 21:17:15 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git tags/omap-pm-v3.11/fixes/omap5-voltdm

for you to fetch changes up to 2ac524f151dbecb862c95b8f433267772caa800e:

  ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data (2013-06-25 17:11:06 -0700)

----------------------------------------------------------------
OMAP5: PM: fix boot by removing unneeded dummy voltage domain data

----------------------------------------------------------------
Nishanth Menon (1):
      ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data

 arch/arm/mach-omap2/voltagedomains54xx_data.c | 10 ----------
 1 file changed, 10 deletions(-)

Re: [PATCH] ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data

[Tony Lindgren]

* Kevin Hilman <khilman@linaro.org> [130625 17:24]:
> Nishanth Menon <nm@ti.com> writes:
> 
> > commit 20d49e9ccfece526db755940721aa13e331936d4
> > (ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data)
> >
> > Introduced dummy volt data for OMAP5 with OMAP4460 voltage information.
> >
> > However with the fixes introduced in later patches
> >
> > commit cd8abed1da91a3250aa4b3857479613a2b446f84
> > (ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm
> >  associated to a pwrdm)
> >
> > We are no longer restricted in that respect. Further, OPP voltage
> > information is supposed to be provided by dts information. This needs
> > to be added in future patches as various voltage modules are converted
> > to dts.
> >
> > This also fixes the build breakage for voltagedomains54xx_data.c when just
> > OMAP5 SoC is enabled: https://patchwork.kernel.org/patch/2764191/
> >
> > Reported-by: Arnd Bergmann <arnd@arndb.de>
> > Signed-off-by: Nishanth Menon <nm@ti.com>
> > Cc: Kevin Hilman <khilman@deeprootsystems.com>
> > Cc: Benoit Cousson <b-cousson@ti.com>
> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: linux-omap@vger.kernel.org
> 
> Acked-by: Kevin Hilman <khilman@linaro.org>
> 
> Arnd, to make it easy, below is a pull request for this fix on top of
> arm-soc/omap/omap5.

This can get easily lost, might be best to send a new email with
[GIT PULL] in the subject.

Regards,

Tony
 
> The following changes since commit 6503a8e109a639760408f874c1251060d563942e:
> 
>   ARM: OMAP5: Remove unused include for ocp2scp (2013-06-09 21:17:15 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git tags/omap-pm-v3.11/fixes/omap5-voltdm
> 
> for you to fetch changes up to 2ac524f151dbecb862c95b8f433267772caa800e:
> 
>   ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data (2013-06-25 17:11:06 -0700)
> 
> ----------------------------------------------------------------
> OMAP5: PM: fix boot by removing unneeded dummy voltage domain data
> 
> ----------------------------------------------------------------
> Nishanth Menon (1):
>       ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data
> 
>  arch/arm/mach-omap2/voltagedomains54xx_data.c | 10 ----------
>  1 file changed, 10 deletions(-)

Re: [PATCH] ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data

[Arnd Bergmann]

On Wednesday 26 June 2013, Tony Lindgren wrote:
> * Kevin Hilman <khilman@linaro.org> [130625 17:24]:
> > Nishanth Menon <nm@ti.com> writes:
> > 
> > > commit 20d49e9ccfece526db755940721aa13e331936d4
> > > (ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data)
> > >
> > > Introduced dummy volt data for OMAP5 with OMAP4460 voltage information.
> > >
> > > However with the fixes introduced in later patches
> > >
> > > commit cd8abed1da91a3250aa4b3857479613a2b446f84
> > > (ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm
> > >  associated to a pwrdm)
> > >
> > > We are no longer restricted in that respect. Further, OPP voltage
> > > information is supposed to be provided by dts information. This needs
> > > to be added in future patches as various voltage modules are converted
> > > to dts.
> > >
> > > This also fixes the build breakage for voltagedomains54xx_data.c when just
> > > OMAP5 SoC is enabled: https://patchwork.kernel.org/patch/2764191/
> > >
> > > Reported-by: Arnd Bergmann <arnd@arndb.de>
> > > Signed-off-by: Nishanth Menon <nm@ti.com>
> > > Cc: Kevin Hilman <khilman@deeprootsystems.com>
> > > Cc: Benoit Cousson <b-cousson@ti.com>
> > > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
> > > Cc: Paul Walmsley <paul@pwsan.com>
> > > Cc: Tony Lindgren <tony@atomide.com>
> > > Cc: linux-omap@vger.kernel.org
> > 
> > Acked-by: Kevin Hilman <khilman@linaro.org>
> > 
> > Arnd, to make it easy, below is a pull request for this fix on top of
> > arm-soc/omap/omap5.
> 
> This can get easily lost, might be best to send a new email with
> [GIT PULL] in the subject.

Good idea in general. I've got this one and pulled it into next/soc.

	Arnd

Re: [PATCH] ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data

[Kevin Hilman]

Tony Lindgren <tony@atomide.com> writes:

> * Kevin Hilman <khilman@linaro.org> [130625 17:24]:
>> Nishanth Menon <nm@ti.com> writes:
>> 
>> > commit 20d49e9ccfece526db755940721aa13e331936d4
>> > (ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data)
>> >
>> > Introduced dummy volt data for OMAP5 with OMAP4460 voltage information.
>> >
>> > However with the fixes introduced in later patches
>> >
>> > commit cd8abed1da91a3250aa4b3857479613a2b446f84
>> > (ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm
>> >  associated to a pwrdm)
>> >
>> > We are no longer restricted in that respect. Further, OPP voltage
>> > information is supposed to be provided by dts information. This needs
>> > to be added in future patches as various voltage modules are converted
>> > to dts.
>> >
>> > This also fixes the build breakage for voltagedomains54xx_data.c when just
>> > OMAP5 SoC is enabled: https://patchwork.kernel.org/patch/2764191/
>> >
>> > Reported-by: Arnd Bergmann <arnd@arndb.de>
>> > Signed-off-by: Nishanth Menon <nm@ti.com>
>> > Cc: Kevin Hilman <khilman@deeprootsystems.com>
>> > Cc: Benoit Cousson <b-cousson@ti.com>
>> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
>> > Cc: Paul Walmsley <paul@pwsan.com>
>> > Cc: Tony Lindgren <tony@atomide.com>
>> > Cc: linux-omap@vger.kernel.org
>> 
>> Acked-by: Kevin Hilman <khilman@linaro.org>
>> 
>> Arnd, to make it easy, below is a pull request for this fix on top of
>> arm-soc/omap/omap5.
>
> This can get easily lost, might be best to send a new email with
> [GIT PULL] in the subject.

Done.