19 files changed, 15 insertions, 31 deletions
diff --git a/configs/fedora/generic/CONFIG_INTERCONNECT_QCOM_MSM8916 b/configs/fedora/generic/CONFIG_INTERCONNECT_QCOM_MSM8916
deleted file mode 100644
index 012ceff6e..000000000
--- a/configs/fedora/generic/CONFIG_INTERCONNECT_QCOM_MSM8916
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
diff --git a/configs/fedora/generic/CONFIG_NVMEM_SPMI_SDAM b/configs/fedora/generic/CONFIG_NVMEM_SPMI_SDAM
deleted file mode 100644
index b999440b8..000000000
--- a/configs/fedora/generic/CONFIG_NVMEM_SPMI_SDAM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NVMEM_SPMI_SDAM is not set
diff --git a/configs/fedora/generic/arm/CONFIG_INTERCONNECT_QCOM_MSM8916 b/configs/fedora/generic/arm/CONFIG_INTERCONNECT_QCOM_MSM8916
new file mode 100644
index 000000000..09742187e
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_INTERCONNECT_QCOM_MSM8916
@@ -0,0 +1 @@
+CONFIG_INTERCONNECT_QCOM_MSM8916=m
diff --git a/configs/fedora/generic/arm/CONFIG_NVMEM_SPMI_SDAM b/configs/fedora/generic/arm/CONFIG_NVMEM_SPMI_SDAM
new file mode 100644
index 000000000..e3925e528
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_NVMEM_SPMI_SDAM
@@ -0,0 +1 @@
+CONFIG_NVMEM_SPMI_SDAM=m
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 3499c683a..04621aa0b 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2695,7 +2695,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT=m
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
+CONFIG_INTERCONNECT_QCOM_MSM8916=m
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 CONFIG_INTERCONNECT_QCOM_SDM845=m
@@ -4373,7 +4373,7 @@ CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM_IMX_OCOTP_SCU=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index a924013a8..8e9ea0e63 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2679,7 +2679,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT=m
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
+CONFIG_INTERCONNECT_QCOM_MSM8916=m
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 CONFIG_INTERCONNECT_QCOM_SDM845=m
@@ -4353,7 +4353,7 @@ CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM_IMX_OCOTP_SCU=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index fd1795a54..c798bbdac 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2713,7 +2713,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
+CONFIG_INTERCONNECT_QCOM_MSM8916=m
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -4429,7 +4429,7 @@ CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_SNVS_LPGPR=m
-# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 938656a9b..dd706a8a2 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2698,7 +2698,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
+CONFIG_INTERCONNECT_QCOM_MSM8916=m
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -4410,7 +4410,7 @@ CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_SNVS_LPGPR=m
-# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 9c7fbbf76..db99d5c6e 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2644,7 +2644,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
+CONFIG_INTERCONNECT_QCOM_MSM8916=m
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -4324,7 +4324,7 @@ CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_SNVS_LPGPR=m
-# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index f15105dfd..0fdf8bf61 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2629,7 +2629,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
+CONFIG_INTERCONNECT_QCOM_MSM8916=m
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -4305,7 +4305,7 @@ CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_SNVS_LPGPR=m
-# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 722a47e4e..bbd6bdd52 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -2422,7 +2422,6 @@ CONFIG_INTEL_VBTN=m
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
@@ -4029,7 +4028,6 @@ CONFIG_NULL_TTY=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 410b730eb..b92dacce3 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -2405,7 +2405,6 @@ CONFIG_INTEL_VBTN=m
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
@@ -4010,7 +4009,6 @@ CONFIG_NULL_TTY=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 3d602103c..0df678a15 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2180,7 +2180,6 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
@@ -3743,7 +3742,6 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 8edf1028f..d3aab114f 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2163,7 +2163,6 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
@@ -3722,7 +3721,6 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 8961f2210..dd488d1c2 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2158,7 +2158,6 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
@@ -3713,7 +3712,6 @@ CONFIG_NUMA=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 7af4af445..6808dd74e 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2141,7 +2141,6 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
@@ -3692,7 +3691,6 @@ CONFIG_NUMA=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 5a5bc7d65..9e80ae13a 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2472,7 +2472,6 @@ CONFIG_INTEL_VBTN=m
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_INV_MPU6050_I2C=m
 CONFIG_INV_MPU6050_IIO=m
@@ -4084,7 +4083,6 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 821e0eff5..0b6eee9b0 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2455,7 +2455,6 @@ CONFIG_INTEL_VBTN=m
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_INV_MPU6050_I2C=m
 CONFIG_INV_MPU6050_IIO=m
@@ -4065,7 +4064,6 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel.spec b/kernel.spec
index e86fb65ae..70e4ded46 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -831,7 +831,7 @@ Patch313: usb-xhci-Raspberry-Pi-FW-loader-for-VIA-VL805.patch
 # Tegra bits
 Patch320: arm64-tegra-jetson-tx1-fixes.patch
 # http://patchwork.ozlabs.org/patch/1230891/
-Patch322: arm64-serial-8250_tegra-Create-Tegra-specific-8250-driver.patch
+Patch321: arm64-serial-8250_tegra-Create-Tegra-specific-8250-driver.patch
 
 # 400 - IBM (ppc/s390x) patches