Commit 3c86a44d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pmdomain-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm 

Pull pmdomain updates from Ulf Hansson:

 - Move Kconfig files into the pmdomain subsystem

 - Drop use of genpd's redundant ->opp_to_performance_state() callback

 - amlogic:
    - Add support for the T7 power-domains controller
    - Fix mask for the second NNA mem power-domain

 - bcm: Fixup ASB register read and comparison for bcm2835-power

 - imx: Fix device link problem for consumers of the pgc power-domain

 - mediatek: Add support for the MT8365 power domains

 - qcom:
    - Add support for the rpmhpds for SC8380XP power-domains
    - Add support for the rpmhpds for SM8650 power-domains
    - Add support for the rpmhpd clocks for SM7150
    - Add support for the rpmpds for MSM8917 (families) power-domains

 - starfive: Add support for the JH7110 AON PMU

* tag 'pmdomain-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: (56 commits)
  pmdomain: amlogic: Fix mask for the second NNA mem PD domain
  pmdomain: qcom: rpmhpd: Add SC8380XP power domains
  pmdomain: qcom: rpmhpd: Add SM8650 RPMh Power Domains
  dt-bindings: power: rpmpd: Add SC8380XP support
  dt-bindings: power: qcom,rpmhpd: Add GMXC PD index
  dt-bindings: power: qcom,rpmpd: document the SM8650 RPMh Power Domains
  pmdomain: imx: Make imx pgc power domain also set the fwnode
  pmdomain: qcom: rpmpd: Add QM215 power domains
  pmdomain: qcom: rpmpd: Add MSM8917 power domains
  dt-bindings: power: rpmpd: Add MSM8917, MSM8937 and QM215
  pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable
  pmdomain: qcom: rpmhpd: Drop the ->opp_to_performance_state() callback
  pmdomain: qcom: rpmpd: Drop the ->opp_to_performance_state() callback
  pmdomain: qcom: cpr: Drop the ->opp_to_performance_state() callback
  pmdomain: Use device_get_match_data()
  pmdomain: ti: add missing of_node_put
  pmdomain: mediatek: Add support for MT8365
  pmdomain: mediatek: Add support for MTK_SCPD_STRICT_BUS_PROTECTION cap
  pmdomain: mediatek: Add support for WAY_EN operations
  pmdomain: mediatek: Unify configuration for infracfg and smi
  ...
parents 40aa597c 9e0ccead

Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ maintainers: 
  - Jianxin Pan <jianxin.pan@amlogic.com>



description: |+

  Secure Power Domains used in Meson A1/C1/S4 & C3 SoCs, and should be the child node

  Secure Power Domains used in Meson A1/C1/S4 & C3/T7 SoCs, and should be the child node

  of secure-monitor.



properties:
@@ -21,6 +21,7 @@ properties: 
      - amlogic,meson-a1-pwrc

      - amlogic,meson-s4-pwrc

      - amlogic,c3-pwrc

      - amlogic,t7-pwrc



  "#power-domain-cells":

    const: 1

Documentation/devicetree/bindings/power/mediatek,power-controller.yaml

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ properties: 
      - mediatek,mt8188-power-controller

      - mediatek,mt8192-power-controller

      - mediatek,mt8195-power-controller

      - mediatek,mt8365-power-controller



  '#power-domain-cells':

    const: 1
@@ -88,6 +89,7 @@ $defs: 
              "include/dt-bindings/power/mediatek,mt8188-power.h" - for MT8188 type power domain.

              "include/dt-bindings/power/mt8192-power.h" - for MT8192 type power domain.

              "include/dt-bindings/power/mt8195-power.h" - for MT8195 type power domain.

              "include/dt-bindings/power/mediatek,mt8365-power.h" - for MT8365 type power domain.

        maxItems: 1



      clocks:
@@ -115,6 +117,10 @@ $defs: 
        $ref: /schemas/types.yaml#/definitions/phandle

        description: phandle to the device containing the INFRACFG register range.



      mediatek,infracfg-nao:

        $ref: /schemas/types.yaml#/definitions/phandle

        description: phandle to the device containing the INFRACFG-NAO register range.



      mediatek,smi:

        $ref: /schemas/types.yaml#/definitions/phandle

        description: phandle to the device containing the SMI register range.

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

+46 −36
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ description: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - qcom,mdm9607-rpmpd

          - qcom,msm8226-rpmpd

          - qcom,msm8909-rpmpd

          - qcom,msm8916-rpmpd

          - qcom,msm8917-rpmpd

          - qcom,msm8939-rpmpd

          - qcom,msm8953-rpmpd

          - qcom,msm8976-rpmpd
@@ -29,14 +31,16 @@ properties: 
          - qcom,qcm2290-rpmpd

          - qcom,qcs404-rpmpd

          - qcom,qdu1000-rpmhpd

          - qcom,qm215-rpmpd

          - qcom,sa8155p-rpmhpd

          - qcom,sa8540p-rpmhpd

          - qcom,sa8775p-rpmhpd

      - qcom,sdm660-rpmpd

          - qcom,sc7180-rpmhpd

          - qcom,sc7280-rpmhpd

          - qcom,sc8180x-rpmhpd

          - qcom,sc8280xp-rpmhpd

          - qcom,sc8380xp-rpmhpd

          - qcom,sdm660-rpmpd

          - qcom,sdm670-rpmhpd

          - qcom,sdm845-rpmhpd

          - qcom,sdx55-rpmhpd
@@ -46,11 +50,17 @@ properties: 
          - qcom,sm6125-rpmpd

          - qcom,sm6350-rpmhpd

          - qcom,sm6375-rpmpd

          - qcom,sm7150-rpmhpd

          - qcom,sm8150-rpmhpd

          - qcom,sm8250-rpmhpd

          - qcom,sm8350-rpmhpd

          - qcom,sm8450-rpmhpd

          - qcom,sm8550-rpmhpd

          - qcom,sm8650-rpmhpd

      - items:

          - enum:

              - qcom,msm8937-rpmpd

          - const: qcom,msm8917-rpmpd



  '#power-domain-cells':

    const: 1

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -1798,7 +1798,7 @@ F: drivers/irqchip/irq-owl-sirq.c 
F:	drivers/mmc/host/owl-mmc.c

F:	drivers/net/ethernet/actions/

F:	drivers/pinctrl/actions/*

F:	drivers/soc/actions/

F:	drivers/pmdomain/actions/

F:	include/dt-bindings/power/owl-*

F:	include/dt-bindings/reset/actions,*

F:	include/linux/soc/actions/
@@ -20605,9 +20605,10 @@ F: drivers/usb/cdns3/cdns3-starfive.c 








STARFIVE JH71XX PMU CONTROLLER DRIVER









M:	Walker Chen <walker.chen@starfivetech.com>









M:	Changhuang Liang <changhuang.liang@starfivetech.com>









S:	Supported









F:	Documentation/devicetree/bindings/power/starfive*









F:	drivers/pmdomain/starfive/jh71xx-pmu.c









F:	drivers/pmdomain/starfive/









F:	include/dt-bindings/power/starfive,jh7110-pmu.h

















STARFIVE SOC DRIVERS








@@ -20615,7 +20616,6 @@ M:	Conor Dooley <conor@kernel.org>







S:	Maintained









T:	git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/









F:	Documentation/devicetree/bindings/soc/starfive/









F:	drivers/soc/starfive/

















STARFIVE TRNG DRIVER









M:	Jia Jie Ho <jiajie.ho@starfivetech.com>

























drivers/Kconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -175,6 +175,8 @@ source "drivers/soundwire/Kconfig"

















source "drivers/soc/Kconfig"



















source "drivers/pmdomain/Kconfig"



















source "drivers/devfreq/Kconfig"



















source "drivers/extcon/Kconfig"