diff --git a/device.mk b/device.mk
index 25682c18..bf62879f 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 := gs101
 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 38871bd8..d618e0a6 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -251,7 +251,6 @@ DumpstateDevice::DumpstateDevice()
   : mTextSections{
         { "pre-touch", [this](int fd) { dumpPreTouchSection(fd); } },
         { "wlan", [this](int fd) { dumpWlanSection(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); } },
@@ -819,16 +818,6 @@ void DumpstateDevice::dumpTouchSection(int fd) {
     }
 }
 
-// Dump items related to SoC
-void DumpstateDevice::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 DumpstateDevice::dumpCpuSection(int fd) {
     DumpFileToFd(fd, "CPU present", "/sys/devices/system/cpu/present");
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
index 721d8cac..10a18f4c 100644
--- a/dumpstate/DumpstateDevice.h
+++ b/dumpstate/DumpstateDevice.h
@@ -66,7 +66,6 @@ struct DumpstateDevice : public IDumpstateDevice {
     void dumpThermalSection(int fd);
     void dumpPreTouchSection(int fd);
     void dumpTouchSection(int fd);
-    void dumpSocSection(int fd);
     void dumpCpuSection(int fd);
     void dumpDevfreqSection(int fd);
     void dumpMemorySection(int fd);