Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next

diff --combined MAINTAINERS
index d3964379841be5569de67897b4bae66ee4d139db,cc73f908d5f9f6bff7d6d5262ba5d32bcba2c2a7..e507f1a7116f86d4d599c85ccc7bdd753c06abaf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -676,13 -676,6 +676,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/staging/media/allegro-dvt/
  
 +ALLWINNER CPUFREQ DRIVER
 +M:    Yangtao Li <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt
 +F:    drivers/cpufreq/sun50i-cpufreq-nvmem.c
 +
  ALLWINNER SECURITY SYSTEM
  M:    Corentin Labbe <[email protected]>
  L:    [email protected]
@@@ -13292,8 -13285,8 +13292,8 @@@ QUALCOMM CPUFREQ DRIVER MSM8996/APQ809
  M:    Ilia Lin <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
- F:    drivers/cpufreq/qcom-cpufreq-kryo.c
+ F:    Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
+ F:    drivers/cpufreq/qcom-cpufreq-nvmem.c
  
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>

diff --combined drivers/cpufreq/Kconfig.arm
index 70c2b4bea55c05a5d22f1c33a6dcc20cacd3f2d0,b1aa485a28ddecf501cb1f90358cb4c71c2187b0..a905796f7f856516ea6299b5ff83b098e2f0e015
--- 1/drivers/cpufreq/Kconfig.arm
--- 2/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@@ -19,18 -19,6 +19,18 @@@ config ACPI_CPPC_CPUFRE
  
          If in doubt, say N.
  
 +config ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM
 +      tristate "Allwinner nvmem based SUN50I CPUFreq driver"
 +      depends on ARCH_SUNXI
 +      depends on NVMEM_SUNXI_SID
 +      select PM_OPP
 +      help
 +        This adds the nvmem based CPUFreq driver for Allwinner
 +        h6 SoC.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called sun50i-cpufreq-nvmem.
 +
  config ARM_ARMADA_37XX_CPUFREQ
        tristate "Armada 37xx CPUFreq support"
        depends on ARCH_MVEBU && CPUFREQ_DT
@@@ -132,8 -120,8 +132,8 @@@ config ARM_OMAP2PLUS_CPUFRE
        depends on ARCH_OMAP2PLUS
        default ARCH_OMAP2PLUS
  
- config ARM_QCOM_CPUFREQ_KRYO
-       tristate "Qualcomm Kryo based CPUFreq"
+ config ARM_QCOM_CPUFREQ_NVMEM
+       tristate "Qualcomm nvmem based CPUFreq"
        depends on ARM64
        depends on QCOM_QFPROM
        depends on QCOM_SMEM

diff --combined drivers/cpufreq/Makefile
index 7f2d2e1079d40650d414c888e0ff304bc7619a35,8572a918aa755bf391977e2d8c1c437a618f9a21..9a9f5ccd13d981ed5ad1a69d58b9509d00c0184a
--- 1/drivers/cpufreq/Makefile
--- 2/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@@ -64,7 -64,7 +64,7 @@@ obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ)   += 
  obj-$(CONFIG_ARM_PXA2xx_CPUFREQ)      += pxa2xx-cpufreq.o
  obj-$(CONFIG_PXA3xx)                  += pxa3xx-cpufreq.o
  obj-$(CONFIG_ARM_QCOM_CPUFREQ_HW)     += qcom-cpufreq-hw.o
- obj-$(CONFIG_ARM_QCOM_CPUFREQ_KRYO)   += qcom-cpufreq-kryo.o
+ obj-$(CONFIG_ARM_QCOM_CPUFREQ_NVMEM)  += qcom-cpufreq-nvmem.o
  obj-$(CONFIG_ARM_RASPBERRYPI_CPUFREQ)         += raspberrypi-cpufreq.o
  obj-$(CONFIG_ARM_S3C2410_CPUFREQ)     += s3c2410-cpufreq.o
  obj-$(CONFIG_ARM_S3C2412_CPUFREQ)     += s3c2412-cpufreq.o
@@@ -80,7 -80,6 +80,7 @@@ obj-$(CONFIG_ARM_SCMI_CPUFREQ)                += scmi
  obj-$(CONFIG_ARM_SCPI_CPUFREQ)                += scpi-cpufreq.o
  obj-$(CONFIG_ARM_SPEAR_CPUFREQ)               += spear-cpufreq.o
  obj-$(CONFIG_ARM_STI_CPUFREQ)         += sti-cpufreq.o
 +obj-$(CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM) += sun50i-cpufreq-nvmem.o
  obj-$(CONFIG_ARM_TANGO_CPUFREQ)               += tango-cpufreq.o
  obj-$(CONFIG_ARM_TEGRA20_CPUFREQ)     += tegra20-cpufreq.o
  obj-$(CONFIG_ARM_TEGRA124_CPUFREQ)    += tegra124-cpufreq.o

diff --combined drivers/cpufreq/cpufreq-dt-platdev.c
index d51bfef286e3b5d66d7ee02fdd2cb74b46892fd4,ec6ef996e6378d593cac55f28dba144e914ff4a8..bca8d1f47fd2c0dd8fd496604466a58dd34e2492
--- 1/drivers/cpufreq/cpufreq-dt-platdev.c
--- 2/drivers/cpufreq/cpufreq-dt-platdev.c
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
@@@ -101,15 -101,12 +101,15 @@@ static const struct of_device_id whitel
   * platforms using "operating-points-v2" property.
   */
  static const struct of_device_id blacklist[] __initconst = {
 +      { .compatible = "allwinner,sun50i-h6", },
 +
        { .compatible = "calxeda,highbank", },
        { .compatible = "calxeda,ecx-2000", },
  
        { .compatible = "fsl,imx7d", },
        { .compatible = "fsl,imx8mq", },
        { .compatible = "fsl,imx8mm", },
 +      { .compatible = "fsl,imx8mn", },
  
        { .compatible = "marvell,armadaxp", },
  
@@@ -120,13 -117,13 +120,14 @@@
        { .compatible = "mediatek,mt817x", },
        { .compatible = "mediatek,mt8173", },
        { .compatible = "mediatek,mt8176", },
 +      { .compatible = "mediatek,mt8183", },
  
        { .compatible = "nvidia,tegra124", },
        { .compatible = "nvidia,tegra210", },
  
        { .compatible = "qcom,apq8096", },
        { .compatible = "qcom,msm8996", },
+       { .compatible = "qcom,qcs404", },
  
        { .compatible = "st,stih407", },
        { .compatible = "st,stih410", },