Minor ARM config updates

31 files changed, 28 insertions, 70 deletions

diff --git a/baseconfig/CONFIG_ARM_PSCI_CHECKER b/baseconfig/CONFIG_ARM_PSCI_CHECKER
deleted file mode 100644
index dce78572b..000000000
--- a/baseconfig/CONFIG_ARM_PSCI_CHECKER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM_PSCI_CHECKER=y
diff --git a/baseconfig/CONFIG_QCOM_CLK_RPM b/baseconfig/CONFIG_QCOM_CLK_RPM
deleted file mode 100644
index 49d6fe218..000000000
--- a/baseconfig/CONFIG_QCOM_CLK_RPM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_CLK_RPM is not set
diff --git a/baseconfig/CONFIG_QCOM_CLK_SMD_RPM b/baseconfig/CONFIG_QCOM_CLK_SMD_RPM
deleted file mode 100644
index f84e24848..000000000
--- a/baseconfig/CONFIG_QCOM_CLK_SMD_RPM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_CLK_SMD_RPM is not set
diff --git a/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER b/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER
index dce78572b..8d66ce36a 100644
--- a/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER
+++ b/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER
@@ -1 +1 @@
-CONFIG_ARM_PSCI_CHECKER=y
+# CONFIG_ARM_PSCI_CHECKER is not set
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM b/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM
new file mode 100644
index 000000000..5650c8603
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM
@@ -0,0 +1 @@
+CONFIG_QCOM_CLK_RPM=m
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM b/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM
new file mode 100644
index 000000000..d355533c9
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM
@@ -0,0 +1 @@
+CONFIG_QCOM_CLK_SMD_RPM=m
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_TSENS b/baseconfig/arm/arm64/CONFIG_QCOM_TSENS
index a781c024e..0d43fc907 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_TSENS
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_TSENS
@@ -1 +1 @@
-# CONFIG_QCOM_TSENS is not set
+CONFIG_QCOM_TSENS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM
new file mode 100644
index 000000000..5650c8603
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM
@@ -0,0 +1 @@
+CONFIG_QCOM_CLK_RPM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM
new file mode 100644
index 000000000..d355533c9
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM
@@ -0,0 +1 @@
+CONFIG_QCOM_CLK_SMD_RPM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS
index a781c024e..0d43fc907 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS
+++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS
@@ -1 +1 @@
-# CONFIG_QCOM_TSENS is not set
+CONFIG_QCOM_TSENS=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index ae593743c..aa63b78aa 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -293,7 +293,7 @@ CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_ARM_MHU=m
 CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
-CONFIG_ARM_PSCI_CHECKER=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
@@ -4029,8 +4029,8 @@ CONFIG_PWM=y
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_BAM_DMA=y
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
+CONFIG_QCOM_CLK_RPM=m
+CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
 # CONFIG_QCOM_EBI2 is not set
 CONFIG_QCOM_EMAC=m
@@ -4047,7 +4047,7 @@ CONFIG_QCOM_SMSM=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 CONFIG_QCOM_SPMI_VADC=m
-# CONFIG_QCOM_TSENS is not set
+CONFIG_QCOM_TSENS=m
 CONFIG_QCOM_WCNSS_CTRL=m
 # CONFIG_QCOM_WCNSS_PIL is not set
 CONFIG_QCOM_WDT=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index c17686377..76ddc11a9 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -293,7 +293,7 @@ CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_ARM_MHU=m
 CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
-CONFIG_ARM_PSCI_CHECKER=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
@@ -4007,8 +4007,8 @@ CONFIG_PWM=y
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_BAM_DMA=y
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
+CONFIG_QCOM_CLK_RPM=m
+CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
 # CONFIG_QCOM_EBI2 is not set
 CONFIG_QCOM_EMAC=m
@@ -4025,7 +4025,7 @@ CONFIG_QCOM_SMSM=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 CONFIG_QCOM_SPMI_VADC=m
-# CONFIG_QCOM_TSENS is not set
+CONFIG_QCOM_TSENS=m
 CONFIG_QCOM_WCNSS_CTRL=m
 # CONFIG_QCOM_WCNSS_PIL is not set
 CONFIG_QCOM_WDT=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 9429caef9..ecf4c160b 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -321,7 +321,7 @@ CONFIG_ARM_MVEBU_V7_CPUIDLE=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
-CONFIG_ARM_PSCI_CHECKER=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
@@ -4371,8 +4371,8 @@ CONFIG_PXA_DMA=y
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_BAM_DMA=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
+CONFIG_QCOM_CLK_RPM=m
+CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
@@ -4390,7 +4390,7 @@ CONFIG_QCOM_SMSM=m
 CONFIG_QCOM_SPMI_IADC=m
 # CONFIG_QCOM_SPMI_TEMP_ALARM is not set
 CONFIG_QCOM_SPMI_VADC=m
-# CONFIG_QCOM_TSENS is not set
+CONFIG_QCOM_TSENS=m
 CONFIG_QCOM_WCNSS_CTRL=m
 # CONFIG_QCOM_WCNSS_PIL is not set
 CONFIG_QCOM_WDT=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 575fbedd6..46bc4cf24 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -311,7 +311,7 @@ CONFIG_ARM_MVEBU_V7_CPUIDLE=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
-CONFIG_ARM_PSCI_CHECKER=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
@@ -4146,8 +4146,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 25d775193..7abbd9af2 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -311,7 +311,7 @@ CONFIG_ARM_MVEBU_V7_CPUIDLE=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
-CONFIG_ARM_PSCI_CHECKER=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
@@ -4125,8 +4125,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 70f4762ad..bf2b2ad70 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -321,7 +321,7 @@ CONFIG_ARM_MVEBU_V7_CPUIDLE=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
-CONFIG_ARM_PSCI_CHECKER=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
@@ -4350,8 +4350,8 @@ CONFIG_PXA_DMA=y
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_BAM_DMA=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
+CONFIG_QCOM_CLK_RPM=m
+CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
@@ -4369,7 +4369,7 @@ CONFIG_QCOM_SMSM=m
 CONFIG_QCOM_SPMI_IADC=m
 # CONFIG_QCOM_SPMI_TEMP_ALARM is not set
 CONFIG_QCOM_SPMI_VADC=m
-# CONFIG_QCOM_TSENS is not set
+CONFIG_QCOM_TSENS=m
 CONFIG_QCOM_WCNSS_CTRL=m
 # CONFIG_QCOM_WCNSS_PIL is not set
 CONFIG_QCOM_WDT=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 616404f8c..5a3efa25e 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -226,7 +226,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -3880,8 +3879,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index a506651fa..2a315af9b 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -226,7 +226,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -3900,8 +3899,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 38d4bebe0..93c8deaf3 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -226,7 +226,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -3900,8 +3899,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 8b979a8d9..209050f06 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -226,7 +226,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -3880,8 +3879,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index a2a926b1c..925841147 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -188,7 +188,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -3766,8 +3765,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index e5b0c01dd..4fdd77aad 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -188,7 +188,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -3744,8 +3743,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 32986ada2..9d8019bce 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -182,7 +182,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -3706,8 +3705,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 89062a1cd..a260cf6ee 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -182,7 +182,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -3684,8 +3683,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 63ce50889..7c4290b2c 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -182,7 +182,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -3705,8 +3704,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 3b6cccc3b..94b75be1e 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -182,7 +182,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -3683,8 +3682,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index cf8f414d5..9cae5b0bf 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -184,7 +184,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -3592,8 +3591,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index a1b69e8a2..ec0f67b53 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -184,7 +184,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -3570,8 +3569,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 108e3bc0a..9ca124896 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -225,7 +225,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_PTDUMP=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -3921,8 +3920,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index b00e23319..6f8c127b4 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -225,7 +225,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_PTDUMP is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM_PSCI_CHECKER=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -3901,8 +3900,6 @@ CONFIG_PWM=y
 # CONFIG_PWRSEQ_SIMPLE is not set
 # CONFIG_QCA7000 is not set
 CONFIG_QCOM_ADSP_PIL=m
-# CONFIG_QCOM_CLK_RPM is not set
-# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
diff --git a/kernel.spec b/kernel.spec
index 3490beac8..9a5cd2b43 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2152,6 +2152,9 @@ fi
 #
 #
 %changelog
+* Fri Jan  6 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config updates
+
 * Thu Jan 05 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git3.1
 - Linux v4.10-rc2-183-gc433eb7