From ffecf56525abb4abe15c626c207e8e435da265b3 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Tue, 9 May 2017 16:14:36 +0200 Subject: [PATCH] UPSTREAM: soc/intel/skylake/chip.h: Reorder declarations Place `tdp_pl2_override` above the FSP options as it's not an FSP option. BUG=none BRANCH=none TEST=none Change-Id: I01bda06d9ef57890891757ed94baf2e5bb4e2f8f Signed-off-by: Patrick Georgi Original-Commit-Id: 4a47e4b8eedafa3f2099393de1f00365d1846ee5 Original-Change-Id: Idff2b628d19ce1a80294b28c55c05ba4157d07e0 Original-Signed-off-by: Nico Huber Original-Reviewed-on: https://review.coreboot.org/19637 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Philippe Mathieu-Daud Original-Reviewed-by: Stefan Reinauer Reviewed-on: https://chromium-review.googlesource.com/528184 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/soc/intel/skylake/chip.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 88d598f9a8..b4f6545c36 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -94,6 +94,9 @@ struct soc_intel_skylake_config { /* TCC activation offset */ int tcc_offset; + /* PL2 Override value in Watts */ + u32 tdp_pl2_override; + /* * The following fields come from FspUpdVpd.h. * These are configuration values that are passed to FSP during @@ -392,8 +395,6 @@ struct soc_intel_skylake_config { * Setting to 0 (default) disables Heci1 and hides the device from OS */ u8 HeciEnabled; - /* PL2 Override value in Watts */ - u32 tdp_pl2_override; u8 PmTimerDisabled; /* Intel Speed Shift Technology */ u8 speed_shift_enable;