diff --git a/device.mk b/device.mk
index 6b6fc5a5..0e894aec 100644
--- a/device.mk
+++ b/device.mk
@@ -25,6 +25,7 @@ include device/google/gs-common/pcie/pcie.mk
 include device/google/gs-common/storage/storage.mk
 include device/google/gs-common/thermal/thermal.mk
 include device/google/gs-common/performance/perf.mk
+include device/google/gs-common/soc/freq.mk
 
 include device/google/zuma/dumpstate/item.mk
 
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 7edfe7d7..de407d72 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -211,7 +211,6 @@ void endSection(int fd, const std::string &sectionName, timepoint_t startTime) {
 Dumpstate::Dumpstate()
   : mTextSections{
         { "memory", [this](int fd) { dumpMemorySection(fd); } },
-        { "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } },
         { "display", [this](int fd) { dumpDisplaySection(fd); } },
     },
   mLogSections{
@@ -282,27 +281,6 @@ void Dumpstate::dumpTextSection(int fd, const std::string &sectionName) {
                                    "not avalable from the command line.\n", fd);
 }
 
-// Dump items related to Devfreq & BTS
-void Dumpstate::dumpDevfreqSection(int fd) {
-    DumpFileToFd(fd, "MIF DVFS",
-                 "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/time_in_state");
-    DumpFileToFd(fd, "INT DVFS",
-                 "/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/time_in_state");
-    DumpFileToFd(fd, "INTCAM DVFS",
-                 "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/time_in_state");
-    DumpFileToFd(fd, "DISP DVFS",
-                 "/sys/devices/platform/17000040.devfreq_disp/devfreq/17000040.devfreq_disp/time_in_state");
-    DumpFileToFd(fd, "CAM DVFS",
-                 "/sys/devices/platform/17000050.devfreq_cam/devfreq/17000050.devfreq_cam/time_in_state");
-    DumpFileToFd(fd, "TNR DVFS",
-                 "/sys/devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/time_in_state");
-    DumpFileToFd(fd, "MFC DVFS",
-                 "/sys/devices/platform/17000070.devfreq_mfc/devfreq/17000070.devfreq_mfc/time_in_state");
-    DumpFileToFd(fd, "BO DVFS",
-                 "/sys/devices/platform/17000080.devfreq_bo/devfreq/17000080.devfreq_bo/time_in_state");
-    DumpFileToFd(fd, "BTS stats", "/sys/devices/platform/exynos-bts/bts_stats");
-}
-
 // Dump items related to memory
 void Dumpstate::dumpMemorySection(int fd) {
     RunCommandToFd(fd, "CMA info", {"/vendor/bin/sh", "-c",
diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h
index d02e6ee0..37a8bf4c 100644
--- a/dumpstate/Dumpstate.h
+++ b/dumpstate/Dumpstate.h
@@ -52,7 +52,6 @@ class Dumpstate : public BnDumpstateDevice {
 
     // Text sections that can be dumped individually on the command line in
     // addition to being included in full dumps
-    void dumpDevfreqSection(int fd);
     void dumpMemorySection(int fd);
     void dumpDisplaySection(int fd);