Enable UFS storage options on ARM

32 files changed, 64 insertions, 52 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 6d2a8a713..70f4f39cb 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -149,7 +149,7 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AHCI_CEVA=m
+# CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
 CONFIG_AHCI_SUNXI=m
@@ -713,7 +713,6 @@ CONFIG_BUILD_DOCSRC=y
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
 CONFIG_CACHEFILES=m
-CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CADENCE_WATCHDOG=m
 # CONFIG_CAIF is not set
 CONFIG_CAN_8DEV_USB=m
@@ -760,7 +759,7 @@ CONFIG_CAN_SUN4I=m
 # CONFIG_CAN_TSCAN1 is not set
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
-CONFIG_CAN_XILINXCAN=m
+# CONFIG_CAN_XILINXCAN is not set
 CONFIG_CAPI_AVM=y
 # CONFIG_CAPI_EICON is not set
 # CONFIG_CAPI_TRACE is not set
@@ -1823,7 +1822,6 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
-CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
@@ -2214,7 +2212,7 @@ CONFIG_IMA_LSM_RULES=y
 CONFIG_IMA_MEASURE_PCR_IDX=10
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
-CONFIG_INA2XX_ADC=m
+# CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
@@ -3096,7 +3094,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
 # CONFIG_MFD_TIMBERDALE is not set
-CONFIG_MFD_TPS65086=m
+# CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
 # CONFIG_MFD_TPS65218 is not set
@@ -4125,7 +4123,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
@@ -4481,7 +4479,6 @@ CONFIG_REGULATOR_RK808=m
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
-CONFIG_REGULATOR_TPS65086=m
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
@@ -4845,9 +4842,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
@@ -5105,8 +5104,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
-CONFIG_SERIAL_XILINX_PS_UART=y
+# CONFIG_SERIAL_XILINX_PS_UART is not set
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
@@ -5949,7 +5947,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 133e05b90..c449fcb5c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -149,7 +149,7 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AF_KCM is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
-CONFIG_AHCI_CEVA=m
+# CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
 CONFIG_AHCI_SUNXI=m
@@ -713,7 +713,6 @@ CONFIG_BUILD_DOCSRC=y
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
 CONFIG_CACHEFILES=m
-CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CADENCE_WATCHDOG=m
 # CONFIG_CAIF is not set
 CONFIG_CAN_8DEV_USB=m
@@ -760,7 +759,7 @@ CONFIG_CAN_SUN4I=m
 # CONFIG_CAN_TSCAN1 is not set
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
-CONFIG_CAN_XILINXCAN=m
+# CONFIG_CAN_XILINXCAN is not set
 CONFIG_CAPI_AVM=y
 # CONFIG_CAPI_EICON is not set
 # CONFIG_CAPI_TRACE is not set
@@ -1805,7 +1804,6 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
-CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
@@ -2196,7 +2194,7 @@ CONFIG_IMA_LSM_RULES=y
 CONFIG_IMA_MEASURE_PCR_IDX=10
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
-CONFIG_INA2XX_ADC=m
+# CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
@@ -3075,7 +3073,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
 # CONFIG_MFD_TIMBERDALE is not set
-CONFIG_MFD_TPS65086=m
+# CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
 # CONFIG_MFD_TPS65218 is not set
@@ -4103,7 +4101,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
@@ -4458,7 +4456,6 @@ CONFIG_REGULATOR_RK808=m
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
-CONFIG_REGULATOR_TPS65086=m
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
@@ -4822,9 +4819,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
@@ -5082,8 +5081,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
-CONFIG_SERIAL_XILINX_PS_UART=y
+# CONFIG_SERIAL_XILINX_PS_UART is not set
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
@@ -5925,7 +5923,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 8dd5a6f33..99cd22b65 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5184,9 +5184,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
@@ -6432,7 +6434,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 2d105f611..fa12dbfe1 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4177,6 +4177,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
@@ -4876,9 +4877,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
@@ -6013,7 +6016,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 b6856efda..b61ad39fb 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4155,6 +4155,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
@@ -4853,9 +4854,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
@@ -5989,7 +5992,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 89631775d..fce371629 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5161,9 +5161,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
@@ -6408,7 +6410,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 07964da3a..70e68a90e 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -4526,6 +4526,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 52714cd6b..7ee80e01b 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4548,6 +4548,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 19a76085a..69cd58f8c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4548,6 +4548,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 abdc72143..e8a1d72a5 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4526,6 +4526,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 fb0c89ac3..e1c813b30 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4362,9 +4362,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 ff348860d..952abd975 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4338,9 +4338,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 fa42fc631..a08062367 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4301,9 +4301,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 b79306d9a..312cfbc21 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4277,9 +4277,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 312ab50fe..c793856c4 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4204,9 +4204,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 d40aa520f..916abf4b6 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4180,9 +4180,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 0975954b1..097d1ae82 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4631,6 +4631,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 bb458a5d0..689105675 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4609,6 +4609,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 d088d62c1..f79d11d50 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1901,6 +1901,9 @@ fi
 #
 #
 %changelog
+* Thu Apr 19 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable UFS storage options on ARM
+
 * Tue Apr 17 2018 Peter Robinson <pbrobinson@fedoraproject.org>
 - Enable drivers for Xilinx ZYMQ-MP Ultra96