arm: minor updates

32 files changed, 68 insertions, 57 deletions

diff --git a/configs/fedora/generic/CONFIG_MTD_NAND_FSL_IFC b/configs/fedora/generic/CONFIG_MTD_NAND_FSL_IFC
deleted file mode 100644
index b8a44ee19..000000000
--- a/configs/fedora/generic/CONFIG_MTD_NAND_FSL_IFC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MTD_NAND_FSL_IFC is not set
diff --git a/configs/fedora/generic/CONFIG_GPIO_MPC8XXX b/configs/fedora/generic/arm/CONFIG_GPIO_MPC8XXX
index 876fd6a58..876fd6a58 100644
--- a/configs/fedora/generic/CONFIG_GPIO_MPC8XXX
+++ b/configs/fedora/generic/arm/CONFIG_GPIO_MPC8XXX
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_DATAFLASH b/configs/fedora/generic/arm/CONFIG_MTD_DATAFLASH
index 811074928..811074928 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_DATAFLASH
+++ b/configs/fedora/generic/arm/CONFIG_MTD_DATAFLASH
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_DATAFLASH_OTP b/configs/fedora/generic/arm/CONFIG_MTD_DATAFLASH_OTP
index 9b951bd56..9b951bd56 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_DATAFLASH_OTP
+++ b/configs/fedora/generic/arm/CONFIG_MTD_DATAFLASH_OTP
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_DATAFLASH_WRITE_VERIFY b/configs/fedora/generic/arm/CONFIG_MTD_DATAFLASH_WRITE_VERIFY
index 8549afbbc..8549afbbc 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_DATAFLASH_WRITE_VERIFY
+++ b/configs/fedora/generic/arm/CONFIG_MTD_DATAFLASH_WRITE_VERIFY
diff --git a/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_GEMINI b/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_GEMINI
new file mode 100644
index 000000000..0a5178936
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_GEMINI
@@ -0,0 +1 @@
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
diff --git a/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_IXP4XX b/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_IXP4XX
new file mode 100644
index 000000000..51968d79e
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_IXP4XX
@@ -0,0 +1 @@
+# CONFIG_MTD_PHYSMAP_IXP4XX is not set
diff --git a/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_OF b/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_OF
index 20f59ebc7..6cdadf044 100644
--- a/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_OF
+++ b/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_OF
@@ -1 +1 @@
-# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP_OF=y
diff --git a/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_VERSATILE b/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_VERSATILE
new file mode 100644
index 000000000..54ac1e2a8
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MTD_PHYSMAP_VERSATILE
@@ -0,0 +1 @@
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_SST25L b/configs/fedora/generic/arm/CONFIG_MTD_SST25L
index b1da0c467..b1da0c467 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_SST25L
+++ b/configs/fedora/generic/arm/CONFIG_MTD_SST25L
diff --git a/configs/fedora/generic/arm/CONFIG_RTC_DRV_PCF85363 b/configs/fedora/generic/arm/CONFIG_RTC_DRV_PCF85363
new file mode 100644
index 000000000..41451f50b
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_PCF85363
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_PCF85363=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CLK_QORIQ b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_QORIQ
index b05638e5c..def0884d5 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_CLK_QORIQ
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_QORIQ
@@ -1 +1 @@
-# CONFIG_CLK_QORIQ is not set
+CONFIG_CLK_QORIQ=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MTD_NAND_FSL_IFC b/configs/fedora/generic/arm/aarch64/CONFIG_MTD_NAND_FSL_IFC
new file mode 100644
index 000000000..38acef3a9
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_MTD_NAND_FSL_IFC
@@ -0,0 +1 @@
+CONFIG_MTD_NAND_FSL_IFC=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_NET_DSA_MSCC_FELIX b/configs/fedora/generic/arm/aarch64/CONFIG_NET_DSA_MSCC_FELIX
new file mode 100644
index 000000000..47506f794
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_NET_DSA_MSCC_FELIX
@@ -0,0 +1 @@
+CONFIG_NET_DSA_MSCC_FELIX=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QORIQ_CPUFREQ b/configs/fedora/generic/arm/aarch64/CONFIG_QORIQ_CPUFREQ
new file mode 100644
index 000000000..f70531603
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QORIQ_CPUFREQ
@@ -0,0 +1 @@
+CONFIG_QORIQ_CPUFREQ=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SOC_LS1021A b/configs/fedora/generic/arm/armv7/CONFIG_SOC_LS1021A
index 3df043f0c..3df043f0c 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SOC_LS1021A
+++ b/configs/fedora/generic/arm/armv7/CONFIG_SOC_LS1021A
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SPI_FSL_SPI b/configs/fedora/generic/arm/armv7/CONFIG_SPI_FSL_SPI
new file mode 100644
index 000000000..834ceae37
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_SPI_FSL_SPI
@@ -0,0 +1 @@
+CONFIG_SPI_FSL_SPI=m
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 66f435c72..4e98f11ba 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -973,7 +973,7 @@ CONFIG_CLK_IMX8MN=y
 CONFIG_CLK_IMX8MQ=y
 CONFIG_CLK_IMX8QXP=y
 CONFIG_CLK_LS1028A_PLLDIG=y
-# CONFIG_CLK_QORIQ is not set
+CONFIG_CLK_QORIQ=y
 CONFIG_CLK_RASPBERRYPI=y
 # CONFIG_CLK_SIFIVE is not set
 CONFIG_CLK_SP810=y
@@ -3711,7 +3711,9 @@ CONFIG_MTD_CFI=m
 CONFIG_MTD_CFI_STAA=m
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_DATAFLASH is not set
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
 # CONFIG_MTD_DOCG3 is not set
 # CONFIG_MTD_HYPERBUS is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
@@ -3733,7 +3735,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
+CONFIG_MTD_NAND_FSL_IFC=m
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 CONFIG_MTD_NAND_MARVELL=m
@@ -3753,8 +3755,11 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_IXP4XX is not set
 CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -3766,7 +3771,7 @@ CONFIG_MTD_RAW_NAND=m
 CONFIG_MTD_SPI_NAND=m
 CONFIG_MTD_SPI_NOR=m
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-# CONFIG_MTD_SST25L is not set
+CONFIG_MTD_SST25L=m
 # CONFIG_MTD_SWAP is not set
 # CONFIG_MTD_TESTS is not set
 CONFIG_MTD_UBI_BEB_LIMIT=20
@@ -3869,7 +3874,7 @@ CONFIG_NET_DSA=m
 # CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C is not set
 CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
-# CONFIG_NET_DSA_MSCC_FELIX is not set
+CONFIG_NET_DSA_MSCC_FELIX=m
 CONFIG_NET_DSA_MT7530=m
 # CONFIG_NET_DSA_MV88E6060 is not set
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
@@ -4944,7 +4949,7 @@ CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLGE=m
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
-# CONFIG_QORIQ_CPUFREQ is not set
+CONFIG_QORIQ_CPUFREQ=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
@@ -5270,7 +5275,7 @@ CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
-# CONFIG_RTC_DRV_PCF85363 is not set
+CONFIG_RTC_DRV_PCF85363=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 # CONFIG_RTC_DRV_PL030 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 5187e991d..07ad8269b 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -973,7 +973,7 @@ CONFIG_CLK_IMX8MN=y
 CONFIG_CLK_IMX8MQ=y
 CONFIG_CLK_IMX8QXP=y
 CONFIG_CLK_LS1028A_PLLDIG=y
-# CONFIG_CLK_QORIQ is not set
+CONFIG_CLK_QORIQ=y
 CONFIG_CLK_RASPBERRYPI=y
 # CONFIG_CLK_SIFIVE is not set
 CONFIG_CLK_SP810=y
@@ -3691,7 +3691,9 @@ CONFIG_MTD_CFI=m
 CONFIG_MTD_CFI_STAA=m
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_DATAFLASH is not set
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
 # CONFIG_MTD_DOCG3 is not set
 # CONFIG_MTD_HYPERBUS is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
@@ -3713,7 +3715,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
+CONFIG_MTD_NAND_FSL_IFC=m
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 CONFIG_MTD_NAND_MARVELL=m
@@ -3733,8 +3735,11 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_IXP4XX is not set
 CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -3746,7 +3751,7 @@ CONFIG_MTD_RAW_NAND=m
 CONFIG_MTD_SPI_NAND=m
 CONFIG_MTD_SPI_NOR=m
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-# CONFIG_MTD_SST25L is not set
+CONFIG_MTD_SST25L=m
 # CONFIG_MTD_SWAP is not set
 # CONFIG_MTD_TESTS is not set
 CONFIG_MTD_UBI_BEB_LIMIT=20
@@ -3849,7 +3854,7 @@ CONFIG_NET_DSA=m
 # CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C is not set
 CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
-# CONFIG_NET_DSA_MSCC_FELIX is not set
+CONFIG_NET_DSA_MSCC_FELIX=m
 CONFIG_NET_DSA_MT7530=m
 # CONFIG_NET_DSA_MV88E6060 is not set
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
@@ -4923,7 +4928,7 @@ CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLGE=m
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
-# CONFIG_QORIQ_CPUFREQ is not set
+CONFIG_QORIQ_CPUFREQ=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
@@ -5249,7 +5254,7 @@ CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
-# CONFIG_RTC_DRV_PCF85363 is not set
+CONFIG_RTC_DRV_PCF85363=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 # CONFIG_RTC_DRV_PL030 is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 48db5378f..c66e1133c 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -3789,7 +3789,6 @@ CONFIG_MTD_NAND_CAFE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 CONFIG_MTD_NAND_GPIO=m
 CONFIG_MTD_NAND_GPMI_NAND=m
 # CONFIG_MTD_NAND_HISI504 is not set
@@ -3814,8 +3813,11 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_IXP4XX is not set
 CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -5379,7 +5381,7 @@ CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
-# CONFIG_RTC_DRV_PCF85363 is not set
+CONFIG_RTC_DRV_PCF85363=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
@@ -6482,7 +6484,7 @@ CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
 CONFIG_SPI_FSL_LPSPI=m
 CONFIG_SPI_FSL_QUADSPI=m
-# CONFIG_SPI_FSL_SPI is not set
+CONFIG_SPI_FSL_SPI=m
 CONFIG_SPI_GPIO=m
 # CONFIG_SPI_HISI_SFC_V3XX is not set
 CONFIG_SPI_IMX=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 87f5e4d30..6f058b1dd 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -3770,7 +3770,6 @@ CONFIG_MTD_NAND_CAFE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 CONFIG_MTD_NAND_GPIO=m
 CONFIG_MTD_NAND_GPMI_NAND=m
 # CONFIG_MTD_NAND_HISI504 is not set
@@ -3795,8 +3794,11 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_IXP4XX is not set
 CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -5359,7 +5361,7 @@ CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
-# CONFIG_RTC_DRV_PCF85363 is not set
+CONFIG_RTC_DRV_PCF85363=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
@@ -6461,7 +6463,7 @@ CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
 CONFIG_SPI_FSL_LPSPI=m
 CONFIG_SPI_FSL_QUADSPI=m
-# CONFIG_SPI_FSL_SPI is not set
+CONFIG_SPI_FSL_SPI=m
 CONFIG_SPI_GPIO=m
 # CONFIG_SPI_HISI_SFC_V3XX is not set
 CONFIG_SPI_IMX=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index ca5a9e869..e544c48bb 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -3689,7 +3689,6 @@ CONFIG_MTD_NAND_DAVINCI=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 CONFIG_MTD_NAND_GPIO=m
 # CONFIG_MTD_NAND_HISI504 is not set
 CONFIG_MTD_NAND_MARVELL=m
@@ -3712,8 +3711,11 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_IXP4XX is not set
 CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -5199,7 +5201,7 @@ CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
-# CONFIG_RTC_DRV_PCF85363 is not set
+CONFIG_RTC_DRV_PCF85363=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
@@ -6213,6 +6215,7 @@ CONFIG_SOC_EXYNOS5800=y
 # CONFIG_SOC_HAS_OMAP2_SDRC is not set
 CONFIG_SOC_HAS_REALTIME_COUNTER=y
 # CONFIG_SOC_IMX6SLL is not set
+# CONFIG_SOC_LS1021A is not set
 CONFIG_SOC_OMAP5=y
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
@@ -6246,7 +6249,7 @@ CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
 CONFIG_SPI_FSL_LPSPI=m
 CONFIG_SPI_FSL_QUADSPI=m
-# CONFIG_SPI_FSL_SPI is not set
+CONFIG_SPI_FSL_SPI=m
 CONFIG_SPI_GPIO=m
 # CONFIG_SPI_HISI_SFC_V3XX is not set
 CONFIG_SPI_IMX=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index a4d818e96..226fb50a4 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -3670,7 +3670,6 @@ CONFIG_MTD_NAND_DAVINCI=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 CONFIG_MTD_NAND_GPIO=m
 # CONFIG_MTD_NAND_HISI504 is not set
 CONFIG_MTD_NAND_MARVELL=m
@@ -3693,8 +3692,11 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_IXP4XX is not set
 CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -5179,7 +5181,7 @@ CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
-# CONFIG_RTC_DRV_PCF85363 is not set
+CONFIG_RTC_DRV_PCF85363=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
@@ -6192,6 +6194,7 @@ CONFIG_SOC_EXYNOS5800=y
 # CONFIG_SOC_HAS_OMAP2_SDRC is not set
 CONFIG_SOC_HAS_REALTIME_COUNTER=y
 # CONFIG_SOC_IMX6SLL is not set
+# CONFIG_SOC_LS1021A is not set
 CONFIG_SOC_OMAP5=y
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
@@ -6225,7 +6228,7 @@ CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
 CONFIG_SPI_FSL_LPSPI=m
 CONFIG_SPI_FSL_QUADSPI=m
-# CONFIG_SPI_FSL_SPI is not set
+CONFIG_SPI_FSL_SPI=m
 CONFIG_SPI_GPIO=m
 # CONFIG_SPI_HISI_SFC_V3XX is not set
 CONFIG_SPI_IMX=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 29396972a..b909e248e 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -1833,7 +1833,6 @@ CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_PCA953X=m
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
@@ -3405,7 +3404,6 @@ CONFIG_MTD_NAND_CAFE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MESON is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index f687ce946..cae2b33cb 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -1816,7 +1816,6 @@ CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_PCA953X=m
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
@@ -3386,7 +3385,6 @@ CONFIG_MTD_NAND_CAFE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MESON is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 1caee5d40..7f0f9e6e5 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1667,7 +1667,6 @@ CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
@@ -3127,7 +3126,6 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MESON is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 1a538de5f..99c48050a 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1650,7 +1650,6 @@ CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
@@ -3106,7 +3105,6 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MESON is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 9a41dd7bc..f8c8caebf 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1663,7 +1663,6 @@ CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_PCA953X=m
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
@@ -3100,7 +3099,6 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MESON is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 808032031..23c26c31f 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1646,7 +1646,6 @@ CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_PCA953X=m
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
@@ -3079,7 +3078,6 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MESON is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 41381fbf5..148bd2342 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1867,7 +1867,6 @@ CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_PCA953X=m
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
@@ -3449,7 +3448,6 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MESON is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index a4056433c..9b1a38246 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1850,7 +1850,6 @@ CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_PCA953X=m
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
@@ -3430,7 +3429,6 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_FSL_IFC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MESON is not set
diff --git a/kernel.spec b/kernel.spec
index 1b25edc24..f974e291b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -845,17 +845,17 @@ Patch325: backlight-lp855x-Ensure-regulators-are-disabled-on-probe-failure.patch
 Patch330: arm64-dts-imx8mq-phanbell-Add-support-for-ethernet.patch
 
 # Pine64 bits
-# 340-344 queued for 5.7
+# 340-345 queued for 5.7
 Patch340: arm64-pinebook-fixes.patch
 Patch341: arm64-a64-mbus.patch
+# v4 https://patchwork.kernel.org/cover/11420797/
+Patch342: Add-support-for-the-pine64-Pinebook-Pro.patch
 # https://patchwork.kernel.org/cover/11405517/
-Patch342: Add-LCD-support-for-Pine64-Pinebook-1080p.patch
+Patch343: Add-LCD-support-for-Pine64-Pinebook-1080p.patch
 # https://lkml.org/lkml/2020/1/15/1320
-Patch343: arm64-pine64-pinetab.patch
+Patch344: arm64-pine64-pinetab.patch
 # https://www.spinics.net/lists/arm-kernel/msg789135.html
-Patch344: arm64-pine64-pinephone.patch
-# v4 https://patchwork.kernel.org/cover/11420797/
-Patch345: Add-support-for-the-pine64-Pinebook-Pro.patch
+Patch345: arm64-pine64-pinephone.patch
 
 # 400 - IBM (ppc/s390x) patches