From mboxrd@z Thu Jan 1 00:00:00 1970 From: mturquette@ti.com (Mike Turquette) Date: Wed, 3 Oct 2012 18:26:12 -0700 Subject: [PATCH 5/7] ARM: omap: voltage: per-voltage domain ABB data In-Reply-To: <1349313974-5473-1-git-send-email-mturquette@ti.com> References: <1349313974-5473-1-git-send-email-mturquette@ti.com> Message-ID: <1349313974-5473-6-git-send-email-mturquette@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This patch adds struct omap_abb_instance to struct voltagedomain and populates the data for those voltage domains that have an ABB ldo on both 36xx and 44xx silicon. Signed-off-by: Mike Turquette Signed-off-by: Mike Turquette --- arch/arm/mach-omap2/voltage.h | 1 + arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 ++ arch/arm/mach-omap2/voltagedomains44xx_data.c | 3 +++ 3 files changed, 6 insertions(+) diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h index 0ded54f..546b3d7 100644 --- a/arch/arm/mach-omap2/voltage.h +++ b/arch/arm/mach-omap2/voltage.h @@ -73,6 +73,7 @@ struct voltagedomain { struct omap_vc_channel *vc; const struct omap_vfsm_instance *vfsm; struct omap_vp_instance *vp; + struct omap_abb_instance *abb; struct omap_voltdm_pmic *pmic; /* VC/VP register access functions: SoC specific */ diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c index d0103c8..f6c8a59 100644 --- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c +++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c @@ -26,6 +26,7 @@ #include "voltage.h" #include "vc.h" #include "vp.h" +#include "abb.h" /* * VDD data @@ -112,6 +113,7 @@ void __init omap3xxx_voltagedomains_init(void) if (cpu_is_omap3630()) { omap3_voltdm_mpu.volt_data = omap36xx_vddmpu_volt_data; omap3_voltdm_core.volt_data = omap36xx_vddcore_volt_data; + omap3_voltdm_mpu.abb = &omap36xx_abb_mpu; } else { omap3_voltdm_mpu.volt_data = omap34xx_vddmpu_volt_data; omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data; diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c index c3115f6..da4c70b 100644 --- a/arch/arm/mach-omap2/voltagedomains44xx_data.c +++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c @@ -31,6 +31,7 @@ #include "omap_opp_data.h" #include "vc.h" #include "vp.h" +#include "abb.h" static const struct omap_vfsm_instance omap4_vdd_mpu_vfsm = { .voltsetup_reg = OMAP4_PRM_VOLTSETUP_MPU_RET_SLEEP_OFFSET, @@ -53,6 +54,7 @@ static struct voltagedomain omap4_voltdm_mpu = { .vc = &omap4_vc_mpu, .vfsm = &omap4_vdd_mpu_vfsm, .vp = &omap4_vp_mpu, + .abb = &omap4_abb_mpu, }; static struct voltagedomain omap4_voltdm_iva = { @@ -64,6 +66,7 @@ static struct voltagedomain omap4_voltdm_iva = { .vc = &omap4_vc_iva, .vfsm = &omap4_vdd_iva_vfsm, .vp = &omap4_vp_iva, + .abb = &omap4_abb_iva, }; static struct voltagedomain omap4_voltdm_core = { -- 1.7.9.5