Unverified Commit c3fe295c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.1-rockchip-drivers1' of... 

Merge tag 'v6.1-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/drivers

Powerdomain drivers for rv1126 and rk3588 socs, keep current state of
power-domains instead of always enabling when adding them, add rv1126
io domains and add binding for another "general register files" syscon.

* tag 'v6.1-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  soc: rockchip: power-domain: add power domain support for rk3588
  soc: rockchip: power-domain: do not enable domain when adding it
  dt-bindings: power: rockchip: Add bindings for rk3588
  dt-bindings: arm: rockchip: add rk5388 compatible string to pmu.yaml
  dt-bindings: power: add power-domain header for rk3588
  soc: rockchip: io-domain: Add RV1126 IO domains
  dt-bindings: power: rockchip: Document RV1126 PMU IO domains
  soc: rockchip: power-domain: Add RV1126 power domains
  dt-bindings: power: rockchip: Document RV1126 power-controller
  dt-bindings: power: Add power-domain header for RV1126
  dt-bindings: soc: grf: add pcie30-{phy,pipe}-grf

Link: https://lore.kernel.org/r/2252399.ElGaqSPkdT@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c457d9a5 6541b424

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ select: 
          - rockchip,rk3368-pmu

          - rockchip,rk3399-pmu

          - rockchip,rk3568-pmu

          - rockchip,rk3588-pmu



  required:

    - compatible
@@ -39,6 +40,7 @@ properties: 
          - rockchip,rk3368-pmu

          - rockchip,rk3399-pmu

          - rockchip,rk3568-pmu

          - rockchip,rk3588-pmu

      - const: syscon

      - const: simple-mfd

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

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ properties: 
      - rockchip,rk3368-power-controller

      - rockchip,rk3399-power-controller

      - rockchip,rk3568-power-controller

      - rockchip,rk3588-power-controller

      - rockchip,rv1126-power-controller



  "#power-domain-cells":

    const: 1
@@ -119,6 +121,8 @@ $defs: 
          "include/dt-bindings/power/rk3368-power.h"

          "include/dt-bindings/power/rk3399-power.h"

          "include/dt-bindings/power/rk3568-power.h"

          "include/dt-bindings/power/rk3588-power.h"

          "include/dt-bindings/power/rockchip,rv1126-power.h"



      clocks:

        minItems: 1

Documentation/devicetree/bindings/power/rockchip-io-domain.yaml

+30 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ properties: 
      - rockchip,rk3568-pmu-io-voltage-domain

      - rockchip,rv1108-io-voltage-domain

      - rockchip,rv1108-pmu-io-voltage-domain

      - rockchip,rv1126-pmu-io-voltage-domain



required:

  - compatible
@@ -78,6 +79,7 @@ allOf: 
  - $ref: "#/$defs/rk3568-pmu"

  - $ref: "#/$defs/rv1108"

  - $ref: "#/$defs/rv1108-pmu"

  - $ref: "#/$defs/rv1126-pmu"



$defs:

  px30:
@@ -344,6 +346,34 @@ $defs: 
        pmu-supply:

          description: The supply connected to PMUIO_VDD.



  rv1126-pmu:

    if:

      properties:

        compatible:

          contains:

            const: rockchip,rv1126-pmu-io-voltage-domain



    then:

      properties:

        vccio1-supply:

          description: The supply connected to VCCIO1.

        vccio2-supply:

          description: The supply connected to VCCIO2.

        vccio3-supply:

          description: The supply connected to VCCIO3.

        vccio4-supply:

          description: The supply connected to VCCIO4.

        vccio5-supply:

          description: The supply connected to VCCIO5.

        vccio6-supply:

          description: The supply connected to VCCIO6.

        vccio7-supply:

          description: The supply connected to VCCIO7.

        pmuio0-supply:

          description: The supply connected to PMUIO0.

        pmuio1-supply:

          description: The supply connected to PMUIO1.



examples:

  - |

    io-domains {

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

+3 −0
Original line number Diff line number Diff line
@@ -16,9 +16,12 @@ properties: 
          - enum:

              - rockchip,rk3288-sgrf

              - rockchip,rk3566-pipe-grf

              - rockchip,rk3568-pcie3-phy-grf

              - rockchip,rk3568-pipe-grf

              - rockchip,rk3568-pipe-phy-grf

              - rockchip,rk3568-usb2phy-grf

              - rockchip,rk3588-pcie3-phy-grf

              - rockchip,rk3588-pcie3-pipe-grf

              - rockchip,rv1108-usbgrf

          - const: syscon

      - items:

drivers/soc/rockchip/io-domain.c

+20 −0
Original line number Diff line number Diff line
@@ -491,6 +491,22 @@ static const struct rockchip_iodomain_soc_data soc_data_rv1108_pmu = { 
	},

};



static const struct rockchip_iodomain_soc_data soc_data_rv1126_pmu = {

	.grf_offset = 0x140,

	.supply_names = {

		NULL,

		"vccio1",

		"vccio2",

		"vccio3",

		"vccio4",

		"vccio5",

		"vccio6",

		"vccio7",

		"pmuio0",

		"pmuio1",

	},

};



static const struct of_device_id rockchip_iodomain_match[] = {

	{

		.compatible = "rockchip,px30-io-voltage-domain",
@@ -544,6 +560,10 @@ static const struct of_device_id rockchip_iodomain_match[] = { 
		.compatible = "rockchip,rv1108-pmu-io-voltage-domain",

		.data = &soc_data_rv1108_pmu

	},

	{

		.compatible = "rockchip,rv1126-pmu-io-voltage-domain",

		.data = &soc_data_rv1126_pmu

	},

	{ /* sentinel */ },

};

MODULE_DEVICE_TABLE(of, rockchip_iodomain_match);