diff --git a/boards/arc/arduino_101_sss/Kconfig.defconfig b/boards/arc/arduino_101_sss/Kconfig.defconfig
index 58d3f20a4fa..733e2b2cb47 100644
--- a/boards/arc/arduino_101_sss/Kconfig.defconfig
+++ b/boards/arc/arduino_101_sss/Kconfig.defconfig
@@ -16,15 +16,6 @@ if FLASH && SPI
 config SPI_FLASH_W25QXXDV
 	def_bool y
 
-config SPI_CS_GPIO
-	def_bool y
-
-config SPI_0_CS_GPIO_PIN
-	default 24
-
-config SPI_0_CS_GPIO_PORT
-	default "GPIO_2"
-
 config SPI_FLASH_W25QXXDV_SPI_NAME
 	default "SPI_2"
 
diff --git a/boards/x86/arduino_101/pinmux.c b/boards/x86/arduino_101/pinmux.c
index 65b7da3f906..d06bfef7d6f 100644
--- a/boards/x86/arduino_101/pinmux.c
+++ b/boards/x86/arduino_101/pinmux.c
@@ -116,7 +116,7 @@ static void _pinmux_defaults(u32_t base)
 	u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 };
 	int i = 0;
 
-#if !defined(CONFIG_SPI_1) && !defined(CONFIG_SPI_CS_GPIO)
+#if !defined(CONFIG_SPI_1)
 	PIN_CONFIG(mux_config,  0,  PINMUX_FUNC_B);
 #endif
 	PIN_CONFIG(mux_config,  1,  PINMUX_FUNC_B);
@@ -136,9 +136,7 @@ static void _pinmux_defaults(u32_t base)
 	PIN_CONFIG(mux_config, 42,  PINMUX_FUNC_B);
 	PIN_CONFIG(mux_config, 43,  PINMUX_FUNC_B);
 	PIN_CONFIG(mux_config, 44,  PINMUX_FUNC_B);
-#ifndef CONFIG_SPI_CS_GPIO
 	PIN_CONFIG(mux_config, 45,  PINMUX_FUNC_B);
-#endif
 #endif
 	PIN_CONFIG(mux_config, 55,  PINMUX_FUNC_B);
 	PIN_CONFIG(mux_config, 56,  PINMUX_FUNC_B);
diff --git a/boards/x86/tinytile/pinmux.c b/boards/x86/tinytile/pinmux.c
index 966fe6e5bf8..286f30b04cd 100644
--- a/boards/x86/tinytile/pinmux.c
+++ b/boards/x86/tinytile/pinmux.c
@@ -116,7 +116,7 @@ static void _pinmux_defaults(u32_t base)
 	u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 };
 	int i = 0;
 
-#if !defined(CONFIG_SPI_1) && !defined(CONFIG_SPI_CS_GPIO)
+#if !defined(CONFIG_SPI_1)
 	PIN_CONFIG(mux_config,  0,  PINMUX_FUNC_B);
 #endif
 	PIN_CONFIG(mux_config,  1,  PINMUX_FUNC_B);
@@ -136,9 +136,7 @@ static void _pinmux_defaults(u32_t base)
 	PIN_CONFIG(mux_config, 42,  PINMUX_FUNC_B);
 	PIN_CONFIG(mux_config, 43,  PINMUX_FUNC_B);
 	PIN_CONFIG(mux_config, 44,  PINMUX_FUNC_B);
-#ifndef CONFIG_SPI_CS_GPIO
 	PIN_CONFIG(mux_config, 45,  PINMUX_FUNC_B);
-#endif
 #endif
 	PIN_CONFIG(mux_config, 55,  PINMUX_FUNC_B);
 	PIN_CONFIG(mux_config, 56,  PINMUX_FUNC_B);
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 8f77177f649..4d5d0aef813 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -66,16 +66,6 @@ config SPI_0_IRQ_PRI
 	int "Port 0 interrupt priority"
 	depends on !HAS_DTS_SPI
 
-config SPI_0_CS_GPIO_PORT
-	string "The GPIO port which is used to control CS"
-	depends on SPI_CS_GPIO
-	default "GPIO_0"
-
-config SPI_0_CS_GPIO_PIN
-	int "The GPIO PIN which is used to act as a CS pin"
-	depends on SPI_CS_GPIO
-	default 0
-
 endif # SPI_0
 
 config SPI_1
@@ -105,16 +95,6 @@ config SPI_1_IRQ_PRI
 	int "Port 1 interrupt priority"
 	depends on !HAS_DTS_SPI
 
-config SPI_1_CS_GPIO_PORT
-	string "The GPIO port which is used to control CS"
-	depends on SPI_CS_GPIO
-	default "GPIO_0"
-
-config SPI_1_CS_GPIO_PIN
-	int "The GPIO PIN which is used to act as a CS pin"
-	depends on SPI_CS_GPIO
-	default 0
-
 endif # SPI_1
 
 config SPI_2
@@ -144,16 +124,6 @@ config SPI_2_IRQ_PRI
 	int "Port 2 interrupt priority"
 	depends on !HAS_DTS_SPI
 
-config SPI_2_CS_GPIO_PORT
-	string "The GPIO port which is used to control CS"
-	depends on SPI_CS_GPIO
-	default "GPIO_0"
-
-config SPI_2_CS_GPIO_PIN
-	int "The GPIO PIN which is used to act as a CS pin"
-	depends on SPI_CS_GPIO
-	default 0
-
 endif # SPI_2
 
 config SPI_3
diff --git a/samples/drivers/spi_fujitsu_fram/prj.conf b/samples/drivers/spi_fujitsu_fram/prj.conf
index 6bc120e2c8c..3520ad0edc3 100644
--- a/samples/drivers/spi_fujitsu_fram/prj.conf
+++ b/samples/drivers/spi_fujitsu_fram/prj.conf
@@ -3,6 +3,3 @@ CONFIG_PRINTK=y
 
 CONFIG_SPI=y
 CONFIG_GPIO=y
-CONFIG_SPI_CS_GPIO=y
-CONFIG_SPI_1_CS_GPIO_PORT="GPIO_0"
-CONFIG_SPI_1_CS_GPIO_PIN=20