5 files changed, 12 insertions, 13 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 94c0bf30c284..56b7f310ddbc 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -69,12 +69,12 @@ config ARCH_MSM8996
 	This enables support for the MSM8996 chipset. If you do not
 	wish to build a kernel that runs on this chipset, say 'N' here.
 
-config ARCH_MSMCOBALT
-        bool "Enable Support for Qualcomm MSMCOBALT"
+config ARCH_MSM8998
+        bool "Enable Support for Qualcomm MSM8998"
 	depends on ARCH_QCOM
 	select COMMON_CLK_MSM
 	help
-	This enables support for the MSMCOBALT chipset. If you do not
+	This enables support for the MSM8998 chipset. If you do not
 	wish to build a kernel that runs on this chipset, say 'N' here.
 
 config ARCH_MSMHAMSTER
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index 3990bece1dd1..23287f8d06ea 100644
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -45,7 +45,7 @@ CONFIG_MODULE_SIG_FORCE=y
 CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MSMCOBALT=y
+CONFIG_ARCH_MSM8998=y
 CONFIG_ARCH_MSMHAMSTER=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
@@ -301,7 +301,7 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
+CONFIG_PINCTRL_MSM8998=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
@@ -405,7 +405,7 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_AUDIO_QMI=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MSMCOBALT=y
+CONFIG_SND_SOC_MSM8998=y
 CONFIG_UHID=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_ELECOM=y
diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index 15ca50859eca..9cec02c83936 100644
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -46,7 +46,7 @@ CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MSMCOBALT=y
+CONFIG_ARCH_MSM8998=y
 CONFIG_ARCH_MSMHAMSTER=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
@@ -304,7 +304,7 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
+CONFIG_PINCTRL_MSM8998=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
@@ -408,7 +408,7 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_AUDIO_QMI=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MSMCOBALT=y
+CONFIG_SND_SOC_MSM8998=y
 CONFIG_UHID=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_ELECOM=y
diff --git a/arch/arm64/configs/msmfalcon-perf_defconfig b/arch/arm64/configs/msmfalcon-perf_defconfig
index df695f993ed9..54925c6bcf4e 100644
--- a/arch/arm64/configs/msmfalcon-perf_defconfig
+++ b/arch/arm64/configs/msmfalcon-perf_defconfig
@@ -304,7 +304,7 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
+CONFIG_PINCTRL_MSM8998=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
@@ -408,7 +408,7 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_AUDIO_QMI=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MSMCOBALT=y
+CONFIG_SND_SOC_MSM8998=y
 CONFIG_UHID=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_ELECOM=y
diff --git a/arch/arm64/configs/msmfalcon_defconfig b/arch/arm64/configs/msmfalcon_defconfig
index 8719eb7cb92e..820385a0217a 100644
--- a/arch/arm64/configs/msmfalcon_defconfig
+++ b/arch/arm64/configs/msmfalcon_defconfig
@@ -307,7 +307,6 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
@@ -411,7 +410,7 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_AUDIO_QMI=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MSMCOBALT=y
+CONFIG_SND_SOC_MSM8998=y
 CONFIG_UHID=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_ELECOM=y