diff --git a/device.mk b/device.mk
index 6a5931a8..0ad29eaa 100644
--- a/device.mk
+++ b/device.mk
@@ -17,6 +17,7 @@
 include device/google/gs-common/device.mk
 include device/google/gs-common/gs_watchdogd/watchdog.mk
 include device/google/gs-common/ramdump/ramdump.mk
+include device/google/gs-common/soc/soc.mk
 
 TARGET_BOARD_PLATFORM := gs201
 
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 177ff098..bae83d3a 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -223,7 +223,6 @@ Dumpstate::Dumpstate()
   : mTextSections{
         { "wlan", [this](int fd) { dumpWlanSection(fd); } },
         { "modem", [this](int fd) { dumpModemSection(fd); } },
-        { "soc", [this](int fd) { dumpSocSection(fd); } },
         { "memory", [this](int fd) { dumpMemorySection(fd); } },
         { "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } },
         { "cpu", [this](int fd) { dumpCpuSection(fd); } },
@@ -877,16 +876,6 @@ void Dumpstate::dumpTouchSection(int fd) {
     }
 }
 
-// Dump items related to SoC
-void Dumpstate::dumpSocSection(int fd) {
-    DumpFileToFd(fd, "AP HW TUNE", "/sys/devices/system/chip-id/ap_hw_tune_str");
-    DumpFileToFd(fd, "EVT VERSION", "/sys/devices/system/chip-id/evt_ver");
-    DumpFileToFd(fd, "LOT ID", "/sys/devices/system/chip-id/lot_id");
-    DumpFileToFd(fd, "PRODUCT ID", "/sys/devices/system/chip-id/product_id");
-    DumpFileToFd(fd, "REVISION", "/sys/devices/system/chip-id/revision");
-    DumpFileToFd(fd, "RAW STR", "/sys/devices/system/chip-id/raw_str");
-}
-
 // Dump items related to CPUs
 void Dumpstate::dumpCpuSection(int fd) {
     DumpFileToFd(fd, "CPU present", "/sys/devices/system/cpu/present");
diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h
index a92ad98a..ac176c3c 100644
--- a/dumpstate/Dumpstate.h
+++ b/dumpstate/Dumpstate.h
@@ -57,7 +57,6 @@ class Dumpstate : public BnDumpstateDevice {
     void dumpPowerSection(int fd);
     void dumpThermalSection(int fd);
     void dumpTouchSection(int fd);
-    void dumpSocSection(int fd);
     void dumpCpuSection(int fd);
     void dumpDevfreqSection(int fd);
     void dumpMemorySection(int fd);