Commit e93bcbaa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pmdomain updates from Ulf Hansson:

 - amlogic: Add support for S6/S7/S7D power-domains controller

 - imx: Add support for i.MX91 power-domains

 - marvell: Add support for PXA1908 power-domains

 - mediatek:
    - Add support for modem power sequence
    - Add support for RTFF Hardware in MT8196/MT6991

 - qcom: Align power-domain definitions for rpmpd

 - rockchip: Default to use power-domain support

 - thead: Create auxiliary device along with a corresponding reset
   driver

 - ti: Synchronize on/off state with HW-state for ti-sci power-domains

* tag 'pmdomain-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: (25 commits)
  pmdomain: thead: Fix error pointer vs NULL bug in th1520_pd_reboot_init()
  pmdomain: thead: create auxiliary device for rebooting
  driver: reset: th1520-aon: add driver for poweroff/reboot via AON FW
  pmdomain: mediatek: airoha: convert from round_rate() to determine_rate()
  pmdomain: rockchip: enable ROCKCHIP_PM_DOMAINS with ARCH_ROCKCHIP
  pmdomain: marvell: Add PXA1908 power domains
  dt-bindings: clock: marvell,pxa1908: Add syscon compatible to apmu
  pmdomain: ti-sci: Set PD on/off state according to the HW state
  pmdomain: amlogic: Add support for S6 S7 S7D power domains controller
  dt-bindings: power: add Amlogic S6 S7 S7D power domains
  pmdomain: mediatek: Convert all SoCs to new style regmap retrieval
  pmdomain: mediatek: Add support for RTFF Hardware in MT8196/MT6991
  pmdomain: mediatek: Add support for modem power sequences
  pmdomain: mediatek: Move ctl sequences out of power_on/off functions
  pmdomain: mediatek: Handle SoCs with inverted SRAM power-down bits
  pmdomain: mediatek: Refactor bus protection regmaps retrieval
  dt-bindings: power: mediatek: Document access-controllers property
  pmdomain: remove unneeded 'fast_io' parameter in regmap_config
  pmdomain: imx93-blk-ctrl: mask DSI and PXP PD domain register on i.MX91
  pmdomain: imx93-blk-ctrl: use ARRAY_SIZE() instead of hardcode number
  ...
parents ea1c6c59 bbc31108

Documentation/devicetree/bindings/clock/marvell,pxa1908.yaml

+24 −6
Original line number Diff line number Diff line
@@ -19,11 +19,14 @@ description: | 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - marvell,pxa1908-apbc

          - marvell,pxa1908-apbcp

          - marvell,pxa1908-mpmu

      - marvell,pxa1908-apmu

      - items:

          - const: marvell,pxa1908-apmu

          - const: syscon



  reg:

    maxItems: 1
@@ -31,6 +34,9 @@ properties: 
  '#clock-cells':

    const: 1



  '#power-domain-cells':

    const: 1



required:

  - compatible

  - reg
@@ -38,11 +44,23 @@ required: 


additionalProperties: false



if:

  not:

    properties:

      compatible:

        contains:

          const: marvell,pxa1908-apmu



then:

  properties:

    '#power-domain-cells': false



examples:

  # APMU block:

  - |

    clock-controller@d4282800 {

      compatible = "marvell,pxa1908-apmu";

      compatible = "marvell,pxa1908-apmu", "syscon";

      reg = <0xd4282800 0x400>;

      #clock-cells = <1>;

      #power-domain-cells = <1>;

    };

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

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ properties: 
      - amlogic,a5-pwrc

      - amlogic,c3-pwrc

      - amlogic,t7-pwrc

      - amlogic,s6-pwrc

      - amlogic,s7-pwrc

      - amlogic,s7d-pwrc



  "#power-domain-cells":

    const: 1

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

+37 −0
Original line number Diff line number Diff line
@@ -44,6 +44,15 @@ properties: 
  '#size-cells':

    const: 0



  access-controllers:

    description:

      A number of phandles to external blocks to set and clear the required

      bits to enable or disable bus protection, necessary to avoid any bus

      faults while enabling or disabling a power domain.

      For example, this may hold phandles to INFRACFG and SMI.

    minItems: 1

    maxItems: 3



patternProperties:

  "^power-domain@[0-9a-f]+$":

    $ref: "#/$defs/power-domain-node"
@@ -123,14 +132,17 @@ $defs: 
      mediatek,infracfg:

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

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

        deprecated: true



      mediatek,infracfg-nao:

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

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

        deprecated: true



      mediatek,smi:

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

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

        deprecated: true



    required:

      - reg
@@ -138,6 +150,31 @@ $defs: 
required:

  - compatible



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - mediatek,mt8183-power-controller

    then:

      properties:

        access-controllers:

          minItems: 2

          maxItems: 2



  - if:

      properties:

        compatible:

          contains:

            enum:

              - mediatek,mt8365-power-controller

    then:

      properties:

        access-controllers:

          minItems: 3

          maxItems: 3



additionalProperties: false



examples:

Documentation/devicetree/bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml

+47 −12
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ description: 
properties:

  compatible:

    items:

      - const: fsl,imx93-media-blk-ctrl

      - enum:

          - fsl,imx91-media-blk-ctrl

          - fsl,imx93-media-blk-ctrl

      - const: syscon



  reg:
@@ -31,8 +33,42 @@ properties: 
    maxItems: 1



  clocks:

    minItems: 8

    maxItems: 10



  clock-names:

    minItems: 8

    maxItems: 10



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: fsl,imx91-media-blk-ctrl

    then:

      properties:

        clocks:

          maxItems: 8

        clock-names:

          items:

            - const: apb

            - const: axi

            - const: nic

            - const: disp

            - const: cam

            - const: lcdif

            - const: isi

            - const: csi

  - if:

      properties:

        compatible:

          contains:

            const: fsl,imx93-media-blk-ctrl

    then:

      properties:

        clocks:

          minItems: 10

        clock-names:

          items:

            - const: apb
@@ -45,7 +81,6 @@ properties: 
            - const: isi

            - const: csi

            - const: dsi



required:

  - compatible

  - reg

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -2880,7 +2880,9 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm64/boot/dts/marvell/mmp/

F:	drivers/clk/mmp/clk-pxa1908*.c

F:	drivers/pmdomain/marvell/

F:	include/dt-bindings/clock/marvell,pxa1908.h

F:	include/dt-bindings/power/marvell,pxa1908-power.h









ARM/Mediatek RTC DRIVER









M:	Eddie Huang <eddie.huang@mediatek.com>








@@ -21863,6 +21865,7 @@ F:	drivers/mailbox/mailbox-th1520.c







F:	drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c









F:	drivers/pinctrl/pinctrl-th1520.c









F:	drivers/pmdomain/thead/









F:	drivers/power/reset/th1520-aon-reboot.c









F:	drivers/power/sequencing/pwrseq-thead-gpu.c









F:	drivers/reset/reset-th1520.c









F:	include/dt-bindings/clock/thead,th1520-clk-ap.h