Fix loading of i.MX6 cpufreq driver (rhbz 1466991), minor config cleanups (NFC)

24 files changed, 38 insertions, 39 deletions

diff --git a/arm-imx6-cpufreq-fix-loading.patch b/arm-imx6-cpufreq-fix-loading.patch
new file mode 100644
index 000000000..3c4811c1d
--- /dev/null
+++ b/arm-imx6-cpufreq-fix-loading.patch
@@ -0,0 +1,32 @@
+From d0404738c687c0ecaa7d6b7c5c39e4c0dac791e6 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Tue, 30 Jan 2018 10:55:26 +0100
+Subject: arm: imx: Add MODULE_ALIAS for cpufreq
+
+Without this, the imx6q-cpufreq driver isn't loaded
+automatically when built as a module
+
+Tested on wandboard quad with a fedora 27 kernel rpm
+
+Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
+Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/cpufreq/imx6q-cpufreq.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
+index 741f22e..ff67859 100644
+--- a/drivers/cpufreq/imx6q-cpufreq.c
++++ b/drivers/cpufreq/imx6q-cpufreq.c
+@@ -504,6 +504,7 @@ static struct platform_driver imx6q_cpufreq_platdrv = {
+ };
+ module_platform_driver(imx6q_cpufreq_platdrv);
+ 
++MODULE_ALIAS("platform:imx6q-cpufreq");
+ MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
+ MODULE_DESCRIPTION("Freescale i.MX6Q cpufreq driver");
+ MODULE_LICENSE("GPL");
+-- 
+cgit v1.1
+
diff --git a/baseconfig/CONFIG_RESET_HSDK_V1 b/baseconfig/CONFIG_RESET_HSDK_V1
deleted file mode 100644
index 4c2b97d79..000000000
--- a/baseconfig/CONFIG_RESET_HSDK_V1
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RESET_HSDK_V1 is not set
diff --git a/baseconfig/CONFIG_USB_CHIPIDEA_ULPI b/baseconfig/CONFIG_USB_CHIPIDEA_ULPI
deleted file mode 100644
index c97b84c79..000000000
--- a/baseconfig/CONFIG_USB_CHIPIDEA_ULPI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_USB_CHIPIDEA_ULPI is not set
diff --git a/baseconfig/arm/CONFIG_CRYPTO_DEV_MV_CESA b/baseconfig/arm/CONFIG_CRYPTO_DEV_MV_CESA
deleted file mode 100644
index 25ac0e90d..000000000
--- a/baseconfig/arm/CONFIG_CRYPTO_DEV_MV_CESA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_MV_CESA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RESET_IMX7 b/baseconfig/arm/armv7/armv7/CONFIG_RESET_IMX7
new file mode 100644
index 000000000..6718265f9
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_RESET_IMX7
@@ -0,0 +1 @@
+CONFIG_RESET_IMX7=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index a2e7d11ac..320fa7f76 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1014,7 +1014,6 @@ CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
@@ -4455,7 +4454,6 @@ CONFIG_RENESAS_PHY=m
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
 CONFIG_RESET_HISI=y
-# CONFIG_RESET_HSDK_V1 is not set
 CONFIG_RESET_SIMPLE=y
 # CONFIG_RESET_TI_SCI is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index fb414d3cd..d6ecc00d8 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1013,7 +1013,6 @@ CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
@@ -4433,7 +4432,6 @@ CONFIG_RENESAS_PHY=m
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
 CONFIG_RESET_HISI=y
-# CONFIG_RESET_HSDK_V1 is not set
 CONFIG_RESET_SIMPLE=y
 # CONFIG_RESET_TI_SCI is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index eedad1130..e5c7c18a2 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1057,7 +1057,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_MV_CESA=m
 # CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
@@ -4789,7 +4788,7 @@ CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
-# CONFIG_RESET_HSDK_V1 is not set
+CONFIG_RESET_IMX7=y
 CONFIG_RESET_SIMPLE=y
 # CONFIG_RESET_TI_SCI is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 73d42c6ba..a851fd9cd 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1013,7 +1013,6 @@ CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
@@ -4497,7 +4496,6 @@ CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
-# CONFIG_RESET_HSDK_V1 is not set
 CONFIG_RESET_SIMPLE=y
 # CONFIG_RESET_TI_SCI is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8f072b706..5112e6466 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1011,7 +1011,6 @@ CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
@@ -4475,7 +4474,6 @@ CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
-# CONFIG_RESET_HSDK_V1 is not set
 CONFIG_RESET_SIMPLE=y
 # CONFIG_RESET_TI_SCI is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 3ae43f309..8af17bea9 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1055,7 +1055,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_MV_CESA=m
 # CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
@@ -4767,7 +4766,7 @@ CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
-# CONFIG_RESET_HSDK_V1 is not set
+CONFIG_RESET_IMX7=y
 CONFIG_RESET_SIMPLE=y
 # CONFIG_RESET_TI_SCI is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index d6d18d184..83595fe43 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -4183,7 +4183,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
@@ -5566,7 +5565,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index b1bf1d94a..02000775d 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4204,7 +4204,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
@@ -5588,7 +5587,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 3c2c0016a..62ca247fc 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4204,7 +4204,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
@@ -5588,7 +5587,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 4bf9d5c7e..e4a88d238 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4183,7 +4183,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
@@ -5566,7 +5565,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 10e041b1f..8f044e613 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4012,7 +4012,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5351,7 +5350,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index ff6d7173e..db662106b 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3989,7 +3989,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5327,7 +5326,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 828aafb03..237d50ae5 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3951,7 +3951,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5279,7 +5278,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index a29beee9b..2c10bb1f3 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3928,7 +3928,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5255,7 +5254,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 768b0df86..67f488c84 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3844,7 +3844,6 @@ CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_CONTROLLER is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5176,7 +5175,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 71ac47a8d..02e019a64 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3821,7 +3821,6 @@ CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_CONTROLLER is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5152,7 +5151,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index ae141b5eb..aab4632ba 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4282,7 +4282,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
@@ -5676,7 +5675,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index f7437e2b1..7fffd5ef4 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4261,7 +4261,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
@@ -5654,7 +5653,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
 # CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
diff --git a/kernel.spec b/kernel.spec
index 124184e52..3727a076f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -593,6 +593,8 @@ Patch308: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe
 
 Patch309: arm-exynos-fix-dwc3-neg.patch
 
+Patch310: arm-imx6-cpufreq-fix-loading.patch
+
 # https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/log/?h=synquacer-netsec
 Patch330: arm64-socionext-96b-enablement.patch
 
@@ -1917,6 +1919,7 @@ fi
 * Thu Feb  8 2018 Peter Robinson <pbrobinson@fedoraproject.org>
 - Add Exynos5 patch (second part of series) to fix USB-3 devices on some Odroid devices
 - Fix up and re-enable adv7511
+- Fix loading of i.MX6 cpufreq driver (rhbz 1466991)
 
 * Wed Feb 07 2018 Laura Abbott <labbott@redhat.com> - 4.15.2-300
 - Linux v4.15.2 rebase