Add reset support to EN7581 clk driver

Introduce reset capability to EN7581 device-tree clock binding documentation.

Signed-off-by Lorenzo Bianconi <[email protected]>

---
 .../bindings/clock/airoha,en7523-scu.yaml     | 25 ++++++-
 .../dt-bindings/reset/airoha,en7581-reset.h   | 66 +++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 include/dt-bindings/reset/airoha,en7581-reset.h

Introduce reset capability to EN7581 device-tree clock binding documentation.

Signed-off-by Lorenzo Bianconi <[email protected]>

---
  .../bindings/clock/airoha,en7523-scu.yaml     | 25 ++++++-
  .../dt-bindings/reset/airoha,en7581-reset.h   | 66 +++++++++++++++++++
  2 files changed, 90 insertions(+), 1 deletion(-)

create mode 100644 include/dt-bindings/reset/airoha,en7581-reset.h

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +7 -1

index 3f4266637733..84353fd09428 100644
@@ -35,7 +35,7 @@ properties:
 
    reg:
      minItems: 2
-    maxItems: 3
+    maxItems: 4
 
    "#clock-cells":
      description:

@@ -43,6 +43,10 @@ properties:
        clocks.
      const: 1
 
+  '#reset-cells':
+    description: ID of the controller reset line
+    const: 1
+
  required:
    - compatible
    - reg

@@ -60,6 +64,8 @@ allOf:
              - description: scu base address
              - description: misc scu base address
 
+        '#reset-cells': false
+
    - if:
        properties:
          compatible:

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +0 -0

              - description: pb scu base address

Il 13/06/24 14:47, Lorenzo Bianconi ha scritto:

Quoted 40 lines

Introduce reset capability to EN7581 device-tree clock binding documentation.

Signed-off-by Lorenzo Bianconi <[email protected]>

---
  .../bindings/clock/airoha,en7523-scu.yaml     | 25 ++++++-
  .../dt-bindings/reset/airoha,en7581-reset.h   | 66 +++++++++++++++++++
  2 files changed, 90 insertions(+), 1 deletion(-)

create mode 100644 include/dt-bindings/reset/airoha,en7581-reset.h

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +7 -1

index 3f4266637733..84353fd09428 100644
@@ -35,7 +35,7 @@ properties:
    reg:
      minItems: 2
-    maxItems: 3
+    maxItems: 4
    "#clock-cells":
      description:

@@ -43,6 +43,10 @@ properties:
        clocks.
      const: 1
+  '#reset-cells':
+    description: ID of the controller reset line
+    const: 1
+
  required:
    - compatible
    - reg

@@ -60,6 +64,8 @@ allOf:
              - description: scu base address
              - description: misc scu base address
+        '#reset-cells': false
+
    - if:
        properties:
          compatible:

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml allOf: · line 79

Quoted 4 lines

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +1 -0

@@ -70,6 +76,7 @@ allOf:
            items:
              - description: scu base address
              - description: misc scu base address
+            - description: reset base address

Are you sure that the indentation is correct? :-)

After fixing the indentation,

Reviewed-by AngeloGioacchino Del Regno <[email protected]>

Quoted 1 line

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +0 -0

              - description: pb scu base address

Quoted 48 lines

Il 13/06/24 14:47, Lorenzo Bianconi ha scritto:

Quoted 40 lines

Introduce reset capability to EN7581 device-tree clock binding documentation.

Signed-off-by Lorenzo Bianconi <[email protected]>

---
   .../bindings/clock/airoha,en7523-scu.yaml     | 25 ++++++-
   .../dt-bindings/reset/airoha,en7581-reset.h   | 66 +++++++++++++++++++
   2 files changed, 90 insertions(+), 1 deletion(-)

create mode 100644 include/dt-bindings/reset/airoha,en7581-reset.h

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +7 -1

index 3f4266637733..84353fd09428 100644
@@ -35,7 +35,7 @@ properties:
     reg:
       minItems: 2
-    maxItems: 3
+    maxItems: 4
     "#clock-cells":
       description:

@@ -43,6 +43,10 @@ properties:
         clocks.
       const: 1
+  '#reset-cells':
+    description: ID of the controller reset line
+    const: 1
+
   required:
     - compatible
     - reg

@@ -60,6 +64,8 @@ allOf:
               - description: scu base address
               - description: misc scu base address
+        '#reset-cells': false
+
     - if:
         properties:
           compatible:

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml allOf: · line 79

Quoted 4 lines

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +1 -0

@@ -70,6 +76,7 @@ allOf:
             items:
               - description: scu base address
               - description: misc scu base address
+            - description: reset base address

Are you sure that the indentation is correct? :-)

Quoted 5 lines

After fixing the indentation,

Reviewed-by AngeloGioacchino Del Regno <[email protected]>

Quoted 1 line

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +0 -0

               - description: pb scu base address

The indentation actually looks okay when I apply this locally, but how is it backwards compatible to add this register in the middle of the list??

Il 27/06/24 11:47, Conor Dooley ha scritto:

Quoted 55 lines · AngeloGioacchino Del Regno

Quoted 53 lines

Il 13/06/24 14:47, Lorenzo Bianconi ha scritto:

Quoted 40 lines

Introduce reset capability to EN7581 device-tree clock binding documentation.

Signed-off-by Lorenzo Bianconi <[email protected]>

---
   .../bindings/clock/airoha,en7523-scu.yaml     | 25 ++++++-
   .../dt-bindings/reset/airoha,en7581-reset.h   | 66 +++++++++++++++++++
   2 files changed, 90 insertions(+), 1 deletion(-)

create mode 100644 include/dt-bindings/reset/airoha,en7581-reset.h

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +7 -1

index 3f4266637733..84353fd09428 100644
@@ -35,7 +35,7 @@ properties:
     reg:
       minItems: 2
-    maxItems: 3
+    maxItems: 4
     "#clock-cells":
       description:

@@ -43,6 +43,10 @@ properties:
         clocks.
       const: 1
+  '#reset-cells':
+    description: ID of the controller reset line
+    const: 1
+
   required:
     - compatible
     - reg

@@ -60,6 +64,8 @@ allOf:
               - description: scu base address
               - description: misc scu base address
+        '#reset-cells': false
+
     - if:
         properties:
           compatible:

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml allOf: · line 79

Quoted 4 lines

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +1 -0

@@ -70,6 +76,7 @@ allOf:
             items:
               - description: scu base address
               - description: misc scu base address
+            - description: reset base address

Are you sure that the indentation is correct? :-)

After fixing the indentation,

Reviewed-by AngeloGioacchino Del Regno <[email protected]>

Quoted 1 line

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +0 -0

               - description: pb scu base address

Quoted 2 lines

The indentation actually looks okay when I apply this locally, but how is it backwards compatible to add this register in the middle of the list??

It's not, and this is actually something done on purpose - there is no DT using this binding yet (here, nor uboot), and Lorenzo acknowledged the mistake before it was too late...

At least this time, it wasn't a misattention :-P

Btw, as far as I know, the reset base address is in between misc scu and pb scu, that's why it was put there in the middle.

Quoted 56 lines

Il 27/06/24 11:47, Conor Dooley ha scritto:

Quoted 55 lines · AngeloGioacchino Del Regno

Quoted 53 lines

Il 13/06/24 14:47, Lorenzo Bianconi ha scritto:

Quoted 40 lines

Introduce reset capability to EN7581 device-tree clock binding documentation.

Signed-off-by Lorenzo Bianconi <[email protected]>

---
    .../bindings/clock/airoha,en7523-scu.yaml     | 25 ++++++-
    .../dt-bindings/reset/airoha,en7581-reset.h   | 66 +++++++++++++++++++
    2 files changed, 90 insertions(+), 1 deletion(-)
    create mode 100644 include/dt-bindings/reset/airoha,en7581-reset.h

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +7 -1

index 3f4266637733..84353fd09428 100644
@@ -35,7 +35,7 @@ properties:
      reg:
        minItems: 2
-    maxItems: 3
+    maxItems: 4
      "#clock-cells":
        description:

@@ -43,6 +43,10 @@ properties:
          clocks.
        const: 1
+  '#reset-cells':
+    description: ID of the controller reset line
+    const: 1
+
    required:
      - compatible
      - reg

@@ -60,6 +64,8 @@ allOf:
                - description: scu base address
                - description: misc scu base address
+        '#reset-cells': false
+
      - if:
          properties:
            compatible:

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml allOf: · line 79

Quoted 4 lines

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +1 -0

@@ -70,6 +76,7 @@ allOf:
              items:
                - description: scu base address
                - description: misc scu base address
+            - description: reset base address

Are you sure that the indentation is correct? :-)

After fixing the indentation,

Reviewed-by AngeloGioacchino Del Regno <[email protected]>

Quoted 1 line

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +0 -0

                - description: pb scu base address

Quoted 8 lines

Quoted 2 lines

The indentation actually looks okay when I apply this locally, but how is it backwards compatible to add this register in the middle of the list??

It's not, and this is actually something done on purpose - there is no DT using this binding yet (here, nor uboot), and Lorenzo acknowledged the mistake before it was too late...

At least this time, it wasn't a misattention :-P

The rationale for this being okay really should be in the commit message...

Quoted 2 lines

Btw, as far as I know, the reset base address is in between misc scu and pb scu, that's why it was put there in the middle.

...but I don't really see why this needs to be done incompatibly at all in the first place. Just put it at the end of the list, there's no rule that the order of reg properties needs to match the MMIO addresses.

Il 27/06/24 11:57, Conor Dooley ha scritto:

Quoted 69 lines · AngeloGioacchino Del Regno

Quoted 56 lines

Il 27/06/24 11:47, Conor Dooley ha scritto:

Quoted 55 lines · AngeloGioacchino Del Regno

Quoted 53 lines

Il 13/06/24 14:47, Lorenzo Bianconi ha scritto:

Quoted 40 lines

Introduce reset capability to EN7581 device-tree clock binding documentation.

Signed-off-by Lorenzo Bianconi <[email protected]>

---
    .../bindings/clock/airoha,en7523-scu.yaml     | 25 ++++++-
    .../dt-bindings/reset/airoha,en7581-reset.h   | 66 +++++++++++++++++++
    2 files changed, 90 insertions(+), 1 deletion(-)
    create mode 100644 include/dt-bindings/reset/airoha,en7581-reset.h

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +7 -1

index 3f4266637733..84353fd09428 100644
@@ -35,7 +35,7 @@ properties:
      reg:
        minItems: 2
-    maxItems: 3
+    maxItems: 4
      "#clock-cells":
        description:

@@ -43,6 +43,10 @@ properties:
          clocks.
        const: 1
+  '#reset-cells':
+    description: ID of the controller reset line
+    const: 1
+
    required:
      - compatible
      - reg

@@ -60,6 +64,8 @@ allOf:
                - description: scu base address
                - description: misc scu base address
+        '#reset-cells': false
+
      - if:
          properties:
            compatible:

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml allOf: · line 79

Quoted 4 lines

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +1 -0

@@ -70,6 +76,7 @@ allOf:
              items:
                - description: scu base address
                - description: misc scu base address
+            - description: reset base address

Are you sure that the indentation is correct? :-)

After fixing the indentation,

Reviewed-by AngeloGioacchino Del Regno <[email protected]>

Quoted 1 line

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +0 -0

                - description: pb scu base address

Quoted 8 lines

Quoted 2 lines

The indentation actually looks okay when I apply this locally, but how is it backwards compatible to add this register in the middle of the list??

It's not, and this is actually something done on purpose - there is no DT using this binding yet (here, nor uboot), and Lorenzo acknowledged the mistake before it was too late...

At least this time, it wasn't a misattention :-P

The rationale for this being okay really should be in the commit message...

Quoted 7 lines

Quoted 2 lines

Btw, as far as I know, the reset base address is in between misc scu and pb scu, that's why it was put there in the middle.

...but I don't really see why this needs to be done incompatibly at all in the first place. Just put it at the end of the list, there's no rule that the order of reg properties needs to match the MMIO addresses.

It's just a perfection thing... but whatever, if that's unacceptable for you, putting it at the end of the list isn't a huge deal anyway.

Your call - it's okay for me either way.

Introduce reset API support to EN7581 clock driver.

Tested-by Zhengping Zhang <[email protected]>

Signed-off-by Lorenzo Bianconi <[email protected]>

---
  drivers/clk/clk-en7523.c | 200 ++++++++++++++++++++++++++++++++++++++-
  1 file changed, 197 insertions(+), 3 deletions(-)

drivers/clk/clk-en7523.c +0 -0

index ccc394692671..00638714fe08 100644

drivers/clk/clk-en7523.c +25 -0

+	u32 val;
+
+	rst_data = container_of(rcdev, struct en_rst_data, rcdev);
+	addr = rst_data->base + rst_data->bank_ofs[id / RST_NR_PER_BANK];
+
+	val = readl(addr);
+	if (assert)
+		val |= BIT(id % RST_NR_PER_BANK);
+	else
+		val &= ~BIT(id % RST_NR_PER_BANK);
+	writel(val, addr);
+
+	return 0;
+}
+
+static int en7523_reset_assert(struct reset_controller_dev *rcdev,
+			       unsigned long id)
+{
+	return en7523_reset_update(rcdev, id, true);
+}
+
+static int en7523_reset_deassert(struct reset_controller_dev *rcdev,
+				 unsigned long id)
+{
+	return en7523_reset_update(rcdev, id, false);

drivers/clk/clk-en7523.c +46 -0

+	if (reset_spec->args[0] >= rcdev->nr_resets)
+		return -EINVAL;
+
+	return rst_data->idx_map[reset_spec->args[0]];
+}
+
+static const struct reset_control_ops en7523_reset_ops = {
+	.assert = en7523_reset_assert,
+	.deassert = en7523_reset_deassert,
+	.status = en7523_reset_status,
+};
+
+static int en7523_reset_register(struct platform_device *pdev,
+				 const struct en_clk_soc_data *soc_data)
+{
+	struct device *dev = &pdev->dev;
+	struct en_rst_data *rst_data;
+	void __iomem *base;
+
+	/* no reset lines available */
+	if (!soc_data->reset.idx_map_nr)
+		return 0;
+
+	base = devm_platform_ioremap_resource(pdev, 2);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
+
+	rst_data = devm_kzalloc(dev, sizeof(*rst_data), GFP_KERNEL);
+	if (!rst_data)
+		return -ENOMEM;
+
+	rst_data->bank_ofs = soc_data->reset.bank_ofs;
+	rst_data->idx_map = soc_data->reset.idx_map;
+	rst_data->base = base;
+
+	rst_data->rcdev.nr_resets = soc_data->reset.idx_map_nr;
+	rst_data->rcdev.of_xlate = en7523_reset_xlate;
+	rst_data->rcdev.ops = &en7523_reset_ops;
+	rst_data->rcdev.of_node = dev->of_node;
+	rst_data->rcdev.of_reset_n_cells = 1;
+	rst_data->rcdev.owner = THIS_MODULE;
+	rst_data->rcdev.dev = dev;
+
+	return devm_reset_controller_register(dev, &rst_data->rcdev);
+}
+
  static int en7523_clk_probe(struct platform_device *pdev)
  {
  	struct device_node *node = pdev->dev.of_node;

PCIE reset open drain configuration will be managed by pinctrl driver.

Signed-off-by Lorenzo Bianconi <[email protected]>