Enable UFS storage options on ARM, just enable on ARM/x86 as it's only likely to be on those platgforms at this point

32 files changed, 54 insertions, 34 deletions

diff --git a/configs/fedora/generic/CONFIG_SCSI_UFSHCD b/configs/fedora/generic/CONFIG_SCSI_UFSHCD
index 041b8209b..542c89fc7 100644
--- a/configs/fedora/generic/CONFIG_SCSI_UFSHCD
+++ b/configs/fedora/generic/CONFIG_SCSI_UFSHCD
@@ -1 +1 @@
-CONFIG_SCSI_UFSHCD=m
+# CONFIG_SCSI_UFSHCD is not set
diff --git a/configs/fedora/generic/CONFIG_SCSI_UFS_DWC_TC_PLATFORM b/configs/fedora/generic/CONFIG_SCSI_UFS_DWC_TC_PLATFORM
new file mode 100644
index 000000000..41483b33b
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SCSI_UFS_DWC_TC_PLATFORM
@@ -0,0 +1 @@
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS b/configs/fedora/generic/arm/CONFIG_PHY_QCOM_UFS
index 936bcab6c..936bcab6c 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS
+++ b/configs/fedora/generic/arm/CONFIG_PHY_QCOM_UFS
diff --git a/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD
new file mode 100644
index 000000000..041b8209b
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD
@@ -0,0 +1 @@
+CONFIG_SCSI_UFSHCD=m
diff --git a/configs/fedora/generic/CONFIG_SCSI_UFSHCD_PCI b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PCI
index 4907ac2e6..4907ac2e6 100644
--- a/configs/fedora/generic/CONFIG_SCSI_UFSHCD_PCI
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PCI
diff --git a/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PLATFORM b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PLATFORM
new file mode 100644
index 000000000..59f9929cd
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PLATFORM
@@ -0,0 +1 @@
+CONFIG_SCSI_UFSHCD_PLATFORM=m
diff --git a/configs/fedora/generic/arm/CONFIG_SCSI_UFS_QCOM b/configs/fedora/generic/arm/CONFIG_SCSI_UFS_QCOM
new file mode 100644
index 000000000..9f663a316
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_UFS_QCOM
@@ -0,0 +1 @@
+CONFIG_SCSI_UFS_QCOM=m
diff --git a/configs/fedora/generic/arm/CONFIG_UFS_FS b/configs/fedora/generic/arm/CONFIG_UFS_FS
deleted file mode 100644
index 768c9ac9e..000000000
--- a/configs/fedora/generic/arm/CONFIG_UFS_FS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_UFS_FS is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_UFS b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_UFS
deleted file mode 100644
index 50ac1d830..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_UFS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PHY_QCOM_UFS is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_SCSI_UFSHCD b/configs/fedora/generic/s390x/CONFIG_SCSI_UFSHCD
deleted file mode 100644
index 542c89fc7..000000000
--- a/configs/fedora/generic/s390x/CONFIG_SCSI_UFSHCD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_UFSHCD is not set
diff --git a/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD
new file mode 100644
index 000000000..041b8209b
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD
@@ -0,0 +1 @@
+CONFIG_SCSI_UFSHCD=m
diff --git a/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PCI b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PCI
new file mode 100644
index 000000000..4907ac2e6
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PCI
@@ -0,0 +1 @@
+CONFIG_SCSI_UFSHCD_PCI=m
diff --git a/configs/fedora/generic/CONFIG_SCSI_UFSHCD_PLATFORM b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PLATFORM
index 16e9439f5..16e9439f5 100644
--- a/configs/fedora/generic/CONFIG_SCSI_UFSHCD_PLATFORM
+++ b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PLATFORM
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 6af1f95dd..e2c93a1ac 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4204,7 +4204,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
-# CONFIG_PHY_QCOM_UFS is not set
+CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_ROCKCHIP_DP=m
@@ -4935,9 +4935,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
@@ -6053,7 +6055,7 @@ CONFIG_UCSI=m
 CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_UHID=m
 CONFIG_UIO_AEC=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 0a288e8c4..26405e625 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4182,7 +4182,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
-# CONFIG_PHY_QCOM_UFS is not set
+CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_ROCKCHIP_DP=m
@@ -4912,9 +4912,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
@@ -6029,7 +6031,7 @@ CONFIG_UCSI=m
 CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_UHID=m
 CONFIG_UIO_AEC=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 09b1cbdd6..5fdfddff5 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5255,9 +5255,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
@@ -6517,7 +6519,7 @@ CONFIG_UCSI=m
 CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_UHID=m
 CONFIG_UIO_AEC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 53d1c59a0..f123578c5 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4238,6 +4238,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+CONFIG_PHY_QCOM_UFS=m
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 CONFIG_PHY_ROCKCHIP_DP=m
@@ -4949,9 +4950,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
@@ -6100,7 +6103,7 @@ CONFIG_UCSI=m
 CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_UHID=m
 CONFIG_UIO_AEC=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0fba79caf..f551319c9 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4216,6 +4216,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+CONFIG_PHY_QCOM_UFS=m
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 CONFIG_PHY_ROCKCHIP_DP=m
@@ -4926,9 +4927,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
@@ -6076,7 +6079,7 @@ CONFIG_UCSI=m
 CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_UHID=m
 CONFIG_UIO_AEC=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 33d140d78..5fec27c8c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5232,9 +5232,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
@@ -6493,7 +6495,7 @@ CONFIG_UCSI=m
 CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_UHID=m
 CONFIG_UIO_AEC=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 87b065743..0d1336824 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -4596,6 +4596,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index d7b9ab84c..ea83c8d92 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4618,6 +4618,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 867ad3d79..ac8bf13e1 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4618,6 +4618,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 5afd0ec5e..479e78b80 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4596,6 +4596,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 45c54e3ff..ef1713420 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4430,9 +4430,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFSHCD is not set
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 28a0b0271..3fd28437a 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4406,9 +4406,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFSHCD is not set
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 98454b390..e3452e082 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4369,9 +4369,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFSHCD is not set
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index e02a91f6a..1ceeccc9e 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4345,9 +4345,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFSHCD is not set
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 7366eb465..24376c375 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4272,9 +4272,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 # CONFIG_SCSI_UFSHCD is not set
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
 CONFIG_SCSI_VIRTIO=m
 # CONFIG_SCSI_WD719X is not set
 CONFIG_SCSI=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 6e63791c1..6699a3f53 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4248,9 +4248,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 # CONFIG_SCSI_UFSHCD is not set
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
 CONFIG_SCSI_VIRTIO=m
 # CONFIG_SCSI_WD719X is not set
 CONFIG_SCSI=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 5e8ecd13c..de92d86ab 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4701,6 +4701,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 3bc84751e..710a89eeb 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4679,6 +4679,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel.spec b/kernel.spec
index 0820c46e2..70c5216c6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1869,6 +1869,9 @@ fi
 #
 #
 %changelog
+* Thu Apr 19 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable UFS storage options on ARM
+
 * Wed Apr 18 2018 Justin M. Forbes <jforbes@fedoraproject.org>
 - Fix rhbz 1565354