summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2021-05-12 12:17:43 -0700
committerCommit Bot <commit-bot@chromium.org>2021-05-17 17:24:30 +0000
commit6e3cca09b86a8f8f6881563071e067f0440f99a6 (patch)
tree7808e1989964e904830113b444bad8125ab76d78
parentfa2f648597c0afb2644514b9c6b8af0e52987c25 (diff)
downloadchrome-ec-6e3cca09b86a8f8f6881563071e067f0440f99a6.tar.gz
qcom: Generalize the filenames for Qualcomm chipsets
The existing SC7180 power sequence can be reused on its next generation. Generalize the filenames, sc7180.c/sc7180.h to qcom.c/qcom.h. BRANCH=None BUG=b:187980397 TEST=Built all the Chromium EC images and Zephyr EC images. Change-Id: Ie04218ef0a12a4e8aa2db353040c5c39c533ae6f Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2893484 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Alexandru M Stan <amstan@chromium.org>
-rw-r--r--board/coachz/board.c2
-rw-r--r--board/homestar/board.c2
-rw-r--r--board/lazor/switchcap.c2
-rw-r--r--board/marzipan/board.c2
-rw-r--r--board/marzipan/switchcap.c2
-rw-r--r--board/pompom/board.c2
-rw-r--r--board/trogdor/board.c2
-rw-r--r--include/power/qcom.h (renamed from include/power/sc7180.h)6
-rw-r--r--power/build.mk2
-rw-r--r--power/common.c2
-rw-r--r--power/qcom.c (renamed from power/sc7180.c)2
-rw-r--r--zephyr/CMakeLists.txt2
12 files changed, 14 insertions, 14 deletions
diff --git a/board/coachz/board.c b/board/coachz/board.c
index e5fcc6404b..0cae0659b6 100644
--- a/board/coachz/board.c
+++ b/board/coachz/board.c
@@ -23,7 +23,7 @@
#include "peripheral_charger.h"
#include "pi3usb9201.h"
#include "power.h"
-#include "power/sc7180.h"
+#include "power/qcom.h"
#include "power_button.h"
#include "pwm.h"
#include "pwm_chip.h"
diff --git a/board/homestar/board.c b/board/homestar/board.c
index 657b547c5f..9f450ef86a 100644
--- a/board/homestar/board.c
+++ b/board/homestar/board.c
@@ -25,7 +25,7 @@
#include "peripheral_charger.h"
#include "pi3usb9201.h"
#include "power.h"
-#include "power/sc7180.h"
+#include "power/qcom.h"
#include "power_button.h"
#include "pwm.h"
#include "pwm_chip.h"
diff --git a/board/lazor/switchcap.c b/board/lazor/switchcap.c
index 6cb5106efb..b22bb57673 100644
--- a/board/lazor/switchcap.c
+++ b/board/lazor/switchcap.c
@@ -10,7 +10,7 @@
#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
-#include "power/sc7180.h"
+#include "power/qcom.h"
#include "system.h"
#define CPRINTS(format, args...) cprints(CC_I2C, format, ## args)
diff --git a/board/marzipan/board.c b/board/marzipan/board.c
index 3a97487eb7..135e333b55 100644
--- a/board/marzipan/board.c
+++ b/board/marzipan/board.c
@@ -26,7 +26,7 @@
#include "lid_switch.h"
#include "pi3usb9201.h"
#include "power.h"
-#include "power/sc7180.h"
+#include "power/qcom.h"
#include "power_button.h"
#include "pwm.h"
#include "pwm_chip.h"
diff --git a/board/marzipan/switchcap.c b/board/marzipan/switchcap.c
index 3ed4bee1bb..26009d55d8 100644
--- a/board/marzipan/switchcap.c
+++ b/board/marzipan/switchcap.c
@@ -9,7 +9,7 @@
#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
-#include "power/sc7180.h"
+#include "power/qcom.h"
#include "system.h"
#define CPRINTS(format, args...) cprints(CC_I2C, format, ## args)
diff --git a/board/pompom/board.c b/board/pompom/board.c
index 698980c53b..6f9d200eda 100644
--- a/board/pompom/board.c
+++ b/board/pompom/board.c
@@ -21,7 +21,7 @@
#include "lid_switch.h"
#include "pi3usb9201.h"
#include "power.h"
-#include "power/sc7180.h"
+#include "power/qcom.h"
#include "power_button.h"
#include "pwm.h"
#include "pwm_chip.h"
diff --git a/board/trogdor/board.c b/board/trogdor/board.c
index 55e36da256..9dfb9ae3fb 100644
--- a/board/trogdor/board.c
+++ b/board/trogdor/board.c
@@ -24,7 +24,7 @@
#include "pi3usb9281.h"
#endif /* BOARD_REV */
#include "power.h"
-#include "power/sc7180.h"
+#include "power/qcom.h"
#include "power_button.h"
#include "pwm.h"
#include "pwm_chip.h"
diff --git a/include/power/sc7180.h b/include/power/qcom.h
index af066ea714..84b290479c 100644
--- a/include/power/sc7180.h
+++ b/include/power/qcom.h
@@ -3,8 +3,8 @@
* found in the LICENSE file.
*/
-#ifndef __CROS_EC_POWER_SC7180_H_
-#define __CROS_EC_POWER_SC7180_H_
+#ifndef __CROS_EC_POWER_QCOM_H_
+#define __CROS_EC_POWER_QCOM_H_
#ifdef CONFIG_CHIPSET_SC7180
enum power_signal {
@@ -23,4 +23,4 @@ void board_set_switchcap_power(int enable);
int board_is_switchcap_enabled(void);
int board_is_switchcap_power_good(void);
-#endif /* __CROS_EC_POWER_SC7180_H_ */
+#endif /* __CROS_EC_POWER_QCOM_H_ */
diff --git a/power/build.mk b/power/build.mk
index 3dcd387d29..86f4b8bc40 100644
--- a/power/build.mk
+++ b/power/build.mk
@@ -21,7 +21,7 @@ power-$(CONFIG_CHIPSET_MT8192)+=mt8192.o
power-$(CONFIG_CHIPSET_CEZANNE)+=amd_x86.o
power-$(CONFIG_CHIPSET_RK3288)+=rk3288.o
power-$(CONFIG_CHIPSET_RK3399)+=rk3399.o
-power-$(CONFIG_CHIPSET_SC7180)+=sc7180.o
+power-$(CONFIG_CHIPSET_SC7180)+=qcom.o
power-$(CONFIG_CHIPSET_SDM845)+=sdm845.o
power-$(CONFIG_CHIPSET_SKYLAKE)+=skylake.o intel_x86.o
power-$(CONFIG_CHIPSET_STONEY)+=amd_x86.o
diff --git a/power/common.c b/power/common.c
index e4f4027ade..7fc6a8cfb3 100644
--- a/power/common.c
+++ b/power/common.c
@@ -19,7 +19,7 @@
#include "lpc.h"
#include "power.h"
#include "power/intel_x86.h"
-#include "power/sc7180.h"
+#include "power/qcom.h"
#include "system.h"
#include "task.h"
#include "timer.h"
diff --git a/power/sc7180.c b/power/qcom.c
index 81892c2894..5484f48f26 100644
--- a/power/sc7180.c
+++ b/power/qcom.c
@@ -29,7 +29,7 @@
#include "hooks.h"
#include "lid_switch.h"
#include "power.h"
-#include "power/sc7180.h"
+#include "power/qcom.h"
#include "power_button.h"
#include "system.h"
#include "task.h"
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 0153ff7900..cea08e2ed6 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -333,7 +333,7 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ_INTEL
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP
"${PLATFORM_EC}/power/host_sleep.c")
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ_SC7180
- "${PLATFORM_EC}/power/sc7180.c")
+ "${PLATFORM_EC}/power/qcom.c")
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_PANIC
"${PLATFORM_EC}/common/panic_output.c")
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_PWM