* [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation
@ 2016-05-23 18:32 Suman Anna
2016-05-23 18:32 ` [U-Boot] [PATCH 1/4] ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values Suman Anna
` (4 more replies)
0 siblings, 5 replies; 15+ messages in thread
From: Suman Anna @ 2016-05-23 18:32 UTC (permalink / raw)
To: u-boot
Hi Tom,
The following series consolidates the current macros used
for Voltage configuration on DRA7/AM57xx platforms. This is a
preparatory series for a follow-up series that introduces
the ability to choose OPP configurations at boot time for
various voltage domains using Kconfigs. I will submit that
series once the "Support for boot image creation for TI secure
devices" series [1] gets merged.
Patches based on current u-boot master commit 4b6e1fd,
and a commit [2] to fix current SPL boot issues on DRA7
platforms.
regards
Suman
[1] http://marc.info/?l=u-boot&m=146370308317931&w=2
[2] https://patchwork.ozlabs.org/patch/624267/
Suman Anna (4):
ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values
ARM: DRA7: Define common macros for efuse register offsets
ARM: DRA7: Consolidate voltage macros across different SoCs
ARM: DRA7: Add macros for voltage values for all OPPs
arch/arm/cpu/armv7/omap5/hw_data.c | 40 +++++++++++++++---------------
arch/arm/include/asm/arch-omap5/clock.h | 43 +++++++++++++++++++++++----------
board/ti/am57xx/board.c | 20 +++++++--------
3 files changed, 60 insertions(+), 43 deletions(-)
--
2.8.2
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/4] ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values
2016-05-23 18:32 [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
@ 2016-05-23 18:32 ` Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-23 18:32 ` [U-Boot] [PATCH 2/4] ARM: DRA7: Define common macros for efuse register offsets Suman Anna
` (3 subsequent siblings)
4 siblings, 2 replies; 15+ messages in thread
From: Suman Anna @ 2016-05-23 18:32 UTC (permalink / raw)
To: u-boot
The current OPP_NOM voltage values defined for the MPU and CORE
voltage domains are based on the initial DRA75x_74x_SR1.1_DM data
manual. As per this DM, the PMIC boot voltage can be set to either
1.10V or 1.15V for VD_MPU, and either 1.06V or 1.15V for VD_CORE.
While the current values are correct, the latter set of values
are the values that are common across all DRA75x, DRA72x SoCs and
for all current Silicon revisions. So, update both the MPU and CORE
OPP_NOM voltages to 1.15V.
The macros are also slightly reorganized so that both the MPU and
CORE voltage domain values are defined together.
Signed-off-by: Suman Anna <s-anna@ti.com>
---
arch/arm/include/asm/arch-omap5/clock.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h
index 38d50d6..9180c67 100644
--- a/arch/arm/include/asm/arch-omap5/clock.h
+++ b/arch/arm/include/asm/arch-omap5/clock.h
@@ -240,17 +240,17 @@
#define VDD_MM_ES2_LOW 880
/* DRA74x/75x voltage settings in mv for OPP_NOM per DM */
-#define VDD_MPU_DRA752 1100
+#define VDD_MPU_DRA752 1150
+#define VDD_CORE_DRA752 1150
#define VDD_EVE_DRA752 1060
#define VDD_GPU_DRA752 1060
-#define VDD_CORE_DRA752 1060
#define VDD_IVA_DRA752 1060
/* DRA72x voltage settings in mv for OPP_NOM per DM */
-#define VDD_MPU_DRA72x 1100
+#define VDD_MPU_DRA72x 1150
+#define VDD_CORE_DRA72x 1150
#define VDD_EVE_DRA72x 1060
#define VDD_GPU_DRA72x 1060
-#define VDD_CORE_DRA72x 1060
#define VDD_IVA_DRA72x 1060
/* Efuse register offsets for DRA7xx platform */
--
2.8.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/4] ARM: DRA7: Define common macros for efuse register offsets
2016-05-23 18:32 [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
2016-05-23 18:32 ` [U-Boot] [PATCH 1/4] ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values Suman Anna
@ 2016-05-23 18:32 ` Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-23 18:32 ` [U-Boot] [PATCH 3/4] ARM: DRA7: Consolidate voltage macros across different SoCs Suman Anna
` (2 subsequent siblings)
4 siblings, 2 replies; 15+ messages in thread
From: Suman Anna @ 2016-05-23 18:32 UTC (permalink / raw)
To: u-boot
Define a set of common macros for the efuse register offsets
(different for each OPP) that are used to get the AVS Class 0
voltage values and ABB configuration values. Assign these
common macros to the register offsets for OPP_NOM by default
for all voltage domains. These common macros can then be
redefined properly to point to the OPP specific efuse register
offset based on the desired OPP to program a specific voltage
domain.
Signed-off-by: Suman Anna <s-anna@ti.com>
---
arch/arm/cpu/armv7/omap5/hw_data.c | 20 ++++++++++----------
arch/arm/include/asm/arch-omap5/clock.h | 7 +++++++
board/ti/am57xx/board.c | 10 +++++-----
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c b/arch/arm/cpu/armv7/omap5/hw_data.c
index 88e8920..948461a 100644
--- a/arch/arm/cpu/armv7/omap5/hw_data.c
+++ b/arch/arm/cpu/armv7/omap5/hw_data.c
@@ -366,34 +366,34 @@ struct vcores_data omap5430_volts_es2 = {
struct vcores_data dra752_volts = {
.mpu.value = VDD_MPU_DRA752,
- .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU_NOM,
+ .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
.mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.mpu.addr = TPS659038_REG_ADDR_SMPS12,
.mpu.pmic = &tps659038,
.mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
.eve.value = VDD_EVE_DRA752,
- .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE_NOM,
+ .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
.eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.eve.addr = TPS659038_REG_ADDR_SMPS45,
.eve.pmic = &tps659038,
.eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
.gpu.value = VDD_GPU_DRA752,
- .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU_NOM,
+ .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
.gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.gpu.addr = TPS659038_REG_ADDR_SMPS6,
.gpu.pmic = &tps659038,
.gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
.core.value = VDD_CORE_DRA752,
- .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE_NOM,
+ .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
.core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.core.addr = TPS659038_REG_ADDR_SMPS7,
.core.pmic = &tps659038,
.iva.value = VDD_IVA_DRA752,
- .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA_NOM,
+ .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
.iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.iva.addr = TPS659038_REG_ADDR_SMPS8,
.iva.pmic = &tps659038,
@@ -402,14 +402,14 @@ struct vcores_data dra752_volts = {
struct vcores_data dra722_volts = {
.mpu.value = VDD_MPU_DRA72x,
- .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU_NOM,
+ .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
.mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.mpu.addr = TPS65917_REG_ADDR_SMPS1,
.mpu.pmic = &tps659038,
.mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
.core.value = VDD_CORE_DRA72x,
- .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE_NOM,
+ .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
.core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.core.addr = TPS65917_REG_ADDR_SMPS2,
.core.pmic = &tps659038,
@@ -419,21 +419,21 @@ struct vcores_data dra722_volts = {
* designs and powered by TPS65917 SMPS3, as on the J6Eco EVM.
*/
.gpu.value = VDD_GPU_DRA72x,
- .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU_NOM,
+ .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
.gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.gpu.addr = TPS65917_REG_ADDR_SMPS3,
.gpu.pmic = &tps659038,
.gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
.eve.value = VDD_EVE_DRA72x,
- .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE_NOM,
+ .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
.eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.eve.addr = TPS65917_REG_ADDR_SMPS3,
.eve.pmic = &tps659038,
.eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
.iva.value = VDD_IVA_DRA72x,
- .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA_NOM,
+ .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
.iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.iva.addr = TPS65917_REG_ADDR_SMPS3,
.iva.pmic = &tps659038,
diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h
index 9180c67..a850043 100644
--- a/arch/arm/include/asm/arch-omap5/clock.h
+++ b/arch/arm/include/asm/arch-omap5/clock.h
@@ -283,6 +283,13 @@
/* STD_FUSE_OPP_VMIN_MPU_4 */
#define STD_FUSE_OPP_VMIN_MPU_HIGH (DRA752_EFUSE_BASE + 0x1B28)
+/* Common Efuse register macros */
+#define STD_FUSE_OPP_VMIN_MPU STD_FUSE_OPP_VMIN_MPU_NOM
+#define STD_FUSE_OPP_VMIN_CORE STD_FUSE_OPP_VMIN_CORE_NOM
+#define STD_FUSE_OPP_VMIN_DSPEVE STD_FUSE_OPP_VMIN_DSPEVE_NOM
+#define STD_FUSE_OPP_VMIN_GPU STD_FUSE_OPP_VMIN_GPU_NOM
+#define STD_FUSE_OPP_VMIN_IVA STD_FUSE_OPP_VMIN_IVA_NOM
+
/* Standard offset is 0.5v expressed in uv */
#define PALMAS_SMPS_BASE_VOLT_UV 500000
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 86b8f6e..1e978dc 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -217,34 +217,34 @@ void emif_get_ext_phy_ctrl_const_regs(u32 emif_nr, const u32 **regs, u32 *size)
struct vcores_data beagle_x15_volts = {
.mpu.value = VDD_MPU_DRA752,
- .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU_NOM,
+ .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
.mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.mpu.addr = TPS659038_REG_ADDR_SMPS12,
.mpu.pmic = &tps659038,
.mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
.eve.value = VDD_EVE_DRA752,
- .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE_NOM,
+ .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
.eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.eve.addr = TPS659038_REG_ADDR_SMPS45,
.eve.pmic = &tps659038,
.eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
.gpu.value = VDD_GPU_DRA752,
- .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU_NOM,
+ .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
.gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.gpu.addr = TPS659038_REG_ADDR_SMPS45,
.gpu.pmic = &tps659038,
.gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
.core.value = VDD_CORE_DRA752,
- .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE_NOM,
+ .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
.core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.core.addr = TPS659038_REG_ADDR_SMPS6,
.core.pmic = &tps659038,
.iva.value = VDD_IVA_DRA752,
- .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA_NOM,
+ .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
.iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.iva.addr = TPS659038_REG_ADDR_SMPS45,
.iva.pmic = &tps659038,
--
2.8.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/4] ARM: DRA7: Consolidate voltage macros across different SoCs
2016-05-23 18:32 [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
2016-05-23 18:32 ` [U-Boot] [PATCH 1/4] ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values Suman Anna
2016-05-23 18:32 ` [U-Boot] [PATCH 2/4] ARM: DRA7: Define common macros for efuse register offsets Suman Anna
@ 2016-05-23 18:32 ` Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-23 18:32 ` [U-Boot] [PATCH 4/4] ARM: DRA7: Add macros for voltage values for all OPPs Suman Anna
2016-06-03 15:45 ` [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
4 siblings, 2 replies; 15+ messages in thread
From: Suman Anna @ 2016-05-23 18:32 UTC (permalink / raw)
To: u-boot
The voltage values for each voltage domain at an OPP is identical
across all the SoCs in the DRA7 family. The current code defines
one set of macros for DRA75x/DRA74x SoCs and another set for DRA72x
macros. Consolidate both these sets into a single set.
This is done so as to minimize the number of macros used when voltage
values will be added for other OPPs as well.
Signed-off-by: Suman Anna <s-anna@ti.com>
---
arch/arm/cpu/armv7/omap5/hw_data.c | 20 ++++++++++----------
arch/arm/include/asm/arch-omap5/clock.h | 19 ++++++-------------
board/ti/am57xx/board.c | 10 +++++-----
3 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c b/arch/arm/cpu/armv7/omap5/hw_data.c
index 948461a..b0c83ad 100644
--- a/arch/arm/cpu/armv7/omap5/hw_data.c
+++ b/arch/arm/cpu/armv7/omap5/hw_data.c
@@ -365,34 +365,34 @@ struct vcores_data omap5430_volts_es2 = {
};
struct vcores_data dra752_volts = {
- .mpu.value = VDD_MPU_DRA752,
+ .mpu.value = VDD_MPU_DRA7,
.mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
.mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.mpu.addr = TPS659038_REG_ADDR_SMPS12,
.mpu.pmic = &tps659038,
.mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
- .eve.value = VDD_EVE_DRA752,
+ .eve.value = VDD_EVE_DRA7,
.eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
.eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.eve.addr = TPS659038_REG_ADDR_SMPS45,
.eve.pmic = &tps659038,
.eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
- .gpu.value = VDD_GPU_DRA752,
+ .gpu.value = VDD_GPU_DRA7,
.gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
.gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.gpu.addr = TPS659038_REG_ADDR_SMPS6,
.gpu.pmic = &tps659038,
.gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
- .core.value = VDD_CORE_DRA752,
+ .core.value = VDD_CORE_DRA7,
.core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
.core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.core.addr = TPS659038_REG_ADDR_SMPS7,
.core.pmic = &tps659038,
- .iva.value = VDD_IVA_DRA752,
+ .iva.value = VDD_IVA_DRA7,
.iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
.iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.iva.addr = TPS659038_REG_ADDR_SMPS8,
@@ -401,14 +401,14 @@ struct vcores_data dra752_volts = {
};
struct vcores_data dra722_volts = {
- .mpu.value = VDD_MPU_DRA72x,
+ .mpu.value = VDD_MPU_DRA7,
.mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
.mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.mpu.addr = TPS65917_REG_ADDR_SMPS1,
.mpu.pmic = &tps659038,
.mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
- .core.value = VDD_CORE_DRA72x,
+ .core.value = VDD_CORE_DRA7,
.core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
.core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.core.addr = TPS65917_REG_ADDR_SMPS2,
@@ -418,21 +418,21 @@ struct vcores_data dra722_volts = {
* The DSPEVE, GPU and IVA rails are usually grouped on DRA72x
* designs and powered by TPS65917 SMPS3, as on the J6Eco EVM.
*/
- .gpu.value = VDD_GPU_DRA72x,
+ .gpu.value = VDD_GPU_DRA7,
.gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
.gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.gpu.addr = TPS65917_REG_ADDR_SMPS3,
.gpu.pmic = &tps659038,
.gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
- .eve.value = VDD_EVE_DRA72x,
+ .eve.value = VDD_EVE_DRA7,
.eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
.eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.eve.addr = TPS65917_REG_ADDR_SMPS3,
.eve.pmic = &tps659038,
.eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
- .iva.value = VDD_IVA_DRA72x,
+ .iva.value = VDD_IVA_DRA7,
.iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
.iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.iva.addr = TPS65917_REG_ADDR_SMPS3,
diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h
index a850043..8c121d6 100644
--- a/arch/arm/include/asm/arch-omap5/clock.h
+++ b/arch/arm/include/asm/arch-omap5/clock.h
@@ -239,19 +239,12 @@
#define VDD_MPU_ES2_LOW 880
#define VDD_MM_ES2_LOW 880
-/* DRA74x/75x voltage settings in mv for OPP_NOM per DM */
-#define VDD_MPU_DRA752 1150
-#define VDD_CORE_DRA752 1150
-#define VDD_EVE_DRA752 1060
-#define VDD_GPU_DRA752 1060
-#define VDD_IVA_DRA752 1060
-
-/* DRA72x voltage settings in mv for OPP_NOM per DM */
-#define VDD_MPU_DRA72x 1150
-#define VDD_CORE_DRA72x 1150
-#define VDD_EVE_DRA72x 1060
-#define VDD_GPU_DRA72x 1060
-#define VDD_IVA_DRA72x 1060
+/* DRA74x/75x/72x voltage settings in mv for OPP_NOM per DM */
+#define VDD_MPU_DRA7 1150
+#define VDD_CORE_DRA7 1150
+#define VDD_EVE_DRA7 1060
+#define VDD_GPU_DRA7 1060
+#define VDD_IVA_DRA7 1060
/* Efuse register offsets for DRA7xx platform */
#define DRA752_EFUSE_BASE 0x4A002000
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 1e978dc..a6a4ccb 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -216,34 +216,34 @@ void emif_get_ext_phy_ctrl_const_regs(u32 emif_nr, const u32 **regs, u32 *size)
}
struct vcores_data beagle_x15_volts = {
- .mpu.value = VDD_MPU_DRA752,
+ .mpu.value = VDD_MPU_DRA7,
.mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
.mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.mpu.addr = TPS659038_REG_ADDR_SMPS12,
.mpu.pmic = &tps659038,
.mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
- .eve.value = VDD_EVE_DRA752,
+ .eve.value = VDD_EVE_DRA7,
.eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
.eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.eve.addr = TPS659038_REG_ADDR_SMPS45,
.eve.pmic = &tps659038,
.eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
- .gpu.value = VDD_GPU_DRA752,
+ .gpu.value = VDD_GPU_DRA7,
.gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
.gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.gpu.addr = TPS659038_REG_ADDR_SMPS45,
.gpu.pmic = &tps659038,
.gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
- .core.value = VDD_CORE_DRA752,
+ .core.value = VDD_CORE_DRA7,
.core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
.core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.core.addr = TPS659038_REG_ADDR_SMPS6,
.core.pmic = &tps659038,
- .iva.value = VDD_IVA_DRA752,
+ .iva.value = VDD_IVA_DRA7,
.iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
.iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
.iva.addr = TPS659038_REG_ADDR_SMPS45,
--
2.8.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 4/4] ARM: DRA7: Add macros for voltage values for all OPPs
2016-05-23 18:32 [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
` (2 preceding siblings ...)
2016-05-23 18:32 ` [U-Boot] [PATCH 3/4] ARM: DRA7: Consolidate voltage macros across different SoCs Suman Anna
@ 2016-05-23 18:32 ` Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-06-03 15:45 ` [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
4 siblings, 2 replies; 15+ messages in thread
From: Suman Anna @ 2016-05-23 18:32 UTC (permalink / raw)
To: u-boot
Define specific macros for the voltage values for all voltage
domains for all applicable OPPs - OPP_NOM, OPP_OD and OPP_HIGH.
No separate macros are defined for VD_MPU and VD_CORE at OPP_OD
and OPP_HIGH as these use the same values as OPP_NOM.
The current macros will be used as common macros that can be
redefined appropriately based on a selected OPP configuration
at build time.
Signed-off-by: Suman Anna <s-anna@ti.com>
---
arch/arm/include/asm/arch-omap5/clock.h | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h
index 8c121d6..551c927 100644
--- a/arch/arm/include/asm/arch-omap5/clock.h
+++ b/arch/arm/include/asm/arch-omap5/clock.h
@@ -240,11 +240,21 @@
#define VDD_MM_ES2_LOW 880
/* DRA74x/75x/72x voltage settings in mv for OPP_NOM per DM */
-#define VDD_MPU_DRA7 1150
-#define VDD_CORE_DRA7 1150
-#define VDD_EVE_DRA7 1060
-#define VDD_GPU_DRA7 1060
-#define VDD_IVA_DRA7 1060
+#define VDD_MPU_DRA7_NOM 1150
+#define VDD_CORE_DRA7_NOM 1150
+#define VDD_EVE_DRA7_NOM 1060
+#define VDD_GPU_DRA7_NOM 1060
+#define VDD_IVA_DRA7_NOM 1060
+
+/* DRA74x/75x/72x voltage settings in mv for OPP_OD per DM */
+#define VDD_EVE_DRA7_OD 1150
+#define VDD_GPU_DRA7_OD 1150
+#define VDD_IVA_DRA7_OD 1150
+
+/* DRA74x/75x/72x voltage settings in mv for OPP_HIGH per DM */
+#define VDD_EVE_DRA7_HIGH 1250
+#define VDD_GPU_DRA7_HIGH 1250
+#define VDD_IVA_DRA7_HIGH 1250
/* Efuse register offsets for DRA7xx platform */
#define DRA752_EFUSE_BASE 0x4A002000
@@ -276,7 +286,14 @@
/* STD_FUSE_OPP_VMIN_MPU_4 */
#define STD_FUSE_OPP_VMIN_MPU_HIGH (DRA752_EFUSE_BASE + 0x1B28)
-/* Common Efuse register macros */
+/* Common voltage and Efuse register macros */
+/* DRA74x/DRA75x/DRA72x */
+#define VDD_MPU_DRA7 VDD_MPU_DRA7_NOM
+#define VDD_CORE_DRA7 VDD_CORE_DRA7_NOM
+#define VDD_EVE_DRA7 VDD_EVE_DRA7_NOM
+#define VDD_GPU_DRA7 VDD_GPU_DRA7_NOM
+#define VDD_IVA_DRA7 VDD_IVA_DRA7_NOM
+
#define STD_FUSE_OPP_VMIN_MPU STD_FUSE_OPP_VMIN_MPU_NOM
#define STD_FUSE_OPP_VMIN_CORE STD_FUSE_OPP_VMIN_CORE_NOM
#define STD_FUSE_OPP_VMIN_DSPEVE STD_FUSE_OPP_VMIN_DSPEVE_NOM
--
2.8.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/4] ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values
2016-05-23 18:32 ` [U-Boot] [PATCH 1/4] ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values Suman Anna
@ 2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Lokesh Vutla @ 2016-05-24 12:33 UTC (permalink / raw)
To: u-boot
On Tuesday 24 May 2016 12:02 AM, Suman Anna wrote:
> The current OPP_NOM voltage values defined for the MPU and CORE
> voltage domains are based on the initial DRA75x_74x_SR1.1_DM data
> manual. As per this DM, the PMIC boot voltage can be set to either
> 1.10V or 1.15V for VD_MPU, and either 1.06V or 1.15V for VD_CORE.
> While the current values are correct, the latter set of values
> are the values that are common across all DRA75x, DRA72x SoCs and
> for all current Silicon revisions. So, update both the MPU and CORE
> OPP_NOM voltages to 1.15V.
>
> The macros are also slightly reorganized so that both the MPU and
> CORE voltage domain values are defined together.
>
> Signed-off-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Thanks and regards,
Lokesh
> ---
> arch/arm/include/asm/arch-omap5/clock.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h
> index 38d50d6..9180c67 100644
> --- a/arch/arm/include/asm/arch-omap5/clock.h
> +++ b/arch/arm/include/asm/arch-omap5/clock.h
> @@ -240,17 +240,17 @@
> #define VDD_MM_ES2_LOW 880
>
> /* DRA74x/75x voltage settings in mv for OPP_NOM per DM */
> -#define VDD_MPU_DRA752 1100
> +#define VDD_MPU_DRA752 1150
> +#define VDD_CORE_DRA752 1150
> #define VDD_EVE_DRA752 1060
> #define VDD_GPU_DRA752 1060
> -#define VDD_CORE_DRA752 1060
> #define VDD_IVA_DRA752 1060
>
> /* DRA72x voltage settings in mv for OPP_NOM per DM */
> -#define VDD_MPU_DRA72x 1100
> +#define VDD_MPU_DRA72x 1150
> +#define VDD_CORE_DRA72x 1150
> #define VDD_EVE_DRA72x 1060
> #define VDD_GPU_DRA72x 1060
> -#define VDD_CORE_DRA72x 1060
> #define VDD_IVA_DRA72x 1060
>
> /* Efuse register offsets for DRA7xx platform */
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/4] ARM: DRA7: Define common macros for efuse register offsets
2016-05-23 18:32 ` [U-Boot] [PATCH 2/4] ARM: DRA7: Define common macros for efuse register offsets Suman Anna
@ 2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Lokesh Vutla @ 2016-05-24 12:33 UTC (permalink / raw)
To: u-boot
On Tuesday 24 May 2016 12:02 AM, Suman Anna wrote:
> Define a set of common macros for the efuse register offsets
> (different for each OPP) that are used to get the AVS Class 0
> voltage values and ABB configuration values. Assign these
> common macros to the register offsets for OPP_NOM by default
> for all voltage domains. These common macros can then be
> redefined properly to point to the OPP specific efuse register
> offset based on the desired OPP to program a specific voltage
> domain.
>
> Signed-off-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Thanks and regards,
Lokesh
> ---
> arch/arm/cpu/armv7/omap5/hw_data.c | 20 ++++++++++----------
> arch/arm/include/asm/arch-omap5/clock.h | 7 +++++++
> board/ti/am57xx/board.c | 10 +++++-----
> 3 files changed, 22 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c b/arch/arm/cpu/armv7/omap5/hw_data.c
> index 88e8920..948461a 100644
> --- a/arch/arm/cpu/armv7/omap5/hw_data.c
> +++ b/arch/arm/cpu/armv7/omap5/hw_data.c
> @@ -366,34 +366,34 @@ struct vcores_data omap5430_volts_es2 = {
>
> struct vcores_data dra752_volts = {
> .mpu.value = VDD_MPU_DRA752,
> - .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU_NOM,
> + .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
> .mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .mpu.addr = TPS659038_REG_ADDR_SMPS12,
> .mpu.pmic = &tps659038,
> .mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
>
> .eve.value = VDD_EVE_DRA752,
> - .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE_NOM,
> + .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
> .eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .eve.addr = TPS659038_REG_ADDR_SMPS45,
> .eve.pmic = &tps659038,
> .eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
>
> .gpu.value = VDD_GPU_DRA752,
> - .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU_NOM,
> + .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
> .gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .gpu.addr = TPS659038_REG_ADDR_SMPS6,
> .gpu.pmic = &tps659038,
> .gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
>
> .core.value = VDD_CORE_DRA752,
> - .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE_NOM,
> + .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
> .core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .core.addr = TPS659038_REG_ADDR_SMPS7,
> .core.pmic = &tps659038,
>
> .iva.value = VDD_IVA_DRA752,
> - .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA_NOM,
> + .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
> .iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .iva.addr = TPS659038_REG_ADDR_SMPS8,
> .iva.pmic = &tps659038,
> @@ -402,14 +402,14 @@ struct vcores_data dra752_volts = {
>
> struct vcores_data dra722_volts = {
> .mpu.value = VDD_MPU_DRA72x,
> - .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU_NOM,
> + .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
> .mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .mpu.addr = TPS65917_REG_ADDR_SMPS1,
> .mpu.pmic = &tps659038,
> .mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
>
> .core.value = VDD_CORE_DRA72x,
> - .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE_NOM,
> + .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
> .core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .core.addr = TPS65917_REG_ADDR_SMPS2,
> .core.pmic = &tps659038,
> @@ -419,21 +419,21 @@ struct vcores_data dra722_volts = {
> * designs and powered by TPS65917 SMPS3, as on the J6Eco EVM.
> */
> .gpu.value = VDD_GPU_DRA72x,
> - .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU_NOM,
> + .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
> .gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .gpu.addr = TPS65917_REG_ADDR_SMPS3,
> .gpu.pmic = &tps659038,
> .gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
>
> .eve.value = VDD_EVE_DRA72x,
> - .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE_NOM,
> + .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
> .eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .eve.addr = TPS65917_REG_ADDR_SMPS3,
> .eve.pmic = &tps659038,
> .eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
>
> .iva.value = VDD_IVA_DRA72x,
> - .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA_NOM,
> + .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
> .iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .iva.addr = TPS65917_REG_ADDR_SMPS3,
> .iva.pmic = &tps659038,
> diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h
> index 9180c67..a850043 100644
> --- a/arch/arm/include/asm/arch-omap5/clock.h
> +++ b/arch/arm/include/asm/arch-omap5/clock.h
> @@ -283,6 +283,13 @@
> /* STD_FUSE_OPP_VMIN_MPU_4 */
> #define STD_FUSE_OPP_VMIN_MPU_HIGH (DRA752_EFUSE_BASE + 0x1B28)
>
> +/* Common Efuse register macros */
> +#define STD_FUSE_OPP_VMIN_MPU STD_FUSE_OPP_VMIN_MPU_NOM
> +#define STD_FUSE_OPP_VMIN_CORE STD_FUSE_OPP_VMIN_CORE_NOM
> +#define STD_FUSE_OPP_VMIN_DSPEVE STD_FUSE_OPP_VMIN_DSPEVE_NOM
> +#define STD_FUSE_OPP_VMIN_GPU STD_FUSE_OPP_VMIN_GPU_NOM
> +#define STD_FUSE_OPP_VMIN_IVA STD_FUSE_OPP_VMIN_IVA_NOM
> +
> /* Standard offset is 0.5v expressed in uv */
> #define PALMAS_SMPS_BASE_VOLT_UV 500000
>
> diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
> index 86b8f6e..1e978dc 100644
> --- a/board/ti/am57xx/board.c
> +++ b/board/ti/am57xx/board.c
> @@ -217,34 +217,34 @@ void emif_get_ext_phy_ctrl_const_regs(u32 emif_nr, const u32 **regs, u32 *size)
>
> struct vcores_data beagle_x15_volts = {
> .mpu.value = VDD_MPU_DRA752,
> - .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU_NOM,
> + .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
> .mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .mpu.addr = TPS659038_REG_ADDR_SMPS12,
> .mpu.pmic = &tps659038,
> .mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
>
> .eve.value = VDD_EVE_DRA752,
> - .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE_NOM,
> + .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
> .eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .eve.addr = TPS659038_REG_ADDR_SMPS45,
> .eve.pmic = &tps659038,
> .eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
>
> .gpu.value = VDD_GPU_DRA752,
> - .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU_NOM,
> + .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
> .gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .gpu.addr = TPS659038_REG_ADDR_SMPS45,
> .gpu.pmic = &tps659038,
> .gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
>
> .core.value = VDD_CORE_DRA752,
> - .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE_NOM,
> + .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
> .core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .core.addr = TPS659038_REG_ADDR_SMPS6,
> .core.pmic = &tps659038,
>
> .iva.value = VDD_IVA_DRA752,
> - .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA_NOM,
> + .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
> .iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .iva.addr = TPS659038_REG_ADDR_SMPS45,
> .iva.pmic = &tps659038,
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/4] ARM: DRA7: Consolidate voltage macros across different SoCs
2016-05-23 18:32 ` [U-Boot] [PATCH 3/4] ARM: DRA7: Consolidate voltage macros across different SoCs Suman Anna
@ 2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Lokesh Vutla @ 2016-05-24 12:33 UTC (permalink / raw)
To: u-boot
On Tuesday 24 May 2016 12:02 AM, Suman Anna wrote:
> The voltage values for each voltage domain at an OPP is identical
> across all the SoCs in the DRA7 family. The current code defines
> one set of macros for DRA75x/DRA74x SoCs and another set for DRA72x
> macros. Consolidate both these sets into a single set.
>
> This is done so as to minimize the number of macros used when voltage
> values will be added for other OPPs as well.
>
> Signed-off-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Thanks and regards,
Lokesh
> ---
> arch/arm/cpu/armv7/omap5/hw_data.c | 20 ++++++++++----------
> arch/arm/include/asm/arch-omap5/clock.h | 19 ++++++-------------
> board/ti/am57xx/board.c | 10 +++++-----
> 3 files changed, 21 insertions(+), 28 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c b/arch/arm/cpu/armv7/omap5/hw_data.c
> index 948461a..b0c83ad 100644
> --- a/arch/arm/cpu/armv7/omap5/hw_data.c
> +++ b/arch/arm/cpu/armv7/omap5/hw_data.c
> @@ -365,34 +365,34 @@ struct vcores_data omap5430_volts_es2 = {
> };
>
> struct vcores_data dra752_volts = {
> - .mpu.value = VDD_MPU_DRA752,
> + .mpu.value = VDD_MPU_DRA7,
> .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
> .mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .mpu.addr = TPS659038_REG_ADDR_SMPS12,
> .mpu.pmic = &tps659038,
> .mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
>
> - .eve.value = VDD_EVE_DRA752,
> + .eve.value = VDD_EVE_DRA7,
> .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
> .eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .eve.addr = TPS659038_REG_ADDR_SMPS45,
> .eve.pmic = &tps659038,
> .eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
>
> - .gpu.value = VDD_GPU_DRA752,
> + .gpu.value = VDD_GPU_DRA7,
> .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
> .gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .gpu.addr = TPS659038_REG_ADDR_SMPS6,
> .gpu.pmic = &tps659038,
> .gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
>
> - .core.value = VDD_CORE_DRA752,
> + .core.value = VDD_CORE_DRA7,
> .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
> .core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .core.addr = TPS659038_REG_ADDR_SMPS7,
> .core.pmic = &tps659038,
>
> - .iva.value = VDD_IVA_DRA752,
> + .iva.value = VDD_IVA_DRA7,
> .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
> .iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .iva.addr = TPS659038_REG_ADDR_SMPS8,
> @@ -401,14 +401,14 @@ struct vcores_data dra752_volts = {
> };
>
> struct vcores_data dra722_volts = {
> - .mpu.value = VDD_MPU_DRA72x,
> + .mpu.value = VDD_MPU_DRA7,
> .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
> .mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .mpu.addr = TPS65917_REG_ADDR_SMPS1,
> .mpu.pmic = &tps659038,
> .mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
>
> - .core.value = VDD_CORE_DRA72x,
> + .core.value = VDD_CORE_DRA7,
> .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
> .core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .core.addr = TPS65917_REG_ADDR_SMPS2,
> @@ -418,21 +418,21 @@ struct vcores_data dra722_volts = {
> * The DSPEVE, GPU and IVA rails are usually grouped on DRA72x
> * designs and powered by TPS65917 SMPS3, as on the J6Eco EVM.
> */
> - .gpu.value = VDD_GPU_DRA72x,
> + .gpu.value = VDD_GPU_DRA7,
> .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
> .gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .gpu.addr = TPS65917_REG_ADDR_SMPS3,
> .gpu.pmic = &tps659038,
> .gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
>
> - .eve.value = VDD_EVE_DRA72x,
> + .eve.value = VDD_EVE_DRA7,
> .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
> .eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .eve.addr = TPS65917_REG_ADDR_SMPS3,
> .eve.pmic = &tps659038,
> .eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
>
> - .iva.value = VDD_IVA_DRA72x,
> + .iva.value = VDD_IVA_DRA7,
> .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
> .iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .iva.addr = TPS65917_REG_ADDR_SMPS3,
> diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h
> index a850043..8c121d6 100644
> --- a/arch/arm/include/asm/arch-omap5/clock.h
> +++ b/arch/arm/include/asm/arch-omap5/clock.h
> @@ -239,19 +239,12 @@
> #define VDD_MPU_ES2_LOW 880
> #define VDD_MM_ES2_LOW 880
>
> -/* DRA74x/75x voltage settings in mv for OPP_NOM per DM */
> -#define VDD_MPU_DRA752 1150
> -#define VDD_CORE_DRA752 1150
> -#define VDD_EVE_DRA752 1060
> -#define VDD_GPU_DRA752 1060
> -#define VDD_IVA_DRA752 1060
> -
> -/* DRA72x voltage settings in mv for OPP_NOM per DM */
> -#define VDD_MPU_DRA72x 1150
> -#define VDD_CORE_DRA72x 1150
> -#define VDD_EVE_DRA72x 1060
> -#define VDD_GPU_DRA72x 1060
> -#define VDD_IVA_DRA72x 1060
> +/* DRA74x/75x/72x voltage settings in mv for OPP_NOM per DM */
> +#define VDD_MPU_DRA7 1150
> +#define VDD_CORE_DRA7 1150
> +#define VDD_EVE_DRA7 1060
> +#define VDD_GPU_DRA7 1060
> +#define VDD_IVA_DRA7 1060
>
> /* Efuse register offsets for DRA7xx platform */
> #define DRA752_EFUSE_BASE 0x4A002000
> diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
> index 1e978dc..a6a4ccb 100644
> --- a/board/ti/am57xx/board.c
> +++ b/board/ti/am57xx/board.c
> @@ -216,34 +216,34 @@ void emif_get_ext_phy_ctrl_const_regs(u32 emif_nr, const u32 **regs, u32 *size)
> }
>
> struct vcores_data beagle_x15_volts = {
> - .mpu.value = VDD_MPU_DRA752,
> + .mpu.value = VDD_MPU_DRA7,
> .mpu.efuse.reg = STD_FUSE_OPP_VMIN_MPU,
> .mpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .mpu.addr = TPS659038_REG_ADDR_SMPS12,
> .mpu.pmic = &tps659038,
> .mpu.abb_tx_done_mask = OMAP_ABB_MPU_TXDONE_MASK,
>
> - .eve.value = VDD_EVE_DRA752,
> + .eve.value = VDD_EVE_DRA7,
> .eve.efuse.reg = STD_FUSE_OPP_VMIN_DSPEVE,
> .eve.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .eve.addr = TPS659038_REG_ADDR_SMPS45,
> .eve.pmic = &tps659038,
> .eve.abb_tx_done_mask = OMAP_ABB_EVE_TXDONE_MASK,
>
> - .gpu.value = VDD_GPU_DRA752,
> + .gpu.value = VDD_GPU_DRA7,
> .gpu.efuse.reg = STD_FUSE_OPP_VMIN_GPU,
> .gpu.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .gpu.addr = TPS659038_REG_ADDR_SMPS45,
> .gpu.pmic = &tps659038,
> .gpu.abb_tx_done_mask = OMAP_ABB_GPU_TXDONE_MASK,
>
> - .core.value = VDD_CORE_DRA752,
> + .core.value = VDD_CORE_DRA7,
> .core.efuse.reg = STD_FUSE_OPP_VMIN_CORE,
> .core.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .core.addr = TPS659038_REG_ADDR_SMPS6,
> .core.pmic = &tps659038,
>
> - .iva.value = VDD_IVA_DRA752,
> + .iva.value = VDD_IVA_DRA7,
> .iva.efuse.reg = STD_FUSE_OPP_VMIN_IVA,
> .iva.efuse.reg_bits = DRA752_EFUSE_REGBITS,
> .iva.addr = TPS659038_REG_ADDR_SMPS45,
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 4/4] ARM: DRA7: Add macros for voltage values for all OPPs
2016-05-23 18:32 ` [U-Boot] [PATCH 4/4] ARM: DRA7: Add macros for voltage values for all OPPs Suman Anna
@ 2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Lokesh Vutla @ 2016-05-24 12:33 UTC (permalink / raw)
To: u-boot
On Tuesday 24 May 2016 12:02 AM, Suman Anna wrote:
> Define specific macros for the voltage values for all voltage
> domains for all applicable OPPs - OPP_NOM, OPP_OD and OPP_HIGH.
> No separate macros are defined for VD_MPU and VD_CORE at OPP_OD
> and OPP_HIGH as these use the same values as OPP_NOM.
>
> The current macros will be used as common macros that can be
> redefined appropriately based on a selected OPP configuration
> at build time.
>
> Signed-off-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Thanks and regards,
Lokesh
> ---
> arch/arm/include/asm/arch-omap5/clock.h | 29 +++++++++++++++++++++++------
> 1 file changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h
> index 8c121d6..551c927 100644
> --- a/arch/arm/include/asm/arch-omap5/clock.h
> +++ b/arch/arm/include/asm/arch-omap5/clock.h
> @@ -240,11 +240,21 @@
> #define VDD_MM_ES2_LOW 880
>
> /* DRA74x/75x/72x voltage settings in mv for OPP_NOM per DM */
> -#define VDD_MPU_DRA7 1150
> -#define VDD_CORE_DRA7 1150
> -#define VDD_EVE_DRA7 1060
> -#define VDD_GPU_DRA7 1060
> -#define VDD_IVA_DRA7 1060
> +#define VDD_MPU_DRA7_NOM 1150
> +#define VDD_CORE_DRA7_NOM 1150
> +#define VDD_EVE_DRA7_NOM 1060
> +#define VDD_GPU_DRA7_NOM 1060
> +#define VDD_IVA_DRA7_NOM 1060
> +
> +/* DRA74x/75x/72x voltage settings in mv for OPP_OD per DM */
> +#define VDD_EVE_DRA7_OD 1150
> +#define VDD_GPU_DRA7_OD 1150
> +#define VDD_IVA_DRA7_OD 1150
> +
> +/* DRA74x/75x/72x voltage settings in mv for OPP_HIGH per DM */
> +#define VDD_EVE_DRA7_HIGH 1250
> +#define VDD_GPU_DRA7_HIGH 1250
> +#define VDD_IVA_DRA7_HIGH 1250
>
> /* Efuse register offsets for DRA7xx platform */
> #define DRA752_EFUSE_BASE 0x4A002000
> @@ -276,7 +286,14 @@
> /* STD_FUSE_OPP_VMIN_MPU_4 */
> #define STD_FUSE_OPP_VMIN_MPU_HIGH (DRA752_EFUSE_BASE + 0x1B28)
>
> -/* Common Efuse register macros */
> +/* Common voltage and Efuse register macros */
> +/* DRA74x/DRA75x/DRA72x */
> +#define VDD_MPU_DRA7 VDD_MPU_DRA7_NOM
> +#define VDD_CORE_DRA7 VDD_CORE_DRA7_NOM
> +#define VDD_EVE_DRA7 VDD_EVE_DRA7_NOM
> +#define VDD_GPU_DRA7 VDD_GPU_DRA7_NOM
> +#define VDD_IVA_DRA7 VDD_IVA_DRA7_NOM
> +
> #define STD_FUSE_OPP_VMIN_MPU STD_FUSE_OPP_VMIN_MPU_NOM
> #define STD_FUSE_OPP_VMIN_CORE STD_FUSE_OPP_VMIN_CORE_NOM
> #define STD_FUSE_OPP_VMIN_DSPEVE STD_FUSE_OPP_VMIN_DSPEVE_NOM
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [U-Boot, 1/4] ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values
2016-05-23 18:32 ` [U-Boot] [PATCH 1/4] ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
@ 2016-06-03 13:58 ` Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Tom Rini @ 2016-06-03 13:58 UTC (permalink / raw)
To: u-boot
On Mon, May 23, 2016 at 01:32:14PM -0500, Anna, Suman wrote:
> The current OPP_NOM voltage values defined for the MPU and CORE
> voltage domains are based on the initial DRA75x_74x_SR1.1_DM data
> manual. As per this DM, the PMIC boot voltage can be set to either
> 1.10V or 1.15V for VD_MPU, and either 1.06V or 1.15V for VD_CORE.
> While the current values are correct, the latter set of values
> are the values that are common across all DRA75x, DRA72x SoCs and
> for all current Silicon revisions. So, update both the MPU and CORE
> OPP_NOM voltages to 1.15V.
>
> The macros are also slightly reorganized so that both the MPU and
> CORE voltage domain values are defined together.
>
> Signed-off-by: Suman Anna <s-anna@ti.com>
> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160603/5767ac78/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [U-Boot, 2/4] ARM: DRA7: Define common macros for efuse register offsets
2016-05-23 18:32 ` [U-Boot] [PATCH 2/4] ARM: DRA7: Define common macros for efuse register offsets Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
@ 2016-06-03 13:58 ` Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Tom Rini @ 2016-06-03 13:58 UTC (permalink / raw)
To: u-boot
On Mon, May 23, 2016 at 01:32:15PM -0500, Anna, Suman wrote:
> Define a set of common macros for the efuse register offsets
> (different for each OPP) that are used to get the AVS Class 0
> voltage values and ABB configuration values. Assign these
> common macros to the register offsets for OPP_NOM by default
> for all voltage domains. These common macros can then be
> redefined properly to point to the OPP specific efuse register
> offset based on the desired OPP to program a specific voltage
> domain.
>
> Signed-off-by: Suman Anna <s-anna@ti.com>
> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160603/b6f31826/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [U-Boot, 3/4] ARM: DRA7: Consolidate voltage macros across different SoCs
2016-05-23 18:32 ` [U-Boot] [PATCH 3/4] ARM: DRA7: Consolidate voltage macros across different SoCs Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
@ 2016-06-03 13:58 ` Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Tom Rini @ 2016-06-03 13:58 UTC (permalink / raw)
To: u-boot
On Mon, May 23, 2016 at 01:32:16PM -0500, Anna, Suman wrote:
> The voltage values for each voltage domain at an OPP is identical
> across all the SoCs in the DRA7 family. The current code defines
> one set of macros for DRA75x/DRA74x SoCs and another set for DRA72x
> macros. Consolidate both these sets into a single set.
>
> This is done so as to minimize the number of macros used when voltage
> values will be added for other OPPs as well.
>
> Signed-off-by: Suman Anna <s-anna@ti.com>
> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160603/05d8fcf9/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [U-Boot, 4/4] ARM: DRA7: Add macros for voltage values for all OPPs
2016-05-23 18:32 ` [U-Boot] [PATCH 4/4] ARM: DRA7: Add macros for voltage values for all OPPs Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
@ 2016-06-03 13:58 ` Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Tom Rini @ 2016-06-03 13:58 UTC (permalink / raw)
To: u-boot
On Mon, May 23, 2016 at 01:32:17PM -0500, Anna, Suman wrote:
> Define specific macros for the voltage values for all voltage
> domains for all applicable OPPs - OPP_NOM, OPP_OD and OPP_HIGH.
> No separate macros are defined for VD_MPU and VD_CORE at OPP_OD
> and OPP_HIGH as these use the same values as OPP_NOM.
>
> The current macros will be used as common macros that can be
> redefined appropriately based on a selected OPP configuration
> at build time.
>
> Signed-off-by: Suman Anna <s-anna@ti.com>
> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160603/f0f0e291/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation
2016-05-23 18:32 [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
` (3 preceding siblings ...)
2016-05-23 18:32 ` [U-Boot] [PATCH 4/4] ARM: DRA7: Add macros for voltage values for all OPPs Suman Anna
@ 2016-06-03 15:45 ` Suman Anna
2016-06-03 20:30 ` Tom Rini
4 siblings, 1 reply; 15+ messages in thread
From: Suman Anna @ 2016-06-03 15:45 UTC (permalink / raw)
To: u-boot
Hi Tom,
On 05/23/2016 01:32 PM, Anna, Suman wrote:
> Hi Tom,
>
> The following series consolidates the current macros used
> for Voltage configuration on DRA7/AM57xx platforms. This is a
> preparatory series for a follow-up series that introduces
> the ability to choose OPP configurations at boot time for
> various voltage domains using Kconfigs. I will submit that
> series once the "Support for boot image creation for TI secure
> devices" series [1] gets merged.
>
> Patches based on current u-boot master commit 4b6e1fd,
> and a commit [2] to fix current SPL boot issues on DRA7
> platforms.
Any comments on this series? We would like the voltages to be fixed for
the AM57xx IDKs in the current -rc cycle, and that series [3] depends on
these patches.
regards
Suman
[3] http://marc.info/?l=u-boot&m=146408767916418&w=2
>
> [1] http://marc.info/?l=u-boot&m=146370308317931&w=2
> [2] https://patchwork.ozlabs.org/patch/624267/
>
> Suman Anna (4):
> ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values
> ARM: DRA7: Define common macros for efuse register offsets
> ARM: DRA7: Consolidate voltage macros across different SoCs
> ARM: DRA7: Add macros for voltage values for all OPPs
>
> arch/arm/cpu/armv7/omap5/hw_data.c | 40 +++++++++++++++---------------
> arch/arm/include/asm/arch-omap5/clock.h | 43 +++++++++++++++++++++++----------
> board/ti/am57xx/board.c | 20 +++++++--------
> 3 files changed, 60 insertions(+), 43 deletions(-)
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation
2016-06-03 15:45 ` [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
@ 2016-06-03 20:30 ` Tom Rini
0 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2016-06-03 20:30 UTC (permalink / raw)
To: u-boot
On Fri, Jun 03, 2016 at 10:45:29AM -0500, Suman Anna wrote:
> Hi Tom,
>
> On 05/23/2016 01:32 PM, Anna, Suman wrote:
> > Hi Tom,
> >
> > The following series consolidates the current macros used
> > for Voltage configuration on DRA7/AM57xx platforms. This is a
> > preparatory series for a follow-up series that introduces
> > the ability to choose OPP configurations at boot time for
> > various voltage domains using Kconfigs. I will submit that
> > series once the "Support for boot image creation for TI secure
> > devices" series [1] gets merged.
> >
> > Patches based on current u-boot master commit 4b6e1fd,
> > and a commit [2] to fix current SPL boot issues on DRA7
> > platforms.
>
> Any comments on this series? We would like the voltages to be fixed for
> the AM57xx IDKs in the current -rc cycle, and that series [3] depends on
> these patches.
>
> regards
> Suman
>
> [3] http://marc.info/?l=u-boot&m=146408767916418&w=2
Er, I applied this series and then the series in [3] :)
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160603/16391436/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2016-06-03 20:30 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-23 18:32 [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
2016-05-23 18:32 ` [U-Boot] [PATCH 1/4] ARM: DRA7: Update/Correct MPU and CORE OPP_NOM voltage values Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-23 18:32 ` [U-Boot] [PATCH 2/4] ARM: DRA7: Define common macros for efuse register offsets Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-23 18:32 ` [U-Boot] [PATCH 3/4] ARM: DRA7: Consolidate voltage macros across different SoCs Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-05-23 18:32 ` [U-Boot] [PATCH 4/4] ARM: DRA7: Add macros for voltage values for all OPPs Suman Anna
2016-05-24 12:33 ` Lokesh Vutla
2016-06-03 13:58 ` [U-Boot] [U-Boot, " Tom Rini
2016-06-03 15:45 ` [U-Boot] [PATCH 0/4] DRA7 Voltage macro consolidation Suman Anna
2016-06-03 20:30 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox