[PATCH v2] OMAP2PLUS: Replace voltage values with Macros
Menon, Nishanth
nm at ti.com
Sat Mar 5 05:18:49 EST 2011
2011/3/4 Nishanth Menon <nm at ti.com>:
> From: Vishwanath BS <vishwanath.bs at ti.com>
>
> Since all voltage data is now centralized in oppxxx_data.c, we can remove
> the replace the values in the opp table with the macros used for voltage
> values. This will avoid opp table and voltage layer having conflicting
> values.
dropping this patch -> i will post a v3 in a couple of mins. realized
that the $subject and commit message could be improved a bit :(
Regards,
Nishanth Menon
>
> Signed-off-by: Vishwanath BS <vishwanath.bs at ti.com>
> ---
> This patch has 3 line over 80 char warning. This is retained for readability
> purposes.
>
> v2: Rebased to pm-core (since pm-core now has voltage layer cleanups)
>
> v1: http://marc.info/?l=linux-omap&m=129683786100355&w=2
>
> arch/arm/mach-omap2/opp3xxx_data.c | 46 ++++++++++++++++++------------------
> arch/arm/mach-omap2/opp4xxx_data.c | 12 ++++----
> 2 files changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/opp3xxx_data.c b/arch/arm/mach-omap2/opp3xxx_data.c
> index d2bd1bd..d95f3f9 100644
> --- a/arch/arm/mach-omap2/opp3xxx_data.c
> +++ b/arch/arm/mach-omap2/opp3xxx_data.c
> @@ -89,15 +89,15 @@ struct omap_volt_data omap36xx_vddcore_volt_data[] = {
>
> static struct omap_opp_def __initdata omap34xx_opp_def_list[] = {
> /* MPU OPP1 */
> - OPP_INITIALIZER("mpu", true, 125000000, 975000),
> + OPP_INITIALIZER("mpu", true, 125000000, OMAP3430_VDD_MPU_OPP1_UV),
> /* MPU OPP2 */
> - OPP_INITIALIZER("mpu", true, 250000000, 1075000),
> + OPP_INITIALIZER("mpu", true, 250000000, OMAP3430_VDD_MPU_OPP2_UV),
> /* MPU OPP3 */
> - OPP_INITIALIZER("mpu", true, 500000000, 1200000),
> + OPP_INITIALIZER("mpu", true, 500000000, OMAP3430_VDD_MPU_OPP3_UV),
> /* MPU OPP4 */
> - OPP_INITIALIZER("mpu", true, 550000000, 1270000),
> + OPP_INITIALIZER("mpu", true, 550000000, OMAP3430_VDD_MPU_OPP4_UV),
> /* MPU OPP5 */
> - OPP_INITIALIZER("mpu", true, 600000000, 1350000),
> + OPP_INITIALIZER("mpu", true, 600000000, OMAP3430_VDD_MPU_OPP5_UV),
>
> /*
> * L3 OPP1 - 41.5 MHz is disabled because: The voltage for that OPP is
> @@ -107,47 +107,47 @@ static struct omap_opp_def __initdata omap34xx_opp_def_list[] = {
> * impact that frequency will do to the MPU and the whole system in
> * general.
> */
> - OPP_INITIALIZER("l3_main", false, 41500000, 975000),
> + OPP_INITIALIZER("l3_main", false, 41500000, OMAP3430_VDD_CORE_OPP1_UV),
> /* L3 OPP2 */
> - OPP_INITIALIZER("l3_main", true, 83000000, 1050000),
> + OPP_INITIALIZER("l3_main", true, 83000000, OMAP3430_VDD_CORE_OPP2_UV),
> /* L3 OPP3 */
> - OPP_INITIALIZER("l3_main", true, 166000000, 1150000),
> + OPP_INITIALIZER("l3_main", true, 166000000, OMAP3430_VDD_CORE_OPP3_UV),
>
> /* DSP OPP1 */
> - OPP_INITIALIZER("iva", true, 90000000, 975000),
> + OPP_INITIALIZER("iva", true, 90000000, OMAP3430_VDD_MPU_OPP1_UV),
> /* DSP OPP2 */
> - OPP_INITIALIZER("iva", true, 180000000, 1075000),
> + OPP_INITIALIZER("iva", true, 180000000, OMAP3430_VDD_MPU_OPP2_UV),
> /* DSP OPP3 */
> - OPP_INITIALIZER("iva", true, 360000000, 1200000),
> + OPP_INITIALIZER("iva", true, 360000000, OMAP3430_VDD_MPU_OPP3_UV),
> /* DSP OPP4 */
> - OPP_INITIALIZER("iva", true, 400000000, 1270000),
> + OPP_INITIALIZER("iva", true, 400000000, OMAP3430_VDD_MPU_OPP4_UV),
> /* DSP OPP5 */
> - OPP_INITIALIZER("iva", true, 430000000, 1350000),
> + OPP_INITIALIZER("iva", true, 430000000, OMAP3430_VDD_MPU_OPP5_UV),
> };
>
> static struct omap_opp_def __initdata omap36xx_opp_def_list[] = {
> /* MPU OPP1 - OPP50 */
> - OPP_INITIALIZER("mpu", true, 300000000, 1012500),
> + OPP_INITIALIZER("mpu", true, 300000000, OMAP3630_VDD_MPU_OPP50_UV),
> /* MPU OPP2 - OPP100 */
> - OPP_INITIALIZER("mpu", true, 600000000, 1200000),
> + OPP_INITIALIZER("mpu", true, 600000000, OMAP3630_VDD_MPU_OPP100_UV),
> /* MPU OPP3 - OPP-Turbo */
> - OPP_INITIALIZER("mpu", false, 800000000, 1325000),
> + OPP_INITIALIZER("mpu", false, 800000000, OMAP3630_VDD_MPU_OPP120_UV),
> /* MPU OPP4 - OPP-SB */
> - OPP_INITIALIZER("mpu", false, 1000000000, 1375000),
> + OPP_INITIALIZER("mpu", false, 1000000000, OMAP3630_VDD_MPU_OPP1G_UV),
>
> /* L3 OPP1 - OPP50 */
> - OPP_INITIALIZER("l3_main", true, 100000000, 1000000),
> + OPP_INITIALIZER("l3_main", true, 100000000, OMAP3630_VDD_CORE_OPP50_UV),
> /* L3 OPP2 - OPP100, OPP-Turbo, OPP-SB */
> - OPP_INITIALIZER("l3_main", true, 200000000, 1200000),
> + OPP_INITIALIZER("l3_main", true, 200000000, OMAP3630_VDD_CORE_OPP100_UV),
>
> /* DSP OPP1 - OPP50 */
> - OPP_INITIALIZER("iva", true, 260000000, 1012500),
> + OPP_INITIALIZER("iva", true, 260000000, OMAP3630_VDD_MPU_OPP50_UV),
> /* DSP OPP2 - OPP100 */
> - OPP_INITIALIZER("iva", true, 520000000, 1200000),
> + OPP_INITIALIZER("iva", true, 520000000, OMAP3630_VDD_MPU_OPP100_UV),
> /* DSP OPP3 - OPP-Turbo */
> - OPP_INITIALIZER("iva", false, 660000000, 1325000),
> + OPP_INITIALIZER("iva", false, 660000000, OMAP3630_VDD_MPU_OPP120_UV),
> /* DSP OPP4 - OPP-SB */
> - OPP_INITIALIZER("iva", false, 800000000, 1375000),
> + OPP_INITIALIZER("iva", false, 800000000, OMAP3630_VDD_MPU_OPP1G_UV),
> };
>
> /**
> diff --git a/arch/arm/mach-omap2/opp4xxx_data.c b/arch/arm/mach-omap2/opp4xxx_data.c
> index 5030794..57f1498 100644
> --- a/arch/arm/mach-omap2/opp4xxx_data.c
> +++ b/arch/arm/mach-omap2/opp4xxx_data.c
> @@ -67,17 +67,17 @@ struct omap_volt_data omap44xx_vdd_core_volt_data[] = {
>
> static struct omap_opp_def __initdata omap44xx_opp_def_list[] = {
> /* MPU OPP1 - OPP50 */
> - OPP_INITIALIZER("mpu", true, 300000000, 1100000),
> + OPP_INITIALIZER("mpu", true, 300000000, OMAP4430_VDD_MPU_OPP50_UV),
> /* MPU OPP2 - OPP100 */
> - OPP_INITIALIZER("mpu", true, 600000000, 1200000),
> + OPP_INITIALIZER("mpu", true, 600000000, OMAP4430_VDD_MPU_OPP100_UV),
> /* MPU OPP3 - OPP-Turbo */
> - OPP_INITIALIZER("mpu", false, 800000000, 1260000),
> + OPP_INITIALIZER("mpu", false, 800000000, OMAP4430_VDD_MPU_OPPTURBO_UV),
> /* MPU OPP4 - OPP-SB */
> - OPP_INITIALIZER("mpu", false, 1008000000, 1350000),
> + OPP_INITIALIZER("mpu", false, 1008000000, OMAP4430_VDD_MPU_OPPNITRO_UV),
> /* L3 OPP1 - OPP50 */
> - OPP_INITIALIZER("l3_main_1", true, 100000000, 930000),
> + OPP_INITIALIZER("l3_main_1", true, 100000000, OMAP4430_VDD_CORE_OPP50_UV),
> /* L3 OPP2 - OPP100, OPP-Turbo, OPP-SB */
> - OPP_INITIALIZER("l3_main_1", true, 200000000, 1100000),
> + OPP_INITIALIZER("l3_main_1", true, 200000000, OMAP4430_VDD_CORE_OPP100_UV),
> /* TODO: add IVA, DSP, aess, fdif, gpu */
> };
>
> --
> 1.7.1
>
>
More information about the linux-arm-kernel
mailing list