Commit 7c355848 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'cpufreq-arm-updates-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Merge ARM cpufreq updates for 6.7 from Viresh Kumar:

"- Add support for several Qualcomm SoC versions and other similar
   changes (Christian Marangi, Dmitry Baryshkov, Luca Weiss, Neil
   Armstrong, Richard Acayan, Robert Marko, Rohit Agarwal, Stephan
   Gerhold and Varadarajan Narayanan).

 - Cleanups to the tegra cpufreq driver (Sumit Gupta).

 - Use of_property_read_reg() to parse "reg" in pmac32 driver (Rob Herring).

 - Add support for TI's am62p5 Soc (Bryan Brattlof).

 - Make ARM_BRCMSTB_AVS_CPUFREQ depends on !ARM_SCMI_CPUFREQ (Florian
   Fainelli).

 - Update Kconfig to mention i.MX7 as well (Alexander Stein)."

* tag 'cpufreq-arm-updates-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: (25 commits)
  dt-bindings: cpufreq: qcom-hw: document SM8650 CPUFREQ Hardware
  cpufreq: arm: Kconfig: Add i.MX7 to supported SoC for ARM_IMX_CPUFREQ_DT
  cpufreq: qcom-nvmem: add support for IPQ8064
  cpufreq: qcom-nvmem: also accept operating-points-v2-krait-cpu
  cpufreq: qcom-nvmem: drop pvs_ver for format a fuses
  dt-bindings: cpufreq: qcom-cpufreq-nvmem: Document krait-cpu
  cpufreq: qcom-nvmem: add support for IPQ6018
  dt-bindings: cpufreq: qcom-cpufreq-nvmem: document IPQ6018
  cpufreq: qcom-nvmem: Add MSM8909
  cpufreq: qcom-nvmem: Simplify driver data allocation
  dt-bindings: cpufreq: cpufreq-qcom-hw: Add SDX75 compatible
  cpufreq: ARM_BRCMSTB_AVS_CPUFREQ cannot be used with ARM_SCMI_CPUFREQ
  cpufreq: ti-cpufreq: Add opp support for am62p5 SoCs
  cpufreq: dt-platdev: add am62p5 to blocklist
  cpufreq: tegra194: remove redundant AND with cpu_online_mask
  cpufreq: tegra194: use refclk delta based loop instead of udelay
  cpufreq: tegra194: save CPU data to avoid repeated SMP calls
  dt-bindings: cpufreq: cpufreq-qcom-hw: add SDM670 compatible
  dt-bindings: cpufreq: qcom-nvmem: Document MSM8909
  cpufreq: dt: platdev: Add MSM8909 to blocklist
  ...
parents ea167a7f 038ef0d9

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
          - enum:

              - qcom,qcm2290-cpufreq-hw

              - qcom,sc7180-cpufreq-hw

              - qcom,sdm670-cpufreq-hw

              - qcom,sdm845-cpufreq-hw

              - qcom,sm6115-cpufreq-hw

              - qcom,sm6350-cpufreq-hw
@@ -36,11 +37,13 @@ properties: 
              - qcom,sa8775p-cpufreq-epss

              - qcom,sc7280-cpufreq-epss

              - qcom,sc8280xp-cpufreq-epss

              - qcom,sdx75-cpufreq-epss

              - qcom,sm6375-cpufreq-epss

              - qcom,sm8250-cpufreq-epss

              - qcom,sm8350-cpufreq-epss

              - qcom,sm8450-cpufreq-epss

              - qcom,sm8550-cpufreq-epss

              - qcom,sm8650-cpufreq-epss

          - const: qcom,cpufreq-epss



  reg:
@@ -128,6 +131,7 @@ allOf: 
              - qcom,qdu1000-cpufreq-epss

              - qcom,sc7180-cpufreq-hw

              - qcom,sc8280xp-cpufreq-epss

              - qcom,sdm670-cpufreq-hw

              - qcom,sdm845-cpufreq-hw

              - qcom,sm6115-cpufreq-hw

              - qcom,sm6350-cpufreq-hw

Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml

+7 −1
Original line number Diff line number Diff line
@@ -27,8 +27,12 @@ select: 
        enum:

          - qcom,apq8064

          - qcom,apq8096

          - qcom,ipq5332

          - qcom,ipq6018

          - qcom,ipq8064

          - qcom,ipq8074

          - qcom,ipq9574

          - qcom,msm8909

          - qcom,msm8939

          - qcom,msm8960

          - qcom,msm8974
@@ -43,7 +47,9 @@ patternProperties: 
      - if:

          properties:

            compatible:

              const: operating-points-v2-kryo-cpu

              enum:

                - operating-points-v2-krait-cpu

                - operating-points-v2-kryo-cpu

        then:

          $ref: /schemas/opp/opp-v2-kryo-cpu.yaml#

drivers/cpufreq/Kconfig.arm

+3 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ config ARM_VEXPRESS_SPC_CPUFREQ 


config ARM_BRCMSTB_AVS_CPUFREQ

	tristate "Broadcom STB AVS CPUfreq driver"

	depends on ARCH_BRCMSTB || COMPILE_TEST

	depends on (ARCH_BRCMSTB && !ARM_SCMI_CPUFREQ) || COMPILE_TEST

	default y

	help

	  Some Broadcom STB SoCs use a co-processor running proprietary firmware
@@ -124,8 +124,8 @@ config ARM_IMX_CPUFREQ_DT 
	tristate "Freescale i.MX8M cpufreq support"

	depends on ARCH_MXC && CPUFREQ_DT

	help

	  This adds cpufreq driver support for Freescale i.MX8M series SoCs,

	  based on cpufreq-dt.

	  This adds cpufreq driver support for Freescale i.MX7/i.MX8M

	  series SoCs, based on cpufreq-dt.



	  If in doubt, say N.

drivers/cpufreq/cpufreq-dt-platdev.c

+4 −0
Original line number Diff line number Diff line
@@ -142,9 +142,11 @@ static const struct of_device_id blocklist[] __initconst = { 
	{ .compatible = "nvidia,tegra234", },



	{ .compatible = "qcom,apq8096", },

	{ .compatible = "qcom,msm8909", },

	{ .compatible = "qcom,msm8996", },

	{ .compatible = "qcom,msm8998", },

	{ .compatible = "qcom,qcm2290", },

	{ .compatible = "qcom,qcm6490", },

	{ .compatible = "qcom,qcs404", },

	{ .compatible = "qcom,qdu1000", },

	{ .compatible = "qcom,sa8155p" },
@@ -176,7 +178,9 @@ static const struct of_device_id blocklist[] __initconst = { 
	{ .compatible = "ti,omap3", },

	{ .compatible = "ti,am625", },

	{ .compatible = "ti,am62a7", },

	{ .compatible = "ti,am62p5", },



	{ .compatible = "qcom,ipq6018", },

	{ .compatible = "qcom,ipq8064", },

	{ .compatible = "qcom,apq8064", },

	{ .compatible = "qcom,msm8974", },

drivers/cpufreq/pmac32-cpufreq.c

+3 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/device.h>

#include <linux/hardirq.h>

#include <linux/of.h>

#include <linux/of_address.h>



#include <asm/machdep.h>

#include <asm/irq.h>
@@ -378,10 +379,9 @@ static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy) 


static u32 read_gpio(struct device_node *np)

{

	const u32 *reg = of_get_property(np, "reg", NULL);

	u32 offset;

	u64 offset;



	if (reg == NULL)

	if (of_property_read_reg(np, 0, &offset, NULL) < 0)

		return 0;

	/* That works for all keylargos but shall be fixed properly

	 * some day... The problem is that it seems we can't rely
@@ -389,7 +389,6 @@ static u32 read_gpio(struct device_node *np) 
	 * relative to the base of KeyLargo or to the base of the

	 * GPIO space, and the device-tree doesn't help.

	 */

	offset = *reg;

	if (offset < KEYLARGO_GPIO_LEVELS0)

		offset += KEYLARGO_GPIO_LEVELS0;

	return offset;