diff --git a/Makefile b/Makefile
index ef0fc37..db8f272 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ BOARDS := arrow,apq8096-db820c \
 	  qcom,apq8016-sbc \
 	  qcom,msm8998-mtp \
 	  qcom,sdm845-mtp \
+	  qcom,soc-sm8150 \
 	  qcom,sm8150-mtp \
 	  qcom,sm8250-mtp \
 	  qcom,sm8350-mtp \
diff --git a/boards/qcom,sm8150-mtp b/boards/qcom,sm8150-mtp
index 7ce2bd7..44a3fa2 100755
--- a/boards/qcom,sm8150-mtp
+++ b/boards/qcom,sm8150-mtp
@@ -1,162 +1,3 @@
 #!/bin/sh
 
-#RPMH
-assert_driver_present cmd-db-driver-present cmd-db
-assert_driver_present rpmh-driver-present rpmh
-assert_driver_present rpmh-clock-driver-present clk-rpmh
-assert_driver_present rpmh-regulator-driver-present qcom-rpmh-regulator
-#assert_driver_present rpmh-pd-driver-present qcom-rpmhpd
-
-assert_device_present cmd-db-device-probed cmd-db 85f20000.*
-assert_device_present rpmh-device-probed rpmh 18200000.*
-assert_device_present rpmh-clock-device-probed clk-rpmh 18200000.*
-assert_device_present rpmh-pm8009-regulator-device-probed qcom-rpmh-regulator *pm8009*
-assert_device_present rpmh-pm8150-regulator-device-probed qcom-rpmh-regulator *pm8150-*
-assert_device_present rpmh-pm8150l-regulator-device-probed qcom-rpmh-regulator *pm8150l-*
-
-# AOSS
-
-# PDC
-
-# APCS
-assert_driver_present apcs-ipc-driver-present qcom_apcs_ipc
-assert_device_present apcs-ipc-device-probed qcom_apcs_ipc 17c00000.*
-
-# GCC
-assert_driver_present gcc-driver-present gcc-sm8150
-assert_device_present gcc-device-probed gcc-sm8150 100000.*
-
-# GENI
-
-# I2C GENI
-
-# QFPROM
-
-# SCM
-assert_driver_present scm-driver-present qcom_scm
-assert_device_present scm-device-probed qcom_scm firmware:scm
-
-# Serial
-assert_driver_present geni-uart-driver-present qcom_geni_serial
-assert_device_present geni-uart-uart9-probed qcom_geni_serial a90000.*
-
-# SMEM
-assert_driver_present smem-driver-present qcom-smem
-assert_device_present smem-device-probed qcom-smem smem
-assert_driver_present smem-socinfo-driver-present qcom-socinfo
-
-# SMMU
-
-# TCSR mutex
-assert_driver_present tcsr-mutex-driver-present qcom_hwspinlock
-assert_device_present tcsr-mutex-device-probed qcom_hwspinlock hwlock
-
-# Timer
-
-# TLMM
-assert_driver_present tlmm-driver-present sm8150-pinctrl
-assert_device_present tlmm-device-probed sm8150-pinctrl 3100000.*
-
-# GLINK/SMEM
-
-# GLINK/SPSS
-
-# IPCROUTER
-
-# SMP2P
-assert_driver_present smp2p-driver-present qcom_smp2p
-assert_device_present smp2p-slpi-device-probed qcom_smp2p *cdsp*
-assert_device_present smp2p-adsp-device-probed qcom_smp2p *lpass*
-assert_device_present smp2p-modem-device-probed qcom_smp2p *mpss*
-assert_device_present smp2p-slpi-device-probed qcom_smp2p *slpi*
-
-# SPCOM
-
-# CCI
-
-# CPP
-
-# CSID
-
-# CSIPHY
-
-# Face Detect
-
-# JPEG
-
-# VFE
-
-# FastRPC
-
-# QCrypto
-
-# PRNG
-
-# Coresight
-
-# Watchdog
-
-# PCIe
-
-# QMP phy
-
-# PMIC
-## Charger
-
-## clkdiv
-
-## Coincell
-
-## Fuel guage
-
-## GPIO
-
-## Haptics
-
-## LABIBB
-
-## LPG
-
-## PON
-
-## QNovo
-
-## Regulators
-
-## RTC
-
-# SPMI
-assert_driver_present spmi-pmic-arb-driver-present spmi_pmic_arb
-assert_device_present spmi-pmic-arb-device-probed spmi_pmic_arb c440000.*
-
-## temp-alarm
-
-## VADC
-
-## WLED
-
-# CPUfreq
-
-# MPM
-
-# SPM
-
-# Tsens
-
-# PAS driver
-
-# Modem PIL
-
-# rmtfs memory
-
-# Secure PIL
-
-# Sensor PIL
-
-# UFS QMP
-assert_driver_present ufs-phy-driver-present qcom-qmp-phy
-assert_device_present ufs-phy-probed qcom-qmp-phy 1d87000.*
-
-# UFSHCD
-assert_driver_present ufs-hcd-driver-present ufshcd-qcom
-assert_device_present ufs-hcd-device-probed ufshcd-qcom 1d84000.*
+source $(dirname $0)/qcom,soc-sm8150
diff --git a/boards/qcom,soc-sm8150 b/boards/qcom,soc-sm8150
new file mode 100755
index 0000000..7ce2bd7
--- /dev/null
+++ b/boards/qcom,soc-sm8150
@@ -0,0 +1,162 @@
+#!/bin/sh
+
+#RPMH
+assert_driver_present cmd-db-driver-present cmd-db
+assert_driver_present rpmh-driver-present rpmh
+assert_driver_present rpmh-clock-driver-present clk-rpmh
+assert_driver_present rpmh-regulator-driver-present qcom-rpmh-regulator
+#assert_driver_present rpmh-pd-driver-present qcom-rpmhpd
+
+assert_device_present cmd-db-device-probed cmd-db 85f20000.*
+assert_device_present rpmh-device-probed rpmh 18200000.*
+assert_device_present rpmh-clock-device-probed clk-rpmh 18200000.*
+assert_device_present rpmh-pm8009-regulator-device-probed qcom-rpmh-regulator *pm8009*
+assert_device_present rpmh-pm8150-regulator-device-probed qcom-rpmh-regulator *pm8150-*
+assert_device_present rpmh-pm8150l-regulator-device-probed qcom-rpmh-regulator *pm8150l-*
+
+# AOSS
+
+# PDC
+
+# APCS
+assert_driver_present apcs-ipc-driver-present qcom_apcs_ipc
+assert_device_present apcs-ipc-device-probed qcom_apcs_ipc 17c00000.*
+
+# GCC
+assert_driver_present gcc-driver-present gcc-sm8150
+assert_device_present gcc-device-probed gcc-sm8150 100000.*
+
+# GENI
+
+# I2C GENI
+
+# QFPROM
+
+# SCM
+assert_driver_present scm-driver-present qcom_scm
+assert_device_present scm-device-probed qcom_scm firmware:scm
+
+# Serial
+assert_driver_present geni-uart-driver-present qcom_geni_serial
+assert_device_present geni-uart-uart9-probed qcom_geni_serial a90000.*
+
+# SMEM
+assert_driver_present smem-driver-present qcom-smem
+assert_device_present smem-device-probed qcom-smem smem
+assert_driver_present smem-socinfo-driver-present qcom-socinfo
+
+# SMMU
+
+# TCSR mutex
+assert_driver_present tcsr-mutex-driver-present qcom_hwspinlock
+assert_device_present tcsr-mutex-device-probed qcom_hwspinlock hwlock
+
+# Timer
+
+# TLMM
+assert_driver_present tlmm-driver-present sm8150-pinctrl
+assert_device_present tlmm-device-probed sm8150-pinctrl 3100000.*
+
+# GLINK/SMEM
+
+# GLINK/SPSS
+
+# IPCROUTER
+
+# SMP2P
+assert_driver_present smp2p-driver-present qcom_smp2p
+assert_device_present smp2p-slpi-device-probed qcom_smp2p *cdsp*
+assert_device_present smp2p-adsp-device-probed qcom_smp2p *lpass*
+assert_device_present smp2p-modem-device-probed qcom_smp2p *mpss*
+assert_device_present smp2p-slpi-device-probed qcom_smp2p *slpi*
+
+# SPCOM
+
+# CCI
+
+# CPP
+
+# CSID
+
+# CSIPHY
+
+# Face Detect
+
+# JPEG
+
+# VFE
+
+# FastRPC
+
+# QCrypto
+
+# PRNG
+
+# Coresight
+
+# Watchdog
+
+# PCIe
+
+# QMP phy
+
+# PMIC
+## Charger
+
+## clkdiv
+
+## Coincell
+
+## Fuel guage
+
+## GPIO
+
+## Haptics
+
+## LABIBB
+
+## LPG
+
+## PON
+
+## QNovo
+
+## Regulators
+
+## RTC
+
+# SPMI
+assert_driver_present spmi-pmic-arb-driver-present spmi_pmic_arb
+assert_device_present spmi-pmic-arb-device-probed spmi_pmic_arb c440000.*
+
+## temp-alarm
+
+## VADC
+
+## WLED
+
+# CPUfreq
+
+# MPM
+
+# SPM
+
+# Tsens
+
+# PAS driver
+
+# Modem PIL
+
+# rmtfs memory
+
+# Secure PIL
+
+# Sensor PIL
+
+# UFS QMP
+assert_driver_present ufs-phy-driver-present qcom-qmp-phy
+assert_device_present ufs-phy-probed qcom-qmp-phy 1d87000.*
+
+# UFSHCD
+assert_driver_present ufs-hcd-driver-present ufshcd-qcom
+assert_device_present ufs-hcd-device-probed ufshcd-qcom 1d84000.*