Commit 418da6ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pmdomain updates from Ulf Hansson:
 "pmdomain core:
   - Add residency reflection for domain-idlestates to debugfs
   - Add genpd helper to correct the usage/rejected counters

  pmdomain providers:
   - mediatek: Add support for Dimensity 1200 MT6893
   - qcom: Add support for SM4450 power domains
   - rockchip: Add support for RK3562 SoC
   - sunxi: Add support for Allwinner H6/H616 PRCM PPU
   - ti: Fix STANDBY handling of OMAP2+ PER power domain

  cpuidle-psci:
   - Correct the domain-idlestate statistics in debugfs"

* tag 'pmdomain-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: (23 commits)
  pmdomain: ti: Fix STANDBY handling of PER power domain
  pmdomain: amlogic: Constify some structures
  pmdomain: core: Use genpd->opp_table to simplify error/remove path
  pmdomain: core: Simplify return statement in genpd_power_off()
  pmdomain: core: Convert genpd_power_off() to void
  pmdomain: core: Convert to device_awake_path()
  pmdomain: mediatek: Add error messages for missing regmaps
  pmdomain: arm: Do not enable by default during compile testing
  pmdomain: qcom: rpmhpd: Add SM4450 power domains
  dt-bindings: power: qcom,rpmpd: Add SM4450 compatible
  pmdomain: sunxi: add H6 PRCM PPU driver
  dt-bindings: power: Add Allwinner H6/H616 PRCM PPU
  pmdomain: bcm: bcm2835-power: Use devm_clk_get_optional
  pmdomain: rockchip: Add support for RK3562 SoC
  dt-bindings: power: rockchip: Add support for RK3562 SoC
  pmdomain: mediatek: Add support for Dimensity 1200 MT6893
  pmdomain: mediatek: Bump maximum bus protect data array elements
  dt-bindings: power: mediatek: Support Dimensity 1200 MT6893 MTCMOS
  pmdomain: core: Reset genpd->states to avoid freeing invalid data
  pmdomain: core: Add residency reflection for domain-idlestates to debugfs
  ...
parents c7c18635 36795548

Documentation/devicetree/bindings/power/allwinner,sun50i-h6-prcm-ppu.yaml

0 → 100644
+42 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/power/allwinner,sun50i-h6-prcm-ppu.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Allwinner SoCs PRCM power domain controller



maintainers:

  - Andre Przywara <andre.przywara@arm.com>



description:

  The Allwinner Power Reset Clock Management (PRCM) unit contains bits to

  control a few power domains.



properties:

  compatible:

    enum:

      - allwinner,sun50i-h6-prcm-ppu

      - allwinner,sun50i-h616-prcm-ppu

      - allwinner,sun55i-a523-prcm-ppu



  reg:

    maxItems: 1



  '#power-domain-cells':

    const: 1



required:

  - compatible

  - reg

  - '#power-domain-cells'



additionalProperties: false



examples:

  - |

    prcm_ppu: power-controller@7010210 {

        compatible = "allwinner,sun50i-h616-prcm-ppu";

        reg = <0x7010210 0x10>;

        #power-domain-cells = <1>;

    };

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
    enum:

      - mediatek,mt6735-power-controller

      - mediatek,mt6795-power-controller

      - mediatek,mt6893-power-controller

      - mediatek,mt8167-power-controller

      - mediatek,mt8173-power-controller

      - mediatek,mt8183-power-controller
@@ -88,6 +89,7 @@ $defs: 
        description: |

          Power domain index. Valid values are defined in:

              "include/dt-bindings/power/mt6795-power.h" - for MT8167 type power domain.

              "include/dt-bindings/power/mediatek,mt6893-power.h" - for MT6893 type power domain.

              "include/dt-bindings/power/mt8167-power.h" - for MT8167 type power domain.

              "include/dt-bindings/power/mt8173-power.h" - for MT8173 type power domain.

              "include/dt-bindings/power/mt8183-power.h" - for MT8183 type power domain.

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

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ properties: 
          - qcom,sdx55-rpmhpd

          - qcom,sdx65-rpmhpd

          - qcom,sdx75-rpmhpd

          - qcom,sm4450-rpmhpd

          - qcom,sm6115-rpmpd

          - qcom,sm6125-rpmpd

          - qcom,sm6350-rpmhpd

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

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ properties: 
      - rockchip,rk3366-power-controller

      - rockchip,rk3368-power-controller

      - rockchip,rk3399-power-controller

      - rockchip,rk3562-power-controller

      - rockchip,rk3568-power-controller

      - rockchip,rk3576-power-controller

      - rockchip,rk3588-power-controller

drivers/cpuidle/cpuidle-psci-domain.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static int psci_pd_power_off(struct generic_pm_domain *pd) 


	/* OSI mode is enabled, set the corresponding domain state. */

	pd_state = state->data;

	psci_set_domain_state(*pd_state);

	psci_set_domain_state(pd, pd->state_idx, *pd_state);



	return 0;

}