summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2019-08-14 09:45:53 +0200
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2019-08-20 09:40:18 +0000
commit9ef977f59505b4ce18a2651ca33f7eaf2edf4371 (patch)
tree52d3f4c3a179ff00314f43725b2a6d417c56f81b /src/soc/intel
parente405c272945ef8514c3f0283e3a4ebd0b87be0ed (diff)
downloadcoreboot-9ef977f59505b4ce18a2651ca33f7eaf2edf4371.tar.xz
soc/intel/skylake/vr_config: Get rid of defines
Get rid of defines and hardcode values directly. Just a cosmetic cleanup to make it more readable. Change-Id: I3eec44b38af356c3d87235740c65e2c2f6fc5876 Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34935 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Maxim Polyakov <max.senia.poliak@gmail.com> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/skylake/vr_config.c51
1 files changed, 20 insertions, 31 deletions
diff --git a/src/soc/intel/skylake/vr_config.c b/src/soc/intel/skylake/vr_config.c
index c83e18dd1d..128ba594bf 100644
--- a/src/soc/intel/skylake/vr_config.c
+++ b/src/soc/intel/skylake/vr_config.c
@@ -20,17 +20,6 @@
#include <soc/ramstage.h>
#include <soc/vr_config.h>
-#define KBLY_ICCMAX_SA VR_CFG_AMP(4.1)
-#define KBLY_ICCMAX_CORE VR_CFG_AMP(24)
-#define AMLY_ICCMAX_CORE VR_CFG_AMP(28)
-#define KBLY_ICCMAX_GTS_GTUS VR_CFG_AMP(24)
-#define KBLR_ICCMAX_SA_U42 VR_CFG_AMP(6)
-#define KBLU_ICCMAX_SA_U22 VR_CFG_AMP(4.5)
-#define KBLR_ICCMAX_CORE_U42 VR_CFG_AMP(64)
-#define KBLU_ICCMAX_CORE_U22_PREMIUM VR_CFG_AMP(32)
-#define KBLU_ICCMAX_CORE_U22_BASE VR_CFG_AMP(29)
-#define KBLUR_ICCMAX_GTS_GTUS VR_CFG_AMP(31)
-
enum kbl_sku {
KBL_Y_SKU,
KBL_R_SKU,
@@ -61,42 +50,42 @@ static const struct {
}sku_icc_max_mapping[] = {
[KBL_Y_SKU] = {
.icc_max = {
- KBLY_ICCMAX_SA,
- KBLY_ICCMAX_CORE,
- KBLY_ICCMAX_GTS_GTUS,
- KBLY_ICCMAX_GTS_GTUS
+ VR_CFG_AMP(4.1),
+ VR_CFG_AMP(24),
+ VR_CFG_AMP(24),
+ VR_CFG_AMP(24),
}
},
[KBL_R_SKU] = {
.icc_max = {
- KBLR_ICCMAX_SA_U42,
- KBLR_ICCMAX_CORE_U42,
- KBLUR_ICCMAX_GTS_GTUS,
- KBLUR_ICCMAX_GTS_GTUS
+ VR_CFG_AMP(6),
+ VR_CFG_AMP(64),
+ VR_CFG_AMP(31),
+ VR_CFG_AMP(31),
}
},
[KBL_U_BASE_SKU] = {
.icc_max = {
- KBLU_ICCMAX_SA_U22,
- KBLU_ICCMAX_CORE_U22_BASE,
- KBLUR_ICCMAX_GTS_GTUS,
- KBLUR_ICCMAX_GTS_GTUS
+ VR_CFG_AMP(4.5),
+ VR_CFG_AMP(29),
+ VR_CFG_AMP(31),
+ VR_CFG_AMP(31),
}
},
[KBL_U_PREMIUM_SKU] = {
.icc_max = {
- KBLU_ICCMAX_SA_U22,
- KBLU_ICCMAX_CORE_U22_PREMIUM,
- KBLUR_ICCMAX_GTS_GTUS,
- KBLUR_ICCMAX_GTS_GTUS
+ VR_CFG_AMP(4.5),
+ VR_CFG_AMP(32),
+ VR_CFG_AMP(31),
+ VR_CFG_AMP(31),
}
},
[AML_Y_SKU] = {
.icc_max = {
- KBLY_ICCMAX_SA,
- AMLY_ICCMAX_CORE,
- KBLY_ICCMAX_GTS_GTUS,
- KBLY_ICCMAX_GTS_GTUS
+ VR_CFG_AMP(4.1),
+ VR_CFG_AMP(28),
+ VR_CFG_AMP(24),
+ VR_CFG_AMP(24),
}
},
};