diff options
| author | Chris Fries <cfries@google.com> | 2021-02-13 10:50:49 -0600 |
|---|---|---|
| committer | Chris Fries <cfries@google.com> | 2021-02-13 10:50:49 -0600 |
| commit | 6018613b028c2eed9250eb56491761ef2fbfb844 (patch) | |
| tree | 61686484db5c152f61cb1b99806bc125f819d24c | |
| parent | 0c5816b198b39a5a90b4213b6968be8d9c737793 (diff) | |
| parent | 6f3279996872e9de64980928ba08df4e0cc6c7d0 (diff) | |
| download | janeiro-6018613b028c2eed9250eb56491761ef2fbfb844.tar.gz | |
Merge android-gs-pixel-mainline into android-gs-pixel-5.10
* partner/android-gs-pixel-mainline:
Merge branch 'whitechapel' into android-gs-pixel-mainline
Signed-off-by: Chris Fries <cfries@google.com>
Change-Id: I2dcff878f3f080564527be3b6a842ccb91da7995
| -rw-r--r-- | drivers/edgetpu/Makefile | 16 | ||||
| -rw-r--r-- | drivers/edgetpu/abrolhos-iommu.c | 2 | ||||
| -rw-r--r-- | drivers/edgetpu/edgetpu-usage-stats.c | 8 |
3 files changed, 16 insertions, 10 deletions
diff --git a/drivers/edgetpu/Makefile b/drivers/edgetpu/Makefile index fd195b6..6af7f73 100644 --- a/drivers/edgetpu/Makefile +++ b/drivers/edgetpu/Makefile @@ -13,12 +13,18 @@ else ccflags-y += -DGIT_REPO_TAG=\"Not\ a\ git\ repository\" endif -edgetpu-fw-objs := edgetpu-firmware-util.o edgetpu-shared-fw.o edgetpu-firmware.o -edgetpu-objs := edgetpu-core.o edgetpu-mailbox.o edgetpu-kci.o edgetpu-device-group.o edgetpu-telemetry.o edgetpu-mapping.o edgetpu-dmabuf.o edgetpu-async.o edgetpu-iremap-pool.o edgetpu-sw-watchdog.o $(edgetpu-fw-objs) +edgetpu-fw-objs := edgetpu-firmware-util.o edgetpu-firmware.o edgetpu-shared-fw.o +edgetpu-objs := edgetpu-async.o edgetpu-dmabuf.o edgetpu-iremap-pool.o \ + edgetpu-kci.o edgetpu-mailbox.o edgetpu-mapping.o \ + edgetpu-sw-watchdog.o edgetpu-telemetry.o \ + $(edgetpu-fw-objs) -edgetpu-mobile-objs := edgetpu-google-iommu.o $(edgetpu-objs) - -abrolhos-objs := abrolhos-device.o abrolhos-firmware.o edgetpu-fs.o abrolhos-platform.o abrolhos-thermal.o abrolhos-pm.o abrolhos-debug-dump.o abrolhos-usage-stats.o $(edgetpu-mobile-objs) +abrolhos-objs := abrolhos-core.o abrolhos-debug-dump.o \ + abrolhos-device-group.o abrolhos-device.o \ + abrolhos-firmware.o abrolhos-fs.o abrolhos-iommu.o \ + abrolhos-platform.o abrolhos-pm.o abrolhos-thermal.o \ + abrolhos-usage-stats.o \ + $(edgetpu-objs) KBUILD_OPTIONS += CONFIG_ABROLHOS=m diff --git a/drivers/edgetpu/abrolhos-iommu.c b/drivers/edgetpu/abrolhos-iommu.c index 56a9f6d..52ce973 100644 --- a/drivers/edgetpu/abrolhos-iommu.c +++ b/drivers/edgetpu/abrolhos-iommu.c @@ -1,2 +1,2 @@ // SPDX-License-Identifier: GPL-2.0 -#include "edgetpu-google-iommu.c"
\ No newline at end of file +#include "edgetpu-google-iommu.c" diff --git a/drivers/edgetpu/edgetpu-usage-stats.c b/drivers/edgetpu/edgetpu-usage-stats.c index 576274b..56bbfa6 100644 --- a/drivers/edgetpu/edgetpu-usage-stats.c +++ b/drivers/edgetpu/edgetpu-usage-stats.c @@ -13,7 +13,7 @@ #include "edgetpu-usage-stats.h" #if IS_ENABLED(CONFIG_ABROLHOS) - +//TODO(b/179343138): Implement for Janeiro #include "abrolhos-pm.h" static enum tpu_pwr_state tpu_states_arr[] = { @@ -184,10 +184,10 @@ static ssize_t tpu_usage_show(struct device *dev, for (i = 0; i < NUM_TPU_STATES; i++) ret += scnprintf(buf + ret, PAGE_SIZE - ret, " %d", -#if IS_ENABLED(CONFIG_HERMOSA) - tpu_states_display[i]); -#else +#if IS_ENABLED(CONFIG_ABROLHOS) tpu_states_arr[i]); +#else + tpu_states_display[i]); #endif ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n"); |