Merge branch 'master' into hx20

Author: kiram9

Makefile

@@ -262,6 +262,7 @@ include driver/build.mk
 include fuzz/build.mk
 include power/build.mk
 -include private/build.mk
+-include private-kandou/build.mk
 ifneq ($(PDIR),)
 include $(PDIR)/build.mk
 endif
@@ -285,6 +286,7 @@ all-obj-$(1)+=$(call objs_from_dir_p,chip/$(CHIP),chip,$(1))
 all-obj-$(1)+=$(call objs_from_dir_p,$(BASEDIR),baseboard,$(1))
 all-obj-$(1)+=$(call objs_from_dir_p,$(BDIR),board,$(1))
 all-obj-$(1)+=$(call objs_from_dir_p,private,private,$(1))
+all-obj-$(1)+=$(call objs_from_dir_p,private-kandou,private-kandou,$(1))
 ifneq ($(PDIR),)
 all-obj-$(1)+=$(call objs_from_dir_p,$(PDIR),$(PDIR),$(1))
 endif
@@ -310,7 +312,7 @@ $(eval $(call get_sources,ro))
 
 dirs=core/$(CORE) chip/$(CHIP) $(BASEDIR) $(BDIR) common fuzz power test \
 	cts/common cts/$(CTS_MODULE) $(out)/gen
-dirs+= private $(PDIR) $(PBDIR)
+dirs+= private private-kandou $(PDIR) $(PBDIR)
 dirs+=$(shell find common -type d)
 dirs+=$(shell find driver -type d)
 common_dirs=util

Makefile.rules

@@ -198,10 +198,13 @@ build_boards: | $(FAILED_BOARDS_DIR)
 	@rm -f $(FAILED_BOARDS_DIR)/*
 	$(MAKE) try_build_boards
 
-.PHONY: buildall
-buildall: build_boards build_cros_ec_commands
+.PHONY: buildall_only
+buildall_only: build_boards build_cros_ec_commands
 	$(MAKE) build_cts
 	$(MAKE) buildfuzztests
+
+.PHONY: buildall
+buildall: buildall_only
 	$(MAKE) runtests
 	@touch .tests-passed
 	@echo "$@ completed successfully!"
@@ -408,10 +411,10 @@ ifeq ($(V),0)
 cmd_size=
 else
 cmd_size=$(Q)awk '\
-  /__image_size =/ {image_size = strtonum($$1)} \
+  /__flash_used =/ {flash_used = strtonum($$1)} \
   /^FLASH/ {flash_size = strtonum($$3)} \
   /__ram_free =/ {ram_free = strtonum($$1)} \
-  END {room_free = flash_size - image_size; \
+  END {room_free = flash_size - flash_used; \
        print ram_free > "$(out)/$(1)/space_free_ram.txt"; \
        printf "  *** "; \
        if (flash_size > 0) { \

PRESUBMIT.cfg

@@ -12,6 +12,9 @@ tab_check: false
 checkpatch_check: --no-tree --ignore=MSLEEP,VOLATILE,SPDX_LICENSE_TAG
 kerneldoc_check: --include_regex=\bec_commands\.h$
 
+cros_license_check :
+  --exclude_regex=^third_party/linux/
+
 [Hook Scripts]
 presubmit_check = util/presubmit_check.sh
 config_option_check = util/config_option_check.py

baseboard/dedede/baseboard.c

@@ -229,6 +229,10 @@ DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, baseboard_chipset_shutdown,
 
 void board_hibernate_late(void)
 {
+	/* Disable any pull-ups on C0 and C1 interrupt lines */
+	gpio_set_flags(GPIO_USB_C0_INT_ODL, GPIO_INPUT);
+	gpio_set_flags(GPIO_USB_C1_INT_ODL, GPIO_INPUT);
+
 	/*
 	 * Turn on the Z state.  This will not return as it will cut power to
 	 * the EC.

baseboard/dedede/baseboard.h

@@ -26,16 +26,12 @@
 	/* NPCX7 config */
 	#define NPCX_UART_MODULE2 1  /* GPIO64/65 are used as UART pins. */
 	#define NPCX_TACH_SEL2    0  /* No tach. */
-	#define NPCX7_PWM1_SEL    1  /* GPIO C2 is used as PWM1. */
 
 	/* Internal SPI flash on NPCX7 */
 	#define CONFIG_FLASH_SIZE (512 * 1024)
 	#define CONFIG_SPI_FLASH_REGS
 	#define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */
 #elif defined(VARIANT_DEDEDE_EC_IT8320)
-	/* Flash clock must be > (50Mhz / 2) */
-	#define CONFIG_IT83XX_FLASH_CLOCK_48MHZ
-
 	#define I2C_PORT_EEPROM		IT83XX_I2C_CH_A
 	#define I2C_PORT_BATTERY	IT83XX_I2C_CH_B
 	#define I2C_PORT_SENSOR		IT83XX_I2C_CH_C
@@ -46,7 +42,8 @@
 
 	#define CONFIG_ADC_VOLTAGE_COMPARATOR	/* ITE ADC thresholds */
 
-	#define CONFIG_DAC			/* DAC for PSYS */
+	#undef CONFIG_UART_TX_BUF_SIZE		/* UART */
+	#define CONFIG_UART_TX_BUF_SIZE 4096
 #else
 #error "Must define a VARIANT_DEDEDE_EC!"
 #endif
@@ -85,6 +82,13 @@
 /* Work around double CR50 reset by waiting in initial power on. */
 #define CONFIG_BOARD_RESET_AFTER_POWER_ON
 
+/* Optional console commands */
+#define CONFIG_CMD_CHARGER_DUMP
+
+/* Enable AP Reset command for TPM with old firmware version to detect it. */
+#define CONFIG_CMD_AP_RESET_LOG
+#define CONFIG_HOSTCMD_AP_RESET
+
 /* Enable i2ctrace command */
 #define CONFIG_I2C_DEBUG
 
@@ -106,6 +110,7 @@
 /* Battery */
 #define CONFIG_BATTERY_CUT_OFF
 #define CONFIG_BATTERY_PRESENT_GPIO GPIO_EC_BATTERY_PRES_ODL
+#define CONFIG_BATTERY_REQUESTS_NIL_WHEN_DEAD
 #define CONFIG_BATTERY_REVIVE_DISCONNECT
 #define CONFIG_BATTERY_SMART
 
@@ -121,9 +126,9 @@
 /* Charger */
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGER
+#define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 256
 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1
-#define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON 15001
 #define CONFIG_USB_CHARGER
 #define CONFIG_TRICKLE_CHARGING
 
@@ -138,9 +143,6 @@
 /* LED */
 #define CONFIG_LED_COMMON
 
-/* PWM */
-#define CONFIG_PWM
-
 /* SoC */
 #define CONFIG_BOARD_HAS_RTC_RESET
 #define CONFIG_CHIPSET_JASPERLAKE
@@ -170,21 +172,14 @@
 #define CONFIG_USB_PD_TCPM_MUX
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_USB_PD_TRY_SRC
-/*
- * Don't attempt Try.Src if the battery is too low.  Even batteries which report
- * 1% state of charge can sometimes disable their discharge FET if the load is
- * too much.  Therefore, set this threshold a bit higher.  5% should leave
- * plenty of margin.
- */
-#undef CONFIG_USB_PD_TRY_SRC_MIN_BATT_SOC
-#define CONFIG_USB_PD_TRY_SRC_MIN_BATT_SOC 5
 /* #define CONFIG_USB_PD_VBUS_DETECT_CHARGER */
 #define CONFIG_USB_PD_VBUS_MEASURE_CHARGER
 #define CONFIG_USB_PD_DECODE_SOP
 #define CONFIG_USB_PID 0x5042
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_TCPMV2
 #define CONFIG_USB_DRP_ACC_TRYSRC
+#define CONFIG_HOSTCMD_PD_CONTROL
 
 /* UART COMMAND */
 #define CONFIG_CMD_CHARGEN

baseboard/dedede/cbi_fw_config.c

@@ -44,3 +44,9 @@ enum fw_config_tablet_mode_type get_cbi_fw_config_tablet_mode(void)
 	return ((cached_fw_config & FW_CONFIG_TABLET_MODE_MASK)
 			>> FW_CONFIG_TABLET_MODE_OFFSET);
 }
+
+int get_cbi_fw_config_keyboard(void)
+{
+	return ((cached_fw_config & FW_CONFIG_KB_LAYOUT_MASK)
+			>> FW_CONFIG_KB_LAYOUT_OFFSET);
+}

baseboard/dedede/cbi_fw_config.h

@@ -43,8 +43,13 @@ enum fw_config_tablet_mode_type {
 #define FW_CONFIG_TABLET_MODE_OFFSET		10
 #define FW_CONFIG_TABLET_MODE_MASK		GENMASK(10, 10)
 
+#define FW_CONFIG_KB_LAYOUT_OFFSET		12
+#define FW_CONFIG_KB_LAYOUT_MASK		GENMASK(13, 12)
+
 enum fw_config_db get_cbi_fw_config_db(void);
 enum fw_config_kblight_type get_cbi_fw_config_kblight(void);
 enum fw_config_tablet_mode_type get_cbi_fw_config_tablet_mode(void);
 
+int get_cbi_fw_config_keyboard(void);
+
 #endif /* _DEDEDE_CBI_FW_CONFIG__H_ */

baseboard/dedede/variant_ec_it8320.c

@@ -20,7 +20,7 @@
 
 static void pp3300_a_pgood_low(void)
 {
-	atomic_clear(&pp3300_a_pgood, 1);
+	deprecated_atomic_clear_bits(&pp3300_a_pgood, 1);
 
 	/* Disable low interrupt while asserted */
 	vcmp_enable(VCMP_SNS_PP3300_LOW, 0);
@@ -29,15 +29,15 @@ static void pp3300_a_pgood_low(void)
 	vcmp_enable(VCMP_SNS_PP3300_HIGH, 1);
 
 	/*
-	 * Call power_signal_interrupt() with a dummy GPIO in order for the
+	 * Call power_signal_interrupt() with a fake GPIO in order for the
 	 * chipset task to pick up the change in power sequencing signals.
 	 */
 	power_signal_interrupt(GPIO_PG_EC_DSW_PWROK);
 }
 
 static void pp3300_a_pgood_high(void)
 {
-	atomic_or(&pp3300_a_pgood, 1);
+	deprecated_atomic_or(&pp3300_a_pgood, 1);
 
 	/* Disable high interrupt while asserted */
 	vcmp_enable(VCMP_SNS_PP3300_HIGH, 0);
@@ -46,7 +46,7 @@ static void pp3300_a_pgood_high(void)
 	vcmp_enable(VCMP_SNS_PP3300_LOW, 1);
 
 	/*
-	 * Call power_signal_interrupt() with a dummy GPIO in order for the
+	 * Call power_signal_interrupt() with a fake GPIO in order for the
 	 * chipset task to pick up the change in power sequencing signals.
 	 */
 	power_signal_interrupt(GPIO_PG_EC_DSW_PWROK);
@@ -76,7 +76,7 @@ BUILD_ASSERT(ARRAY_SIZE(vcmp_list) == VCMP_COUNT);
 /* I2C Ports */
 const struct i2c_port_t i2c_ports[] = {
 	{
-		"eeprom", I2C_PORT_EEPROM, 1000, GPIO_EC_I2C_EEPROM_SCL,
+		"eeprom", I2C_PORT_EEPROM, 400, GPIO_EC_I2C_EEPROM_SCL,
 		GPIO_EC_I2C_EEPROM_SDA
 	},
 

baseboard/dedede/variant_ec_npcx796fc.c

@@ -16,8 +16,6 @@
 #include "i2c.h"
 #include "lid_switch.h"
 #include "power.h"
-#include "pwm.h"
-#include "pwm_chip.h"
 #include "registers.h"
 #include "task.h"
 #include "timer.h"
@@ -28,31 +26,31 @@
 
 void pp3300_a_pgood_high(void)
 {
-	atomic_or(&pp3300_a_pgood, 1);
+	deprecated_atomic_or(&pp3300_a_pgood, 1);
 
 	/* Disable this interrupt while it's asserted. */
 	npcx_adc_thresh_int_enable(NPCX_ADC_THRESH1, 0);
 	/* Enable the voltage low interrupt. */
 	npcx_adc_thresh_int_enable(NPCX_ADC_THRESH2, 1);
 
 	/*
-	 * Call power_signal_interrupt() with a dummy GPIO in order for the
+	 * Call power_signal_interrupt() with a fake GPIO in order for the
 	 * chipset task to pick up the change in power sequencing signals.
 	 */
 	power_signal_interrupt(GPIO_PG_EC_DSW_PWROK);
 }
 
 void pp3300_a_pgood_low(void)
 {
-	atomic_clear(&pp3300_a_pgood, 1);
+	deprecated_atomic_clear_bits(&pp3300_a_pgood, 1);
 
 	/* Disable this interrupt while it's asserted. */
 	npcx_adc_thresh_int_enable(NPCX_ADC_THRESH2, 0);
 	/* Enable the voltage high interrupt. */
 	npcx_adc_thresh_int_enable(NPCX_ADC_THRESH1, 1);
 
 	/*
-	 * Call power_signal_interrupt() with a dummy GPIO in order for the
+	 * Call power_signal_interrupt() with a fake GPIO in order for the
 	 * chipset task to pick up the change in power sequencing signals.
 	 */
 	power_signal_interrupt(GPIO_PG_EC_DSW_PWROK);
@@ -62,15 +60,13 @@ const struct npcx_adc_thresh_t adc_pp3300_a_pgood_high = {
 	.adc_ch = ADC_VSNS_PP3300_A,
 	.adc_thresh_cb = pp3300_a_pgood_high,
 	.thresh_assert = 2700,
-	.thresh_deassert = -1,
 };
 
 const struct npcx_adc_thresh_t adc_pp3300_a_pgood_low = {
 	.adc_ch = ADC_VSNS_PP3300_A,
 	.adc_thresh_cb = pp3300_a_pgood_low,
 	.lower_or_higher = 1,
 	.thresh_assert = 600,
-	.thresh_deassert = -1,
 };
 
 static void set_up_adc_irqs(void)
@@ -190,24 +186,3 @@ const struct i2c_port_t i2c_ports[] = {
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
-/* PWM channels. Must be in the exactly same order as in enum pwm_channel. */
-const struct pwm_t pwm_channels[] = {
-	[PWM_CH_KBLIGHT] = {
-		.channel = 3,
-		.flags = PWM_CONFIG_DSLEEP,
-		.freq = 10000,
-	},
-
-	[PWM_CH_LED1_AMBER] = {
-		.channel = 2,
-		.flags = PWM_CONFIG_DSLEEP | PWM_CONFIG_ACTIVE_LOW,
-		.freq = 2400,
-	},
-
-	[PWM_CH_LED2_WHITE] = {
-		.channel = 0,
-		.flags = PWM_CONFIG_DSLEEP | PWM_CONFIG_ACTIVE_LOW,
-		.freq = 2400,
-	}
-};
-BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);

baseboard/hatch/baseboard.c

@@ -343,9 +343,9 @@ void baseboard_mst_enable_control(enum mst_source src, int level)
 	static uint32_t mst_input_levels;
 
 	if (level)
-		atomic_or(&mst_input_levels, 1 << src);
+		deprecated_atomic_or(&mst_input_levels, 1 << src);
 	else
-		atomic_clear(&mst_input_levels, 1 << src);
+		deprecated_atomic_clear_bits(&mst_input_levels, 1 << src);
 
 	gpio_set_level(GPIO_EN_MST, mst_input_levels ? 1 : 0);
 }