summaryrefslogtreecommitdiff
path: root/baseboard/cherry
diff options
context:
space:
mode:
authorTing Shen <phoenixshen@google.com>2021-03-04 16:44:00 +0800
committerCommit Bot <commit-bot@chromium.org>2021-03-05 09:11:41 +0000
commite8b45a7e33733b2a6e9ccb966be7d1b00ca2b2e6 (patch)
treeb94413a2bfb898c0f0bfdda1302c4a6aac06a7bc /baseboard/cherry
parent631392f8c7fb2a810465b1f53c8bbfd00bd2946c (diff)
downloadchrome-ec-e8b45a7e33733b2a6e9ccb966be7d1b00ca2b2e6.tar.gz
cherry: code cleanup
- remove duplicate headers in baseboard.c - remove references to asurada / hayato - replace cherry/led.c by asurada/led_hayato.c, which should be more close to cherry's design BUG=b:181838424 TEST=1) `ag '(asurada|hayato)' -i baseboard/cherry board/cherry` returns empty result 2) make BRANCH=main Signed-off-by: Ting Shen <phoenixshen@google.com> Change-Id: Id9afd90d323395f38787e452b02b8da65fd15286 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2734168 Reviewed-by: Eric Yilun Lin <yllin@chromium.org> Commit-Queue: Ting Shen <phoenixshen@chromium.org> Tested-by: Ting Shen <phoenixshen@chromium.org>
Diffstat (limited to 'baseboard/cherry')
-rw-r--r--baseboard/cherry/baseboard.c9
-rw-r--r--baseboard/cherry/baseboard.h2
-rw-r--r--baseboard/cherry/usb_pd_policy.c4
3 files changed, 5 insertions, 10 deletions
diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c
index 04108bb485..f4aa61cc5e 100644
--- a/baseboard/cherry/baseboard.c
+++ b/baseboard/cherry/baseboard.c
@@ -3,14 +3,13 @@
* found in the LICENSE file.
*/
-/* Asurada baseboard-specific configuration */
+/* Cherry baseboard-specific configuration */
#include "adc.h"
#include "adc_chip.h"
#include "button.h"
#include "charge_manager.h"
#include "charger.h"
-#include "charger.h"
#include "charge_state.h"
#include "charge_state_v2.h"
#include "chipset.h"
@@ -22,7 +21,6 @@
#include "driver/bc12/mt6360.h"
#include "driver/bc12/pi3usb9201.h"
#include "driver/charger/isl923x.h"
-#include "driver/charger/isl923x.h"
#include "driver/ppc/syv682x.h"
#include "driver/tcpm/it83xx_pd.h"
#include "driver/temp_sensor/thermistor.h"
@@ -32,14 +30,11 @@
#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
-#include "i2c.h"
-#include "it5205_sbu.h"
#include "keyboard_scan.h"
#include "lid_switch.h"
#include "motion_sense.h"
#include "power_button.h"
#include "power.h"
-#include "power.h"
#include "pwm_chip.h"
#include "pwm.h"
#include "regulator.h"
@@ -393,7 +388,7 @@ int board_allow_i2c_passthru(int port)
void board_overcurrent_event(int port, int is_overcurrented)
{
- /* TODO: check correct operation for Asurada */
+ /* TODO: check correct operation for Cherry */
}
/* TCPC */
diff --git a/baseboard/cherry/baseboard.h b/baseboard/cherry/baseboard.h
index d16e9d97e4..128ec25b9a 100644
--- a/baseboard/cherry/baseboard.h
+++ b/baseboard/cherry/baseboard.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* Asurada board configuration */
+/* Cherry board configuration */
#ifndef __CROS_EC_BASEBOARD_H
#define __CROS_EC_BASEBOARD_H
diff --git a/baseboard/cherry/usb_pd_policy.c b/baseboard/cherry/usb_pd_policy.c
index 7d56e95d6c..cc2f9b0336 100644
--- a/baseboard/cherry/usb_pd_policy.c
+++ b/baseboard/cherry/usb_pd_policy.c
@@ -11,7 +11,7 @@
#include "usbc_ppc.h"
#if CONFIG_USB_PD_3A_PORTS != 1
-#error Asurada reference must have at least one 3.0 A port
+#error Cherry reference must have at least one 3.0 A port
#endif
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
@@ -118,7 +118,7 @@ __override int svdm_dp_attention(int port, uint32_t *payload)
}
/*
- * Asurada can only output to 1 display port at a time.
+ * Cherry can only output to 1 display port at a time.
* This implements FCFS policy by changing the aux channel. If a
* display is connected to the either port (says A), and the port A
* will be served until the display is disconnected from port A.