Nick: hell E-mail: NULL Board: google/hatch Contents: From a0f54964948f494fae8f09d4b48e29c6e231b770 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Thu, 19 Aug 2021 12:10:08 +0200 Subject: [PATCH] test Change-Id: I3e8f9e19d5bfb6c3fc63cb92cc18abd48721ae66 Signed-off-by: Angel Pons --- src/mainboard/google/hatch/ramstage.c | 3 +++ .../google/hatch/variants/baseboard/Makefile.inc | 2 +- .../hatch/variants/baseboard/include/baseboard/variants.h | 3 +++ .../variants/baseboard/{mainboard.c => mainboard_puff.c} | 8 ++++---- 4 files changed, 11 insertions(+), 5 deletions(-) rename src/mainboard/google/hatch/variants/baseboard/{mainboard.c => mainboard_puff.c} (96%) diff --git a/src/mainboard/google/hatch/ramstage.c b/src/mainboard/google/hatch/ramstage.c index 93864b2ad1..a328c49a0d 100644 --- a/src/mainboard/google/hatch/ramstage.c +++ b/src/mainboard/google/hatch/ramstage.c @@ -55,6 +55,9 @@ static void mainboard_chip_init(void *chip_info) override_table, override_gpios); + if (CONFIG(BOARD_GOOGLE_BASEBOARD_PUFF)) + mainboard_puff_ramstage_init(); + variant_ramstage_init(); } diff --git a/src/mainboard/google/hatch/variants/baseboard/Makefile.inc b/src/mainboard/google/hatch/variants/baseboard/Makefile.inc index 69f9322fb5..e4f5c5f4f2 100644 --- a/src/mainboard/google/hatch/variants/baseboard/Makefile.inc +++ b/src/mainboard/google/hatch/variants/baseboard/Makefile.inc @@ -6,7 +6,7 @@ romstage-y += gpio.c romstage-y += memory.c ramstage-y += gpio.c -ramstage-$(CONFIG_BOARD_GOOGLE_BASEBOARD_PUFF) += mainboard.c +ramstage-$(CONFIG_BOARD_GOOGLE_BASEBOARD_PUFF) += mainboard_puff.c verstage-y += gpio.c diff --git a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h index 2f06a55e6f..8c4c6ebb12 100644 --- a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h @@ -40,4 +40,7 @@ void variant_ramstage_init(void); /* Perform variant specific mainboard initialization */ void variant_mainboard_enable(struct device *dev); +/* Perform puff specific initialization in ramstage. */ +void mainboard_puff_ramstage_init(void); + #endif /* BASEBOARD_VARIANTS_H */ diff --git a/src/mainboard/google/hatch/variants/baseboard/mainboard.c b/src/mainboard/google/hatch/variants/baseboard/mainboard_puff.c similarity index 96% rename from src/mainboard/google/hatch/variants/baseboard/mainboard.c rename to src/mainboard/google/hatch/variants/baseboard/mainboard_puff.c index d641405daa..d60a12be7f 100644 --- a/src/mainboard/google/hatch/variants/baseboard/mainboard.c +++ b/src/mainboard/google/hatch/variants/baseboard/mainboard_puff.c @@ -48,7 +48,7 @@ static void wait_for_hpd(gpio_t gpio, long timeout) #define PUFF_MIN_DUTYCYCLE 4 /* - * mainboard_set_power_limits + * mainboard_puff_set_power_limits * * Set Pl2 and SysPl2 values based on detected charger. * Values are defined below but we use U22 value for all SKUs for now. @@ -87,7 +87,7 @@ static void wait_for_hpd(gpio_t gpio, long timeout) #define PSYS_IMAX 9600 #define BJ_VOLTS_MV 19000 -static void mainboard_set_power_limits(struct soc_power_limits_config *conf) +static void mainboard_puff_set_power_limits(struct soc_power_limits_config *conf) { enum usb_chg_type type; u32 watts; @@ -148,7 +148,7 @@ static void mainboard_set_power_limits(struct soc_power_limits_config *conf) conf->tdp_psyspl2 = psyspl2; } -void variant_ramstage_init(void) +void mainboard_puff_ramstage_init(void) { static const long display_timeout_ms = 3000; struct soc_power_limits_config *soc_config; @@ -166,5 +166,5 @@ void variant_ramstage_init(void) } /* Psys_pmax needs to be setup before FSP-S */ soc_config = &conf->power_limits_config; - mainboard_set_power_limits(soc_config); + mainboard_puff_set_power_limits(soc_config); } -- 2.32.0