From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8564D3E3DA2; Thu, 2 Apr 2026 16:25:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147115; cv=none; b=dPPqwSZTU932q+XWudkhJkJJgwf8YmMvU+Q+892JcK06Dd0qRevzk+taCXubyMXSQl75z89M1uh+hK9GbBoH+gktqMNyJlBamvl7BJAnbzG+2W+rWK6ccg/C77fo2eO5JcIrC3DatRBzy080w0v0B9H7ZgJcDQiprhnom1cxJTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147115; c=relaxed/simple; bh=n+SNg9FDQghXA9npa3lbTdVLsv0iZ8Y4Xx4Nkmo9ejs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HbwHILORusdTiSFHNOU15fqSDV5XI1PT51oOQ1sSe13GSVDp2Z89zBDptYOLG4DAKS5pXru5VjTgyVFfgoYXsmSttWT9/mTer3/xt3hAwOLSJiAyNwBMPBwnJ+dlLnsTVjVqi+T01pSJ6X7R9V3aEdKAw/3kPlE3hZXs66HdfjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: Kv0u18waTEuczUj7P2e8cg== X-CSE-MsgGUID: SLOOaCGtQrmIj/X6kyIg4A== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Apr 2026 01:25:12 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 86A924018E95; Fri, 3 Apr 2026 01:25:07 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 01/14] ASoC: dt-bindings: renesas,rsnd: Split into generic and SoC-specific parts Date: Thu, 2 Apr 2026 18:24:23 +0200 Message-ID: <20260402162436.12059-2-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The current renesas,rsnd.yaml binding file handles all supported SoCs in a single schema, resulting in deeply nested if/else/then constructs that become increasingly difficult to maintain. Each new SoC addition amplifies this complexity, making reviews harder and diffs noisier than they need to be. Refactor the binding by extracting the common properties shared across all SoCs into a dedicated renesas,rsnd-common.yaml schema, and keeping only SoC-specific constraints (required nodes, port counts, clock names, etc.) in per-SoC or per-family files that $ref the common part. This prepares the ground for upcoming SoCs such as the RZ/G3E, which introduces a different set of audio resources compared to existing R-Car Gen variants. With the split in place, adding RZ/G3E support becomes a self-contained change that neither bloats a monolithic schema nor buries new constraints inside ever-deeper conditional blocks. No functional change in validation behaviour for existing device trees. Signed-off-by: John Madieu --- Changes: v3: No changes v2: New patch .../bindings/sound/renesas,rsnd-common.yaml | 196 +++++++++++ .../bindings/sound/renesas,rsnd.yaml | 319 +++++------------- 2 files changed, 274 insertions(+), 241 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/renesas,rsnd-co= mmon.yaml diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd-common.ya= ml b/Documentation/devicetree/bindings/sound/renesas,rsnd-common.yaml new file mode 100644 index 000000000000..ec6bf644d1a4 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd-common.yaml @@ -0,0 +1,196 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/renesas,rsnd-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Renesas R-Car/RZ Sound Common Properties + +maintainers: + - Kuninori Morimoto + +description: + Common property and subnode definitions shared by Renesas R-Car and RZ + sound controller bindings. + +select: false + +properties: + compatible: true + + reg: true + + reg-names: true + + "#sound-dai-cells": + description: + Must be 0 for a single-DAI system and 1 for a multi-DAI system. + enum: [0, 1] + + "#clock-cells": + description: + Must be 0 when the system has audio_clkout and 1 when it has + audio_clkout0/1/2/3. + enum: [0, 1] + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + clock-frequency: + description: Audio clock output frequency for audio_clkout0/1/2/3. + + clkout-lr-asynchronous: + description: audio_clkoutn is asynchronous with lr-clock. + $ref: /schemas/types.yaml#/definitions/flag + + power-domains: true + + resets: true + + reset-names: true + + clocks: true + + clock-names: true + + port: + $ref: audio-graph-port.yaml#/definitions/port-base + unevaluatedProperties: false + patternProperties: + "^endpoint(@[0-9a-f]+)?$": + $ref: audio-graph-port.yaml#/definitions/endpoint-base + properties: + playback: + $ref: /schemas/types.yaml#/definitions/phandle-array + capture: + $ref: /schemas/types.yaml#/definitions/phandle-array + unevaluatedProperties: false + + rcar_sound,dvc: + description: DVC subnode. + type: object + patternProperties: + "^dvc-[0-1]$": + type: object + additionalProperties: false + properties: + dmas: true + dma-names: true + required: + - dmas + - dma-names + additionalProperties: false + + rcar_sound,mix: + description: MIX subnode. + type: object + patternProperties: + "^mix-[0-1]$": + type: object + additionalProperties: false + additionalProperties: false + + rcar_sound,ctu: + description: CTU subnode. + type: object + patternProperties: + "^ctu-[0-7]$": + type: object + additionalProperties: false + additionalProperties: false + + rcar_sound,src: + description: SRC subnode. + type: object + patternProperties: + "^src-[0-9]$": + type: object + additionalProperties: false + properties: + interrupts: + maxItems: 1 + dmas: true + dma-names: true + additionalProperties: false + + rcar_sound,ssiu: + description: SSIU subnode. + type: object + patternProperties: + "^ssiu-[0-9]+$": + type: object + additionalProperties: false + properties: + dmas: true + dma-names: true + required: + - dmas + - dma-names + additionalProperties: false + + rcar_sound,ssi: + description: SSI subnode. + type: object + patternProperties: + "^ssi-[0-9]$": + type: object + additionalProperties: false + properties: + interrupts: + maxItems: 1 + dmas: true + dma-names: true + shared-pin: + description: Shared clock pin. + $ref: /schemas/types.yaml#/definitions/flag + pio-transfer: + description: PIO transfer mode. + $ref: /schemas/types.yaml#/definitions/flag + no-busif: + description: BUSIF is not used for the mem-to-SSI via DMA case. + $ref: /schemas/types.yaml#/definitions/flag + required: + - interrupts + additionalProperties: false + +patternProperties: + 'rcar_sound,dai(@[0-9a-f]+)?$': + description: DAI subnode. + type: object + patternProperties: + "^dai([0-9]+)?$": + type: object + additionalProperties: false + properties: + playback: + $ref: /schemas/types.yaml#/definitions/phandle-array + capture: + $ref: /schemas/types.yaml#/definitions/phandle-array + anyOf: + - required: + - playback + - required: + - capture + additionalProperties: false + + 'ports(@[0-9a-f]+)?$': + $ref: audio-graph-port.yaml#/definitions/port-base + unevaluatedProperties: false + patternProperties: + '^port(@[0-9a-f]+)?$': + $ref: "#/properties/port" + +required: + - compatible + - reg + - reg-names + - clocks + - clock-names + +allOf: + - $ref: dai-common.yaml# + +additionalProperties: true diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Do= cumentation/devicetree/bindings/sound/renesas,rsnd.yaml index e8a2acb92646..0d989922a5b4 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml @@ -9,8 +9,11 @@ title: Renesas R-Car Sound Driver maintainers: - Kuninori Morimoto =20 -properties: +description: + Binding for Renesas R-Car Gen1/Gen2/Gen3/Gen4 and RZ/G1/G2 sound + controllers using the standard RSND layout. =20 +properties: compatible: oneOf: # for Gen1 SoC @@ -67,34 +70,6 @@ properties: minItems: 1 maxItems: 5 =20 - "#sound-dai-cells": - description: | - it must be 0 if your system is using single DAI - it must be 1 if your system is using multi DAIs - This is used on simple-audio-card - enum: [0, 1] - - "#clock-cells": - description: | - it must be 0 if your system has audio_clkout - it must be 1 if your system has audio_clkout0/1/2/3 - enum: [0, 1] - - "#address-cells": - const: 1 - - "#size-cells": - const: 0 - - clock-frequency: - description: for audio_clkout0/1/2/3 - - clkout-lr-asynchronous: - description: audio_clkoutn is asynchronizes with lr-clock. - $ref: /schemas/types.yaml#/definitions/flag - - power-domains: true - resets: minItems: 1 maxItems: 11 @@ -109,181 +84,45 @@ properties: maxItems: 31 =20 clock-names: - description: List of necessary clock names. - # details are defined below - - # ports is below - port: - $ref: audio-graph-port.yaml#/definitions/port-base - unevaluatedProperties: false - patternProperties: - "^endpoint(@[0-9a-f]+)?": - $ref: audio-graph-port.yaml#/definitions/endpoint-base - properties: - playback: - $ref: /schemas/types.yaml#/definitions/phandle-array - capture: - $ref: /schemas/types.yaml#/definitions/phandle-array - unevaluatedProperties: false - - rcar_sound,dvc: - description: DVC subnode. - type: object - patternProperties: - "^dvc-[0-1]$": - type: object - additionalProperties: false - - properties: - dmas: - maxItems: 1 - dma-names: - const: tx - required: - - dmas - - dma-names - additionalProperties: false - - rcar_sound,mix: - description: MIX subnode. - type: object - patternProperties: - "^mix-[0-1]$": - type: object - additionalProperties: false - additionalProperties: false - - rcar_sound,ctu: - description: CTU subnode. - type: object - patternProperties: - "^ctu-[0-7]$": - type: object - additionalProperties: false - additionalProperties: false - - rcar_sound,src: - description: SRC subnode. - type: object - patternProperties: - "^src-[0-9]$": - type: object - additionalProperties: false - - properties: - interrupts: - maxItems: 1 - dmas: - maxItems: 2 - dma-names: - allOf: - - items: - enum: - - tx - - rx - additionalProperties: false - - rcar_sound,ssiu: - description: SSIU subnode. - type: object - patternProperties: - "^ssiu-[0-9]+$": - type: object - additionalProperties: false - - properties: - dmas: - maxItems: 2 - dma-names: - allOf: - - items: - enum: - - tx - - rx - required: - - dmas - - dma-names - additionalProperties: false - - rcar_sound,ssi: - description: SSI subnode. - type: object - patternProperties: - "^ssi-[0-9]$": - type: object - additionalProperties: false - - properties: - interrupts: - maxItems: 1 - dmas: - minItems: 2 - maxItems: 4 - dma-names: - allOf: - - items: - enum: - - tx - - rx - - txu # if no ssiu node - - rxu # if no ssiu node - - shared-pin: - description: shared clock pin - $ref: /schemas/types.yaml#/definitions/flag - pio-transfer: - description: PIO transfer mode - $ref: /schemas/types.yaml#/definitions/flag - no-busif: - description: BUSIF is not used when [mem -> SSI] via DMA case - $ref: /schemas/types.yaml#/definitions/flag - required: - - interrupts - additionalProperties: false + description: List of clock names. + minItems: 1 + maxItems: 31 + + "#sound-dai-cells": true + + "#clock-cells": true + + "#address-cells": true + + "#size-cells": true + + clock-frequency: true + + clkout-lr-asynchronous: true + + power-domains: true + + port: true + + rcar_sound,dvc: true + + rcar_sound,mix: true + + rcar_sound,ctu: true + + rcar_sound,src: true + + rcar_sound,ssiu: true + + rcar_sound,ssi: true =20 patternProperties: - # For DAI base - 'rcar_sound,dai(@[0-9a-f]+)?$': - description: DAI subnode. - type: object - patternProperties: - "^dai([0-9]+)?$": - type: object - additionalProperties: false - - properties: - playback: - $ref: /schemas/types.yaml#/definitions/phandle-array - capture: - $ref: /schemas/types.yaml#/definitions/phandle-array - anyOf: - - required: - - playback - - required: - - capture - additionalProperties: false - - 'ports(@[0-9a-f]+)?$': - $ref: audio-graph-port.yaml#/definitions/port-base - unevaluatedProperties: false - patternProperties: - '^port(@[0-9a-f]+)?$': - $ref: "#/properties/port" - -required: - - compatible - - reg - - reg-names - - clocks - - clock-names + 'rcar_sound,dai(@[0-9a-f]+)?$': true + 'ports(@[0-9a-f]+)?$': true =20 allOf: - - $ref: dai-common.yaml# + - $ref: renesas,rsnd-common.yaml# =20 - # -------------------- - # reg/reg-names - # -------------------- - # for Gen1 - if: properties: compatible: @@ -295,11 +134,10 @@ allOf: maxItems: 3 reg-names: items: - enum: - - sru - - ssi - - adg - # for Gen2/Gen3 + - const: sru + - const: ssi + - const: adg + - if: properties: compatible: @@ -310,16 +148,34 @@ allOf: then: properties: reg: - minItems: 5 + maxItems: 5 reg-names: items: - enum: - - scu - - adg - - ssiu - - ssi - - audmapp - # for Gen4 + - const: scu + - const: adg + - const: ssiu + - const: ssi + - const: audmapp + resets: + maxItems: 11 + reset-names: + items: + oneOf: + - const: ssi-all + - pattern: '^ssi\.[0-9]$' + clocks: + maxItems: 31 + clock-names: + items: + oneOf: + - const: ssi-all + - pattern: '^ssi\.[0-9]$' + - pattern: '^src\.[0-9]$' + - pattern: '^mix\.[0-1]$' + - pattern: '^ctu\.[0-1]$' + - pattern: '^dvc\.[0-1]$' + - pattern: '^clk_(a|b|c|i)$' + - if: properties: compatible: @@ -336,38 +192,19 @@ allOf: - ssiu - ssi - sdmc - - # -------------------- - # clock-names - # -------------------- - - if: - properties: - compatible: - contains: - const: renesas,rcar_sound-gen4 - then: - properties: - clock-names: - maxItems: 3 + resets: + maxItems: 2 + reset-names: items: - enum: - - ssi.0 - - ssiu.0 - - clkin - else: - properties: + - const: ssiu.0 + - const: ssi.0 + clocks: + maxItems: 3 clock-names: - minItems: 1 - maxItems: 31 items: - oneOf: - - const: ssi-all - - pattern: '^ssi\.[0-9]$' - - pattern: '^src\.[0-9]$' - - pattern: '^mix\.[0-1]$' - - pattern: '^ctu\.[0-1]$' - - pattern: '^dvc\.[0-1]$' - - pattern: '^clk_(a|b|c|i)$' + - const: ssiu.0 + - const: ssi.0 + - const: clkin =20 unevaluatedProperties: false =20 --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6F2F03F0744; Thu, 2 Apr 2026 16:25:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147121; cv=none; b=QzP08FoCZl36i4Xd1BXecKmIm8NWafUsfYKqhezoN2Oon/KYmD6a4hzRXeK4dbjUSbMeZYhCoXEYcozQfLzfeF06JyIj3/tAy9Lmw9zbAevY0ka5ILQiE8RhYinUnzVTmwgkxBpgYPxbJFlxCOxq18tVULnIi1jZJHoJhU2MPuA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147121; c=relaxed/simple; bh=xNqsk9yPn5OWSbRJzRb3wWZcuYvlScUZcfM9DntjNZQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eiw5SX1aMv3L8iUH4yPg72e4NA+e39kHjVTTqqXVhrljNFyKgmsKBJgUtd7I3ROqBWt8m85EJlcA2QAfIdmevm6P62Qn0r4cX4/tcc39Mixk62Vt6p0JLxLdTCvER5nkPdbKyH1BZe1H+pfQySPB1ZhXX0+/KAYzKPkI15CvfSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: 2mTaNJxAQy6EGvc1Wt6Cfg== X-CSE-MsgGUID: HJd5xDrXSpGD3bqn0oGrOw== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 03 Apr 2026 01:25:18 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 5E9024018E95; Fri, 3 Apr 2026 01:25:13 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 02/14] ASoC: dt-bindings: Add RZ/G3E (R9A09G047) sound binding Date: Thu, 2 Apr 2026 18:24:24 +0200 Message-ID: <20260402162436.12059-3-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The RZ/G3E shares the same audio IP as the R-Car variants but differs in several aspects: it supports up to 5 DMA controllers per audio channel, requires additional clocks (47 total including per-SSI ADG clocks, SCU domain clocks and SSIF supply) and additional reset lines (14 total including SCU, ADG and Audio DMAC peri-peri resets). Add a dedicated devicetree binding for the RZ/G3E sound controller. The binding references the common renesas,rsnd-common.yaml schema for shared property and subnode definitions. Signed-off-by: John Madieu --- Changes: v3: No changes v2: New patch .../sound/renesas,r9a09g047-sound.yaml | 371 ++++++++++++++++++ 1 file changed, 371 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/renesas,r9a09g0= 47-sound.yaml diff --git a/Documentation/devicetree/bindings/sound/renesas,r9a09g047-soun= d.yaml b/Documentation/devicetree/bindings/sound/renesas,r9a09g047-sound.ya= ml new file mode 100644 index 000000000000..1dfe9bab3382 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/renesas,r9a09g047-sound.yaml @@ -0,0 +1,371 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/renesas,r9a09g047-sound.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Renesas RZ/G3E Sound Controller + +maintainers: + - Kuninori Morimoto + - John Madieu + +description: + The RZ/G3E (R9A09G047) integrates an R-Car compatible sound controller + with extended DMA channel support (up to 5 DMACs per direction), additio= nal + clock domains, and additional reset lines compared to the R-Car Gen2/Gen3 + variants. + +allOf: + - $ref: renesas,rsnd-common.yaml# + +properties: + compatible: + const: renesas,r9a09g047-sound + + reg: + maxItems: 5 + + reg-names: + items: + - const: scu + - const: adg + - const: ssiu + - const: ssi + - const: audmapp + + clocks: + maxItems: 47 + + clock-names: + items: + - const: ssi-all + - const: ssi.9 + - const: ssi.8 + - const: ssi.7 + - const: ssi.6 + - const: ssi.5 + - const: ssi.4 + - const: ssi.3 + - const: ssi.2 + - const: ssi.1 + - const: ssi.0 + - const: src.9 + - const: src.8 + - const: src.7 + - const: src.6 + - const: src.5 + - const: src.4 + - const: src.3 + - const: src.2 + - const: src.1 + - const: src.0 + - const: mix.1 + - const: mix.0 + - const: ctu.1 + - const: ctu.0 + - const: dvc.0 + - const: dvc.1 + - const: clk_a + - const: clk_b + - const: clk_c + - const: clk_i + - const: ssif_supply + - const: scu + - const: scu_x2 + - const: scu_supply + - const: adg.ssi.9 + - const: adg.ssi.8 + - const: adg.ssi.7 + - const: adg.ssi.6 + - const: adg.ssi.5 + - const: adg.ssi.4 + - const: adg.ssi.3 + - const: adg.ssi.2 + - const: adg.ssi.1 + - const: adg.ssi.0 + - const: audmapp + - const: adg + + resets: + maxItems: 14 + + reset-names: + items: + - const: ssi-all + - const: ssi.9 + - const: ssi.8 + - const: ssi.7 + - const: ssi.6 + - const: ssi.5 + - const: ssi.4 + - const: ssi.3 + - const: ssi.2 + - const: ssi.1 + - const: ssi.0 + - const: scu + - const: adg + - const: audmapp + + rcar_sound,dvc: + description: DVC subnode. + type: object + patternProperties: + "^dvc-[0-1]$": + type: object + additionalProperties: false + properties: + dmas: + maxItems: 5 + dma-names: + maxItems: 5 + allOf: + - items: + enum: + - tx + required: + - dmas + - dma-names + additionalProperties: false + + rcar_sound,src: + description: SRC subnode. + type: object + patternProperties: + "^src-[0-9]$": + type: object + additionalProperties: false + properties: + interrupts: + maxItems: 1 + dmas: + maxItems: 10 + dma-names: + maxItems: 10 + allOf: + - items: + enum: + - tx + - rx + additionalProperties: false + + rcar_sound,ssiu: + description: SSIU subnode. + type: object + patternProperties: + "^ssiu-[0-9]+$": + type: object + additionalProperties: false + properties: + dmas: + maxItems: 10 + dma-names: + maxItems: 10 + allOf: + - items: + enum: + - tx + - rx + required: + - dmas + - dma-names + additionalProperties: false + +required: + - compatible + - reg + - reg-names + - clocks + - clock-names + - resets + - reset-names + +unevaluatedProperties: false + +examples: + - | + #include + + snd_rzg3e: sound@13c00000 { + #sound-dai-cells =3D <1>; + #clock-cells =3D <0>; + compatible =3D "renesas,r9a09g047-sound"; + reg =3D <0x13c00000 0x10000>, + <0x13c20000 0x10000>, + <0x13c30000 0x1000>, + <0x13c31000 0x1f000>, + <0x13c50000 0x10000>; + reg-names =3D "scu", "adg", "ssiu", "ssi", "audmapp"; + + clocks =3D <&cpg 245>, + <&cpg 394>, <&cpg 393>, + <&cpg 392>, <&cpg 391>, + <&cpg 390>, <&cpg 389>, + <&cpg 388>, <&cpg 387>, + <&cpg 386>, <&cpg 385>, + <&cpg 381>, <&cpg 380>, + <&cpg 379>, <&cpg 378>, + <&cpg 377>, <&cpg 376>, + <&cpg 375>, <&cpg 374>, + <&cpg 373>, <&cpg 372>, + <&cpg 371>, <&cpg 370>, + <&cpg 371>, <&cpg 370>, + <&cpg 368>, <&cpg 369>, + <&audio_clk_a>, <&audio_clk_b>, + <&audio_clk_c>, <&audio_clk_i>, + <&cpg 384>, + <&cpg 246>, <&cpg 247>, + <&cpg 382>, + <&cpg 361>, <&cpg 360>, + <&cpg 359>, <&cpg 358>, + <&cpg 357>, <&cpg 356>, + <&cpg 355>, <&cpg 354>, + <&cpg 353>, <&cpg 352>, + <&cpg 248>, <&cpg 249>; + + clock-names =3D "ssi-all", + "ssi.9", "ssi.8", + "ssi.7", "ssi.6", + "ssi.5", "ssi.4", + "ssi.3", "ssi.2", + "ssi.1", "ssi.0", + "src.9", "src.8", + "src.7", "src.6", + "src.5", "src.4", + "src.3", "src.2", + "src.1", "src.0", + "mix.1", "mix.0", + "ctu.1", "ctu.0", + "dvc.0", "dvc.1", + "clk_a", "clk_b", + "clk_c", "clk_i", + "ssif_supply", + "scu", "scu_x2", + "scu_supply", + "adg.ssi.9", "adg.ssi.8", + "adg.ssi.7", "adg.ssi.6", + "adg.ssi.5", "adg.ssi.4", + "adg.ssi.3", "adg.ssi.2", + "adg.ssi.1", "adg.ssi.0", + "audmapp", "adg"; + + power-domains =3D <&cpg>; + + resets =3D <&cpg 225>, + <&cpg 235>, <&cpg 234>, <&cpg 233>, <&cpg 232>, + <&cpg 231>, <&cpg 230>, <&cpg 229>, <&cpg 228>, + <&cpg 227>, <&cpg 226>, + <&cpg 236>, <&cpg 238>, <&cpg 237>; + reset-names =3D "ssi-all", + "ssi.9", "ssi.8", "ssi.7", "ssi.6", + "ssi.5", "ssi.4", "ssi.3", "ssi.2", + "ssi.1", "ssi.0", + "scu", "adg", "audmapp"; + + rcar_sound,ssi { + ssi0: ssi-0 { + interrupts =3D ; + }; + ssi3: ssi-3 { + interrupts =3D ; + }; + ssi4: ssi-4 { + interrupts =3D ; + shared-pin; + }; + }; + + rcar_sound,ssiu { + ssiu30: ssiu-12 { + dmas =3D <&dmac0 0x1d79>, <&dmac0 0x1d7a>, + <&dmac1 0x1d79>, <&dmac1 0x1d7a>, + <&dmac2 0x1d79>, <&dmac2 0x1d7a>, + <&dmac3 0x1d79>, <&dmac3 0x1d7a>, + <&dmac4 0x1d79>, <&dmac4 0x1d7a>; + dma-names =3D "tx", "rx", "tx", "rx", "tx", "rx", + "tx", "rx", "tx", "rx"; + }; + ssiu40: ssiu-16 { + dmas =3D <&dmac0 0x1d81>, <&dmac0 0x1d82>, + <&dmac1 0x1d81>, <&dmac1 0x1d82>, + <&dmac2 0x1d81>, <&dmac2 0x1d82>, + <&dmac3 0x1d81>, <&dmac3 0x1d82>, + <&dmac4 0x1d81>, <&dmac4 0x1d82>; + dma-names =3D "tx", "rx", "tx", "rx", "tx", "rx", + "tx", "rx", "tx", "rx"; + }; + }; + + rcar_sound,src { + src0: src-0 { + interrupts =3D ; + dmas =3D <&dmac0 0x1d9f>, <&dmac0 0x1da9>, + <&dmac1 0x1d9f>, <&dmac1 0x1da9>, + <&dmac2 0x1d9f>, <&dmac2 0x1da9>, + <&dmac3 0x1d9f>, <&dmac3 0x1da9>, + <&dmac4 0x1d9f>, <&dmac4 0x1da9>; + dma-names =3D "rx", "tx", "rx", "tx", "rx", "tx", + "rx", "tx", "rx", "tx"; + }; + src1: src-1 { + interrupts =3D ; + dmas =3D <&dmac0 0x1da0>, <&dmac0 0x1daa>, + <&dmac1 0x1da0>, <&dmac1 0x1daa>, + <&dmac2 0x1da0>, <&dmac2 0x1daa>, + <&dmac3 0x1da0>, <&dmac3 0x1daa>, + <&dmac4 0x1da0>, <&dmac4 0x1daa>; + dma-names =3D "rx", "tx", "rx", "tx", "rx", "tx", + "rx", "tx", "rx", "tx"; + }; + }; + + rcar_sound,dvc { + dvc0: dvc-0 { + dmas =3D <&dmac0 0x1db3>, + <&dmac1 0x1db3>, + <&dmac2 0x1db3>, + <&dmac3 0x1db3>, + <&dmac4 0x1db3>; + dma-names =3D "tx", "tx", "tx", "tx", "tx"; + }; + dvc1: dvc-1 { + dmas =3D <&dmac0 0x1db4>, + <&dmac1 0x1db4>, + <&dmac2 0x1db4>, + <&dmac3 0x1db4>, + <&dmac4 0x1db4>; + dma-names =3D "tx", "tx", "tx", "tx", "tx"; + }; + }; + + rcar_sound,dai { + dai0 { + playback =3D <&ssi3>, <&src1>, <&dvc1>; + capture =3D <&ssi4>, <&src0>, <&dvc0>; + }; + }; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + rsnd_port0: port@0 { + reg =3D <0>; + rsnd_endpoint0: endpoint { + remote-endpoint =3D <&codec_endpoint>; + dai-format =3D "i2s"; + bitclock-master =3D <&rsnd_endpoint0>; + frame-master =3D <&rsnd_endpoint0>; + playback =3D <&ssi3>, <&src1>, <&dvc1>; + capture =3D <&ssi4>, <&src0>, <&dvc0>; + }; + }; + }; + }; + + codec { + port { + codec_endpoint: endpoint { + remote-endpoint =3D <&rsnd_endpoint0>; + }; + }; + }; --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2CCBB30EF92; Thu, 2 Apr 2026 16:25:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147127; cv=none; b=i39NUGdvELhgDVLbmxWrUjQxlewhJssmEFv7pcqHSQkcltKoUoDIj22gms/+GQxpMcZlbnwjIcevzHzW9R0AXpdheiZv+7h4f5AYhFGgj00idO0faTngXHoJxcjv2puDNxG/YbqE2A8DSUGT0eMcem4200X6mnXCm4BbMMd/B2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147127; c=relaxed/simple; bh=kQLDLvXKYDlLQD3xILSSmcAAxjXE1h3geIL34TLSRfw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KnOtPcUaFgeo+ou4+XIMpIvimUbsbelClKEaWv3Nh7XWzj1Pl3j6ujpqCWe0zWOfJlBYcGeIekJ8A3Z3l9DVgOgy6ckD1NWAYdqN6ZCm3oyeMwKeiF61lInbWpjXjKPD1iqFS0nSEa8C5ZmkQnnLKPJROgTsYjmWRUtlp35Uv4Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: BGrImdWQS12p/cQMJPwGAg== X-CSE-MsgGUID: diug9O4NT86cjdCBTL99bw== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Apr 2026 01:25:24 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 24E514018E95; Fri, 3 Apr 2026 01:25:18 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 03/14] ASoC: rsnd: Add reset controller support to rsnd_mod Date: Thu, 2 Apr 2026 18:24:25 +0200 Message-ID: <20260402162436.12059-4-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The RZ/G3E SoC requires per-module reset control for the audio subsystem. Add reset controller support to struct rsnd_mod and update rsnd_mod_init() to accept and handle a reset_control parameter. Signed-off-by: John Madieu --- Changes: v3: No changes v2: No changes sound/soc/renesas/rcar/adg.c | 2 +- sound/soc/renesas/rcar/cmd.c | 2 +- sound/soc/renesas/rcar/core.c | 14 +++++++++++++- sound/soc/renesas/rcar/ctu.c | 2 +- sound/soc/renesas/rcar/dma.c | 4 ++-- sound/soc/renesas/rcar/dvc.c | 2 +- sound/soc/renesas/rcar/mix.c | 2 +- sound/soc/renesas/rcar/rsnd.h | 3 +++ sound/soc/renesas/rcar/src.c | 2 +- sound/soc/renesas/rcar/ssi.c | 2 +- sound/soc/renesas/rcar/ssiu.c | 2 +- 11 files changed, 26 insertions(+), 11 deletions(-) diff --git a/sound/soc/renesas/rcar/adg.c b/sound/soc/renesas/rcar/adg.c index 8641b73d1f77..0105c60a144e 100644 --- a/sound/soc/renesas/rcar/adg.c +++ b/sound/soc/renesas/rcar/adg.c @@ -780,7 +780,7 @@ int rsnd_adg_probe(struct rsnd_priv *priv) return -ENOMEM; =20 ret =3D rsnd_mod_init(priv, &adg->mod, &adg_ops, - NULL, 0, 0); + NULL, NULL, 0, 0); if (ret) return ret; =20 diff --git a/sound/soc/renesas/rcar/cmd.c b/sound/soc/renesas/rcar/cmd.c index 8d9a1e345a22..13beef389797 100644 --- a/sound/soc/renesas/rcar/cmd.c +++ b/sound/soc/renesas/rcar/cmd.c @@ -171,7 +171,7 @@ int rsnd_cmd_probe(struct rsnd_priv *priv) =20 for_each_rsnd_cmd(cmd, priv, i) { int ret =3D rsnd_mod_init(priv, rsnd_mod_get(cmd), - &rsnd_cmd_ops, NULL, + &rsnd_cmd_ops, NULL, NULL, RSND_MOD_CMD, i); if (ret) return ret; diff --git a/sound/soc/renesas/rcar/core.c b/sound/soc/renesas/rcar/core.c index 69fb19964a71..6de576736507 100644 --- a/sound/soc/renesas/rcar/core.c +++ b/sound/soc/renesas/rcar/core.c @@ -90,6 +90,7 @@ * */ =20 +#include #include #include #include "rsnd.h" @@ -196,18 +197,29 @@ int rsnd_mod_init(struct rsnd_priv *priv, struct rsnd_mod *mod, struct rsnd_mod_ops *ops, struct clk *clk, + struct reset_control *rstc, enum rsnd_mod_type type, int id) { - int ret =3D clk_prepare(clk); + int ret; =20 + ret =3D clk_prepare_enable(clk); if (ret) return ret; =20 + ret =3D reset_control_deassert(rstc); + if (ret) { + clk_disable_unprepare(clk); + return ret; + } + + clk_disable(clk); + mod->id =3D id; mod->ops =3D ops; mod->type =3D type; mod->clk =3D clk; + mod->rstc =3D rstc; mod->priv =3D priv; =20 return 0; diff --git a/sound/soc/renesas/rcar/ctu.c b/sound/soc/renesas/rcar/ctu.c index bd4c61f9fb3c..81bba6a1af6e 100644 --- a/sound/soc/renesas/rcar/ctu.c +++ b/sound/soc/renesas/rcar/ctu.c @@ -360,7 +360,7 @@ int rsnd_ctu_probe(struct rsnd_priv *priv) } =20 ret =3D rsnd_mod_init(priv, rsnd_mod_get(ctu), &rsnd_ctu_ops, - clk, RSND_MOD_CTU, i); + clk, NULL, RSND_MOD_CTU, i); if (ret) goto rsnd_ctu_probe_done; =20 diff --git a/sound/soc/renesas/rcar/dma.c b/sound/soc/renesas/rcar/dma.c index 2035ce06fe4c..68c859897e68 100644 --- a/sound/soc/renesas/rcar/dma.c +++ b/sound/soc/renesas/rcar/dma.c @@ -803,7 +803,7 @@ static int rsnd_dma_alloc(struct rsnd_dai_stream *io, s= truct rsnd_mod *mod, =20 *dma_mod =3D rsnd_mod_get(dma); =20 - ret =3D rsnd_mod_init(priv, *dma_mod, ops, NULL, + ret =3D rsnd_mod_init(priv, *dma_mod, ops, NULL, NULL, type, dma_id); if (ret < 0) return ret; @@ -879,5 +879,5 @@ int rsnd_dma_probe(struct rsnd_priv *priv) priv->dma =3D dmac; =20 /* dummy mem mod for debug */ - return rsnd_mod_init(NULL, &mem, &mem_ops, NULL, 0, 0); + return rsnd_mod_init(NULL, &mem, &mem_ops, NULL, NULL, 0, 0); } diff --git a/sound/soc/renesas/rcar/dvc.c b/sound/soc/renesas/rcar/dvc.c index 988cbddbc611..bf7146ceb5f6 100644 --- a/sound/soc/renesas/rcar/dvc.c +++ b/sound/soc/renesas/rcar/dvc.c @@ -364,7 +364,7 @@ int rsnd_dvc_probe(struct rsnd_priv *priv) } =20 ret =3D rsnd_mod_init(priv, rsnd_mod_get(dvc), &rsnd_dvc_ops, - clk, RSND_MOD_DVC, i); + clk, NULL, RSND_MOD_DVC, i); if (ret) goto rsnd_dvc_probe_done; =20 diff --git a/sound/soc/renesas/rcar/mix.c b/sound/soc/renesas/rcar/mix.c index aea74e703305..566e9b2a488c 100644 --- a/sound/soc/renesas/rcar/mix.c +++ b/sound/soc/renesas/rcar/mix.c @@ -328,7 +328,7 @@ int rsnd_mix_probe(struct rsnd_priv *priv) } =20 ret =3D rsnd_mod_init(priv, rsnd_mod_get(mix), &rsnd_mix_ops, - clk, RSND_MOD_MIX, i); + clk, NULL, RSND_MOD_MIX, i); if (ret) goto rsnd_mix_probe_done; =20 diff --git a/sound/soc/renesas/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h index 04c70690f7a2..cd7e7df62298 100644 --- a/sound/soc/renesas/rcar/rsnd.h +++ b/sound/soc/renesas/rcar/rsnd.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -353,6 +354,7 @@ struct rsnd_mod { struct rsnd_mod_ops *ops; struct rsnd_priv *priv; struct clk *clk; + struct reset_control *rstc; u32 status; }; /* @@ -420,6 +422,7 @@ int rsnd_mod_init(struct rsnd_priv *priv, struct rsnd_mod *mod, struct rsnd_mod_ops *ops, struct clk *clk, + struct reset_control *rstc, enum rsnd_mod_type type, int id); void rsnd_mod_quit(struct rsnd_mod *mod); diff --git a/sound/soc/renesas/rcar/src.c b/sound/soc/renesas/rcar/src.c index 6a3dbc84f474..8b58cc20e7a8 100644 --- a/sound/soc/renesas/rcar/src.c +++ b/sound/soc/renesas/rcar/src.c @@ -766,7 +766,7 @@ int rsnd_src_probe(struct rsnd_priv *priv) } =20 ret =3D rsnd_mod_init(priv, rsnd_mod_get(src), - &rsnd_src_ops, clk, RSND_MOD_SRC, i); + &rsnd_src_ops, clk, NULL, RSND_MOD_SRC, i); if (ret) goto rsnd_src_probe_done; =20 diff --git a/sound/soc/renesas/rcar/ssi.c b/sound/soc/renesas/rcar/ssi.c index 0420041e282c..c06cebb36170 100644 --- a/sound/soc/renesas/rcar/ssi.c +++ b/sound/soc/renesas/rcar/ssi.c @@ -1225,7 +1225,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv) ops =3D &rsnd_ssi_dma_ops; =20 ret =3D rsnd_mod_init(priv, rsnd_mod_get(ssi), ops, clk, - RSND_MOD_SSI, i); + NULL, RSND_MOD_SSI, i); if (ret) goto rsnd_ssi_probe_done; =20 diff --git a/sound/soc/renesas/rcar/ssiu.c b/sound/soc/renesas/rcar/ssiu.c index 244fb833292a..0cfa84fe5ea8 100644 --- a/sound/soc/renesas/rcar/ssiu.c +++ b/sound/soc/renesas/rcar/ssiu.c @@ -586,7 +586,7 @@ int rsnd_ssiu_probe(struct rsnd_priv *priv) } =20 ret =3D rsnd_mod_init(priv, rsnd_mod_get(ssiu), - ops, NULL, RSND_MOD_SSIU, i); + ops, NULL, NULL, RSND_MOD_SSIU, i); if (ret) return ret; } --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D18B93EF0B7; Thu, 2 Apr 2026 16:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147132; cv=none; b=EO3PP/km5mgqleM6++GNSNdBuId7aRnjbEIBKq8d+ENYuGfAeRj4Z5nNnGvM4MM6FVnczNkkcbpuTAU52+tS9bpaFjm1/8qLnswDrsew3qGDEfhONB1R2uMYiZRLDeaUv8JUM2u725/toOsdyjnsbxsSBumD2fcD0RxLCMPsGFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147132; c=relaxed/simple; bh=IoRa9Q7Ix15iYGkPthFfr1LTCA0E1XFxHj+umcpsXhE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V+fmboPXEls0gz8pnzVJxd1lAvTVxDvYRonj7iqKPQtH3VV7x0vSJUCb0enB78ARk2Qr35eQ9Qae4Lcdwg7UMZlKF9FKf7+0hQs4fq7pOLlait0RDoljHGkhgm5EXTglJiLGfGidiqEilPDpfEiUJYP3R0jPb3iRSepFmM+Ab08= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: VH5DaDjRSneCEssAVCvX5w== X-CSE-MsgGUID: 3ECBOMHrSq+DmGXx2ceBSw== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 03 Apr 2026 01:25:30 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id DF7724018E95; Fri, 3 Apr 2026 01:25:24 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 04/14] ASoC: rsnd: Add RZ/G3E SoC probing and register map Date: Thu, 2 Apr 2026 18:24:26 +0200 Message-ID: <20260402162436.12059-5-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" RZ/G3E audio subsystem has a different register layout compared to R-Car Gen2/Gen3/Gen4, as described below: - Different base address organization (SCU, ADG, SSIU, SSI as separate regions accessed by name) - Additional registers: AUDIO_CLK_SEL3, SSI_MODE3, SSI_CONTROL2 - Different register offsets within each region Add RZ/G3E SoC's audio subsystem register layouts and probe support. Signed-off-by: John Madieu --- Changes: v3: No changes v2: - Reuse existing RSND_BASE_xxx defines instead of RZ/G3E-specific ones; - Fix ADG regmap init region count and collapse to single-line calls. - Move RSND_RZG3E flag to separate bit range (xx << 8/12) to reserve (x << 0) for future R-Car Gen5, using Morimoto-san's RSND_RZ_MASK scheme. sound/soc/renesas/rcar/core.c | 1 + sound/soc/renesas/rcar/gen.c | 180 ++++++++++++++++++++++++++++++++++ sound/soc/renesas/rcar/rsnd.h | 8 +- 3 files changed, 188 insertions(+), 1 deletion(-) diff --git a/sound/soc/renesas/rcar/core.c b/sound/soc/renesas/rcar/core.c index 6de576736507..8d0c5440cb70 100644 --- a/sound/soc/renesas/rcar/core.c +++ b/sound/soc/renesas/rcar/core.c @@ -107,6 +107,7 @@ static const struct of_device_id rsnd_of_match[] =3D { { .compatible =3D "renesas,rcar_sound-gen4", .data =3D (void *)RSND_GEN4 = }, /* Special Handling */ { .compatible =3D "renesas,rcar_sound-r8a77990", .data =3D (void *)(RSND_= GEN3 | RSND_SOC_E) }, + { .compatible =3D "renesas,r9a09g047-sound", .data =3D (void *)(RSND_RZ3 = | RSND_RZG3E) }, {}, }; MODULE_DEVICE_TABLE(of, rsnd_of_match); diff --git a/sound/soc/renesas/rcar/gen.c b/sound/soc/renesas/rcar/gen.c index d1f20cde66be..05d5f656fb01 100644 --- a/sound/soc/renesas/rcar/gen.c +++ b/sound/soc/renesas/rcar/gen.c @@ -464,6 +464,184 @@ static int rsnd_gen1_probe(struct rsnd_priv *priv) return ret_adg | ret_ssi; } =20 +/* + * RZ/G3E Generation + */ +static int rsnd_rzg3e_probe(struct rsnd_priv *priv) +{ + static const struct rsnd_regmap_field_conf conf_ssiu[] =3D { + RSND_GEN_S_REG(SSI_MODE1, 0x804), + RSND_GEN_S_REG(SSI_MODE2, 0x808), + RSND_GEN_S_REG(SSI_MODE3, 0x80c), + RSND_GEN_S_REG(SSI_CONTROL, 0x810), + RSND_GEN_S_REG(SSI_CONTROL2, 0x814), + RSND_GEN_S_REG(SSI_SYS_STATUS0, 0x840), + RSND_GEN_S_REG(SSI_SYS_STATUS1, 0x844), + RSND_GEN_S_REG(SSI_SYS_STATUS2, 0x848), + RSND_GEN_S_REG(SSI_SYS_STATUS3, 0x84c), + RSND_GEN_S_REG(SSI_SYS_INT_ENABLE0, 0x850), + RSND_GEN_S_REG(SSI_SYS_INT_ENABLE1, 0x854), + RSND_GEN_S_REG(SSI_SYS_INT_ENABLE2, 0x858), + RSND_GEN_S_REG(SSI_SYS_INT_ENABLE3, 0x85c), + RSND_GEN_M_REG(SSI_BUSIF0_MODE, 0x0, 0x80), + RSND_GEN_M_REG(SSI_BUSIF0_ADINR, 0x4, 0x80), + RSND_GEN_M_REG(SSI_BUSIF0_DALIGN, 0x8, 0x80), + RSND_GEN_M_REG(SSI_BUSIF1_MODE, 0x20, 0x80), + RSND_GEN_M_REG(SSI_BUSIF1_ADINR, 0x24, 0x80), + RSND_GEN_M_REG(SSI_BUSIF1_DALIGN, 0x28, 0x80), + RSND_GEN_M_REG(SSI_BUSIF2_MODE, 0x40, 0x80), + RSND_GEN_M_REG(SSI_BUSIF2_ADINR, 0x44, 0x80), + RSND_GEN_M_REG(SSI_BUSIF2_DALIGN, 0x48, 0x80), + RSND_GEN_M_REG(SSI_BUSIF3_MODE, 0x60, 0x80), + RSND_GEN_M_REG(SSI_BUSIF3_ADINR, 0x64, 0x80), + RSND_GEN_M_REG(SSI_BUSIF3_DALIGN, 0x68, 0x80), + RSND_GEN_M_REG(SSI_MODE, 0xc, 0x80), + RSND_GEN_M_REG(SSI_CTRL, 0x10, 0x80), + RSND_GEN_M_REG(SSI_INT_ENABLE, 0x18, 0x80), + RSND_GEN_S_REG(SSI9_BUSIF0_MODE, 0x480), + RSND_GEN_S_REG(SSI9_BUSIF0_ADINR, 0x484), + RSND_GEN_S_REG(SSI9_BUSIF0_DALIGN, 0x488), + RSND_GEN_S_REG(SSI9_BUSIF1_MODE, 0x4a0), + RSND_GEN_S_REG(SSI9_BUSIF1_ADINR, 0x4a4), + RSND_GEN_S_REG(SSI9_BUSIF1_DALIGN, 0x4a8), + RSND_GEN_S_REG(SSI9_BUSIF2_MODE, 0x4c0), + RSND_GEN_S_REG(SSI9_BUSIF2_ADINR, 0x4c4), + RSND_GEN_S_REG(SSI9_BUSIF2_DALIGN, 0x4c8), + RSND_GEN_S_REG(SSI9_BUSIF3_MODE, 0x4e0), + RSND_GEN_S_REG(SSI9_BUSIF3_ADINR, 0x4e4), + RSND_GEN_S_REG(SSI9_BUSIF3_DALIGN, 0x4e8), + }; + static const struct rsnd_regmap_field_conf conf_scu[] =3D { + RSND_GEN_M_REG(SRC_I_BUSIF_MODE, 0x0, 0x20), + RSND_GEN_M_REG(SRC_O_BUSIF_MODE, 0x4, 0x20), + RSND_GEN_M_REG(SRC_BUSIF_DALIGN, 0x8, 0x20), + RSND_GEN_M_REG(SRC_ROUTE_MODE0, 0xc, 0x20), + RSND_GEN_M_REG(SRC_CTRL, 0x10, 0x20), + RSND_GEN_M_REG(SRC_INT_ENABLE0, 0x18, 0x20), + RSND_GEN_M_REG(CMD_BUSIF_MODE, 0x184, 0x20), + RSND_GEN_M_REG(CMD_BUSIF_DALIGN, 0x188, 0x20), + RSND_GEN_M_REG(CMD_ROUTE_SLCT, 0x18c, 0x20), + RSND_GEN_M_REG(CMD_CTRL, 0x190, 0x20), + RSND_GEN_S_REG(SCU_SYS_STATUS0, 0x1c8), + RSND_GEN_S_REG(SCU_SYS_INT_EN0, 0x1cc), + RSND_GEN_S_REG(SCU_SYS_STATUS1, 0x1d0), + RSND_GEN_S_REG(SCU_SYS_INT_EN1, 0x1d4), + RSND_GEN_M_REG(SRC_SWRSR, 0x200, 0x40), + RSND_GEN_M_REG(SRC_SRCIR, 0x204, 0x40), + RSND_GEN_M_REG(SRC_ADINR, 0x214, 0x40), + RSND_GEN_M_REG(SRC_IFSCR, 0x21c, 0x40), + RSND_GEN_M_REG(SRC_IFSVR, 0x220, 0x40), + RSND_GEN_M_REG(SRC_SRCCR, 0x224, 0x40), + RSND_GEN_M_REG(SRC_BSDSR, 0x22c, 0x40), + RSND_GEN_M_REG(SRC_BSISR, 0x238, 0x40), + RSND_GEN_M_REG(CTU_SWRSR, 0x500, 0x100), + RSND_GEN_M_REG(CTU_CTUIR, 0x504, 0x100), + RSND_GEN_M_REG(CTU_ADINR, 0x508, 0x100), + RSND_GEN_M_REG(CTU_CPMDR, 0x510, 0x100), + RSND_GEN_M_REG(CTU_SCMDR, 0x514, 0x100), + RSND_GEN_M_REG(CTU_SV00R, 0x518, 0x100), + RSND_GEN_M_REG(CTU_SV01R, 0x51c, 0x100), + RSND_GEN_M_REG(CTU_SV02R, 0x520, 0x100), + RSND_GEN_M_REG(CTU_SV03R, 0x524, 0x100), + RSND_GEN_M_REG(CTU_SV04R, 0x528, 0x100), + RSND_GEN_M_REG(CTU_SV05R, 0x52c, 0x100), + RSND_GEN_M_REG(CTU_SV06R, 0x530, 0x100), + RSND_GEN_M_REG(CTU_SV07R, 0x534, 0x100), + RSND_GEN_M_REG(CTU_SV10R, 0x538, 0x100), + RSND_GEN_M_REG(CTU_SV11R, 0x53c, 0x100), + RSND_GEN_M_REG(CTU_SV12R, 0x540, 0x100), + RSND_GEN_M_REG(CTU_SV13R, 0x544, 0x100), + RSND_GEN_M_REG(CTU_SV14R, 0x548, 0x100), + RSND_GEN_M_REG(CTU_SV15R, 0x54c, 0x100), + RSND_GEN_M_REG(CTU_SV16R, 0x550, 0x100), + RSND_GEN_M_REG(CTU_SV17R, 0x554, 0x100), + RSND_GEN_M_REG(CTU_SV20R, 0x558, 0x100), + RSND_GEN_M_REG(CTU_SV21R, 0x55c, 0x100), + RSND_GEN_M_REG(CTU_SV22R, 0x560, 0x100), + RSND_GEN_M_REG(CTU_SV23R, 0x564, 0x100), + RSND_GEN_M_REG(CTU_SV24R, 0x568, 0x100), + RSND_GEN_M_REG(CTU_SV25R, 0x56c, 0x100), + RSND_GEN_M_REG(CTU_SV26R, 0x570, 0x100), + RSND_GEN_M_REG(CTU_SV27R, 0x574, 0x100), + RSND_GEN_M_REG(CTU_SV30R, 0x578, 0x100), + RSND_GEN_M_REG(CTU_SV31R, 0x57c, 0x100), + RSND_GEN_M_REG(CTU_SV32R, 0x580, 0x100), + RSND_GEN_M_REG(CTU_SV33R, 0x584, 0x100), + RSND_GEN_M_REG(CTU_SV34R, 0x588, 0x100), + RSND_GEN_M_REG(CTU_SV35R, 0x58c, 0x100), + RSND_GEN_M_REG(CTU_SV36R, 0x590, 0x100), + RSND_GEN_M_REG(CTU_SV37R, 0x594, 0x100), + RSND_GEN_M_REG(MIX_SWRSR, 0xd00, 0x40), + RSND_GEN_M_REG(MIX_MIXIR, 0xd04, 0x40), + RSND_GEN_M_REG(MIX_ADINR, 0xd08, 0x40), + RSND_GEN_M_REG(MIX_MIXMR, 0xd10, 0x40), + RSND_GEN_M_REG(MIX_MVPDR, 0xd14, 0x40), + RSND_GEN_M_REG(MIX_MDBAR, 0xd18, 0x40), + RSND_GEN_M_REG(MIX_MDBBR, 0xd1c, 0x40), + RSND_GEN_M_REG(MIX_MDBCR, 0xd20, 0x40), + RSND_GEN_M_REG(MIX_MDBDR, 0xd24, 0x40), + RSND_GEN_M_REG(MIX_MDBER, 0xd28, 0x40), + RSND_GEN_M_REG(DVC_SWRSR, 0xe00, 0x100), + RSND_GEN_M_REG(DVC_DVUIR, 0xe04, 0x100), + RSND_GEN_M_REG(DVC_ADINR, 0xe08, 0x100), + RSND_GEN_M_REG(DVC_DVUCR, 0xe10, 0x100), + RSND_GEN_M_REG(DVC_ZCMCR, 0xe14, 0x100), + RSND_GEN_M_REG(DVC_VRCTR, 0xe18, 0x100), + RSND_GEN_M_REG(DVC_VRPDR, 0xe1c, 0x100), + RSND_GEN_M_REG(DVC_VRDBR, 0xe20, 0x100), + RSND_GEN_M_REG(DVC_VOL0R, 0xe28, 0x100), + RSND_GEN_M_REG(DVC_VOL1R, 0xe2c, 0x100), + RSND_GEN_M_REG(DVC_VOL2R, 0xe30, 0x100), + RSND_GEN_M_REG(DVC_VOL3R, 0xe34, 0x100), + RSND_GEN_M_REG(DVC_VOL4R, 0xe38, 0x100), + RSND_GEN_M_REG(DVC_VOL5R, 0xe3c, 0x100), + RSND_GEN_M_REG(DVC_VOL6R, 0xe40, 0x100), + RSND_GEN_M_REG(DVC_VOL7R, 0xe44, 0x100), + RSND_GEN_M_REG(DVC_DVUER, 0xe48, 0x100), + }; + static const struct rsnd_regmap_field_conf conf_adg[] =3D { + RSND_GEN_S_REG(BRRA, 0x00), + RSND_GEN_S_REG(BRRB, 0x04), + RSND_GEN_S_REG(BRGCKR, 0x08), + RSND_GEN_S_REG(AUDIO_CLK_SEL0, 0x0c), + RSND_GEN_S_REG(AUDIO_CLK_SEL1, 0x10), + RSND_GEN_S_REG(AUDIO_CLK_SEL2, 0x14), + RSND_GEN_S_REG(AUDIO_CLK_SEL3, 0x18), + RSND_GEN_S_REG(DIV_EN, 0x30), + RSND_GEN_S_REG(SRCIN_TIMSEL0, 0x34), + RSND_GEN_S_REG(SRCIN_TIMSEL1, 0x38), + RSND_GEN_S_REG(SRCIN_TIMSEL2, 0x3c), + RSND_GEN_S_REG(SRCIN_TIMSEL3, 0x40), + RSND_GEN_S_REG(SRCIN_TIMSEL4, 0x44), + RSND_GEN_S_REG(SRCOUT_TIMSEL0, 0x48), + RSND_GEN_S_REG(SRCOUT_TIMSEL1, 0x4c), + RSND_GEN_S_REG(SRCOUT_TIMSEL2, 0x50), + RSND_GEN_S_REG(SRCOUT_TIMSEL3, 0x54), + RSND_GEN_S_REG(SRCOUT_TIMSEL4, 0x58), + RSND_GEN_S_REG(CMDOUT_TIMSEL, 0x5c), + }; + static const struct rsnd_regmap_field_conf conf_ssi[] =3D { + RSND_GEN_M_REG(SSICR, 0x00, 0x40), + RSND_GEN_M_REG(SSISR, 0x04, 0x40), + RSND_GEN_M_REG(SSIWSR, 0x20, 0x40), + }; + int ret; + + ret =3D rsnd_gen_regmap_init(priv, 10, RSND_BASE_SCU, "scu", conf_scu); + if (ret < 0) + return ret; + + ret =3D rsnd_gen_regmap_init(priv, 1, RSND_BASE_ADG, "adg", conf_adg); + if (ret < 0) + return ret; + + ret =3D rsnd_gen_regmap_init(priv, 10, RSND_BASE_SSIU, "ssiu", conf_ssiu); + if (ret < 0) + return ret; + + return rsnd_gen_regmap_init(priv, 10, RSND_BASE_SSI, "ssi", conf_ssi); +} + /* * Gen */ @@ -487,6 +665,8 @@ int rsnd_gen_probe(struct rsnd_priv *priv) ret =3D rsnd_gen2_probe(priv); else if (rsnd_is_gen4(priv)) ret =3D rsnd_gen4_probe(priv); + else if (rsnd_is_rzg3e(priv)) + ret =3D rsnd_rzg3e_probe(priv); =20 if (ret < 0) dev_err(dev, "unknown generation R-Car sound device\n"); diff --git a/sound/soc/renesas/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h index cd7e7df62298..7c5eb575209c 100644 --- a/sound/soc/renesas/rcar/rsnd.h +++ b/sound/soc/renesas/rcar/rsnd.h @@ -143,13 +143,16 @@ enum rsnd_reg { AUDIO_CLK_SEL0, AUDIO_CLK_SEL1, AUDIO_CLK_SEL2, + AUDIO_CLK_SEL3, =20 /* SSIU */ SSI_MODE, SSI_MODE0, SSI_MODE1, SSI_MODE2, + SSI_MODE3, SSI_CONTROL, + SSI_CONTROL2, SSI_CTRL, SSI_BUSIF0_MODE, SSI_BUSIF1_MODE, @@ -629,7 +632,9 @@ struct rsnd_priv { #define RSND_GEN4 (4 << 0) #define RSND_SOC_MASK (0xFF << 4) #define RSND_SOC_E (1 << 4) /* E1/E2/E3 */ - +#define RSND_RZ_MASK (0xFF << 8) +#define RSND_RZ3 (3 << 8) +#define RSND_RZG3E (1 << 12) /* * below value will be filled on rsnd_gen_probe() */ @@ -708,6 +713,7 @@ struct rsnd_priv { #define rsnd_is_gen3_e3(priv) (((priv)->flags & \ (RSND_GEN_MASK | RSND_SOC_MASK)) =3D=3D \ (RSND_GEN3 | RSND_SOC_E)) +#define rsnd_is_rzg3e(priv) (((priv)->flags & RSND_RZ_MASK) =3D=3D (RSND_R= Z3 | RSND_RZG3E)) =20 #define rsnd_flags_has(p, f) ((p)->flags & (f)) #define rsnd_flags_set(p, f) ((p)->flags |=3D (f)) --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2B1D23F167A; Thu, 2 Apr 2026 16:25:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147138; cv=none; b=egSM4Y1MbgL3+2/Py18PDH2/CYGe+ypHEd2ssQhSlkiC84wxS50eQXubFnLVhZKKojlr6PGt8AaqiPxdiXmNJoT6WWSC7wp3M72LPGCyryIqNkzOvbQluumzocEt8zSmeJ9KQORE8skJO+E8Y/OmiePk27GqWVGe4jYDhwky7pI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147138; c=relaxed/simple; bh=+VnjL6OrM1/85c5hx2fG9HKNT6Fv4aQhxGaLyTUxaKo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UBsnNCTn5NTcPfzyh67LrJYqgJhKqpSSzwuOoRd0mgL98zvHCn3f8/m2kQfPnRvBkjPMDD88LVHIxoVrSjy/K1roZn3l4HbTnhmTn1TbKadbx3snNzZANaSf5MbyVe+DTWuXOZK8ViEx+6Dd3qT+xRgdPLMk7Yh8obgQehdarp0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: 8LViy/WFSTKTfknALsFx9A== X-CSE-MsgGUID: WaSmqmFfRCWfNB6Qd3shRQ== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 03 Apr 2026 01:25:35 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id ABEE04018E95; Fri, 3 Apr 2026 01:25:30 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 05/14] ASoC: rsnd: Add audmacpp clock and reset support for RZ/G3E Date: Thu, 2 Apr 2026 18:24:27 +0200 Message-ID: <20260402162436.12059-6-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" RZ/G3E requires additional audmapp clock and reset lines for Audio DMA-PP operation. Add global audmacpp clock/reset management in rsnd_dma_probe() using optional APIs to remain transparent to other platforms. Signed-off-by: John Madieu --- Changes: v3: No changes v2: New patch sound/soc/renesas/rcar/dma.c | 14 ++++++++++++++ sound/soc/renesas/rcar/rsnd.h | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/sound/soc/renesas/rcar/dma.c b/sound/soc/renesas/rcar/dma.c index 68c859897e68..0afe4636b005 100644 --- a/sound/soc/renesas/rcar/dma.c +++ b/sound/soc/renesas/rcar/dma.c @@ -864,6 +864,20 @@ int rsnd_dma_probe(struct rsnd_priv *priv) if (rsnd_is_gen4(priv)) goto audmapp_end; =20 + /* for RZ/G3E */ + priv->audmapp_rstc =3D + devm_reset_control_get_optional_exclusive_deasserted(dev, "audmapp"); + if (IS_ERR(priv->audmapp_rstc)) { + return dev_err_probe(dev, PTR_ERR(priv->audmapp_rstc), + "failed to get audmapp reset\n"); + } + + priv->audmapp_clk =3D devm_clk_get_optional_enabled(dev, "audmapp"); + if (IS_ERR(priv->audmapp_clk)) { + return dev_err_probe(dev, PTR_ERR(priv->audmapp_clk), + "failed to get audmapp clock\n"); + } + res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "audmapp"); if (!res) { dev_err(dev, "lack of audmapp in DT\n"); diff --git a/sound/soc/renesas/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h index 7c5eb575209c..4ff410a96336 100644 --- a/sound/soc/renesas/rcar/rsnd.h +++ b/sound/soc/renesas/rcar/rsnd.h @@ -623,6 +623,13 @@ void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, str= uct seq_file *m); struct rsnd_priv { =20 struct platform_device *pdev; + + /* + * below value will be filled on rsnd_dma_probe() + */ + struct clk *audmapp_clk; + struct reset_control *audmapp_rstc; + spinlock_t lock; unsigned long flags; #define RSND_GEN_MASK (0xF << 0) --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AB0BB3F1654; Thu, 2 Apr 2026 16:25:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147147; cv=none; b=qFa0Oe3DizGbrypYHpwZUvfxeOjcMuOZDZxU24yN9nLCyPTZv/IuV7Ljf+jHJp+k+mQPEpM6LTrTdMlTwUFQoywx/FwYawrmZ7H4OhrDCtjf4hKZXN4mhHdLA+aJxhUBRUvm12uk7Zxzld9XOxgVZ9r6SPVueS1O2W2zJtt7zHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147147; c=relaxed/simple; bh=chkngnwmifKuH3qIaJOHEPi8dqqj/RG3JxKDKqOwA9g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KoxVVHN4ZZfisEHs8c6I4gignJ3c+VWhpUTGGfXSKQMuiXVWfbR9SKRLe5vBzNYq5x262Xb/9z5ggTTfOMO6JOxz0/bK4biMDg8mE/90RPthJf78MSM5BwbyKKMbtSAlOrg4eRa2iXxG0IQEBfuOGIpRcIJjdJclIMAhb6wHoks= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: +lnWMd8LQFCra/wVT/b7tQ== X-CSE-MsgGUID: Y5WFgv+cQpiWbMUOtU+/eQ== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Apr 2026 01:25:41 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 76D4A401911E; Fri, 3 Apr 2026 01:25:36 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 06/14] ASoC: rsnd: Add RZ/G3E DMA address calculation support Date: Thu, 2 Apr 2026 18:24:28 +0200 Message-ID: <20260402162436.12059-7-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" RZ/G3E has different DMA register base addresses and offset calculations compared to R-Car platforms. Add dedicated rsnd_rzg3e_dma_addr() function with dispatch from rsnd_dma_addr(), following the existing per-generation pattern. Signed-off-by: John Madieu --- Changes: v3: No changes v2: - Split into separate patches: one for DMA address support, one for audmac-pp clock/reset management - Replace ternary macro wrappers with dedicated rsnd_rzg3e_dma_addr() function dispatched from rsnd_dma_addr(), following existing rsnd_gen4_dma_addr() pattern sound/soc/renesas/rcar/dma.c | 137 +++++++++++++++++++++++++++++------ 1 file changed, 113 insertions(+), 24 deletions(-) diff --git a/sound/soc/renesas/rcar/dma.c b/sound/soc/renesas/rcar/dma.c index 0afe4636b005..5b63206361ef 100644 --- a/sound/soc/renesas/rcar/dma.c +++ b/sound/soc/renesas/rcar/dma.c @@ -496,7 +496,35 @@ static struct rsnd_mod_ops rsnd_dmapp_ops =3D { * SSIU: 0xec541000 / 0xec100000 / 0xec100000 / 0xec400000 / 0xec400000 * SCU : 0xec500000 / 0xec000000 / 0xec004000 / 0xec300000 / 0xec304000 * CMD : 0xec500000 / / 0xec008000 0xec308000 + * + * ex) G3E case + * mod / DMAC in / DMAC out / DMAC PP in / DMAC pp out + * SSI : 0x13C31000 / 0x13C40000 / 0x13C40000 + * SSIU: 0x13C31000 / 0x13C40000 / 0x13C40000 / 0xEC400000 / 0xEC400000 + * SCU : 0x13C00000 / 0x13C10000 / 0x13C14000 / 0xEC300000 / 0xEC304000 + * CMD : 0x13C00000 / / 0x13C18000 0xEC308000 */ + +/* RZ/G3E DMA address macros */ +#define RDMA_SSI_I_N_G3E(addr, i) (addr ##_reg + 0x0000F000 + (0x1000 * i)) +#define RDMA_SSI_O_N_G3E(addr, i) (addr ##_reg + 0x0000F000 + (0x1000 * i)) + +#define RDMA_SSIU_I_N_G3E(addr, i, j) (addr ##_reg + 0x0000F000 + (0x1000 = * (i)) + (((j) / 4) * 0xA000) + (((j) % 4) * 0x400) - (0x4000 * ((i) / 9) *= ((j) / 4))) +#define RDMA_SSIU_O_N_G3E(addr, i, j) RDMA_SSIU_I_N_G3E(addr, i, j) + +#define RDMA_SSIU_I_P_G3E(addr, i, j) (addr ##_reg + 0xD87CF000 + (0x1000 = * (i)) + (((j) / 4) * 0xA000) + (((j) % 4) * 0x400) - (0x4000 * ((i) / 9) *= ((j) / 4))) +#define RDMA_SSIU_O_P_G3E(addr, i, j) RDMA_SSIU_I_P_G3E(addr, i, j) + +#define RDMA_SRC_I_N_G3E(addr, i) (addr ##_reg + 0x00010000 + (0x400 * i)) +#define RDMA_SRC_O_N_G3E(addr, i) (addr ##_reg + 0x00014000 + (0x400 * i)) + +#define RDMA_SRC_I_P_G3E(addr, i) (addr ##_reg + 0xD8700000 + (0x400 * i)) +#define RDMA_SRC_O_P_G3E(addr, i) (addr ##_reg + 0xD8704000 + (0x400 * i)) + +#define RDMA_CMD_O_N_G3E(addr, i) (addr ##_reg + 0x00018000 + (0x400 * i)) +#define RDMA_CMD_O_P_G3E(addr, i) (addr ##_reg + 0xD8708000 + (0x400 * i)) + +/* R-Car DMA address macros */ #define RDMA_SSI_I_N(addr, i) (addr ##_reg - 0x00300000 + (0x40 * i) + 0x8) #define RDMA_SSI_O_N(addr, i) (addr ##_reg - 0x00300000 + (0x40 * i) + 0xc) =20 @@ -515,15 +543,18 @@ static struct rsnd_mod_ops rsnd_dmapp_ops =3D { #define RDMA_CMD_O_N(addr, i) (addr ##_reg - 0x004f8000 + (0x400 * i)) #define RDMA_CMD_O_P(addr, i) (addr ##_reg - 0x001f8000 + (0x400 * i)) =20 +struct rsnd_dma_addr { + dma_addr_t out_addr; + dma_addr_t in_addr; +}; + static dma_addr_t -rsnd_gen2_dma_addr(struct rsnd_dai_stream *io, - struct rsnd_mod *mod, - int is_play, int is_from) +rsnd_dma_addr_lookup(struct rsnd_dai_stream *io, + struct rsnd_mod *mod, + const struct rsnd_dma_addr tbl[3][2][3], + int is_play, int is_from) { - struct rsnd_priv *priv =3D rsnd_io_to_priv(io); - struct device *dev =3D rsnd_priv_to_dev(priv); - phys_addr_t ssi_reg =3D rsnd_gen_get_phy_addr(priv, RSND_BASE_SSI); - phys_addr_t src_reg =3D rsnd_gen_get_phy_addr(priv, RSND_BASE_SCU); + struct device *dev =3D rsnd_priv_to_dev(rsnd_io_to_priv(io)); int is_ssi =3D !!(rsnd_io_to_mod_ssi(io) =3D=3D mod) || !!(rsnd_io_to_mod_ssiu(io) =3D=3D mod); int use_src =3D !!rsnd_io_to_mod_src(io); @@ -531,11 +562,77 @@ rsnd_gen2_dma_addr(struct rsnd_dai_stream *io, !!rsnd_io_to_mod_mix(io) || !!rsnd_io_to_mod_ctu(io); int id =3D rsnd_mod_id(mod); + + /* it shouldn't happen */ + if (use_cmd && !use_src) + dev_err(dev, "DVC is selected without SRC\n"); + + /* use SSIU or SSI? */ + if (is_ssi && rsnd_ssi_use_busif(io)) + is_ssi++; + + dev_dbg(dev, "dma%d addr : is_ssi=3D%d use_src=3D%d use_cmd=3D%d\n", + id, is_ssi, use_src, use_cmd); + + return is_from ? + tbl[is_ssi][is_play][use_src + use_cmd].out_addr : + tbl[is_ssi][is_play][use_src + use_cmd].in_addr; +} + +static dma_addr_t +rsnd_rzg3e_dma_addr(struct rsnd_dai_stream *io, + struct rsnd_mod *mod, int is_play, int is_from) +{ + struct rsnd_priv *priv =3D rsnd_io_to_priv(io); + phys_addr_t ssi_reg =3D rsnd_gen_get_phy_addr(priv, RSND_BASE_SSI); + phys_addr_t src_reg =3D rsnd_gen_get_phy_addr(priv, RSND_BASE_SCU); + int id =3D rsnd_mod_id(mod); int busif =3D rsnd_mod_id_sub(rsnd_io_to_mod_ssiu(io)); - struct dma_addr { - dma_addr_t out_addr; - dma_addr_t in_addr; - } dma_addrs[3][2][3] =3D { + const struct rsnd_dma_addr tbl[3][2][3] =3D { + /* SRC */ + /* Capture */ + {{{ 0, 0, }, + { RDMA_SRC_O_N_G3E(src, id), RDMA_SRC_I_P_G3E(src, id) }, + { RDMA_CMD_O_N_G3E(src, id), RDMA_SRC_I_P_G3E(src, id) } }, + /* Playback */ + {{ 0, 0 }, + { RDMA_SRC_O_P_G3E(src, id), RDMA_SRC_I_N_G3E(src, id) }, + { RDMA_CMD_O_P_G3E(src, id), RDMA_SRC_I_N_G3E(src, id) } } + }, + /* SSI */ + /* Capture */ + {{{ RDMA_SSI_O_N_G3E(ssi, id), 0 }, + { RDMA_SSIU_O_P_G3E(ssi, id, busif), 0 }, + { RDMA_SSIU_O_P_G3E(ssi, id, busif), 0 } }, + /* Playback */ + {{ 0, RDMA_SSI_I_N_G3E(ssi, id) }, + { 0, RDMA_SSIU_I_P_G3E(ssi, id, busif) }, + { 0, RDMA_SSIU_I_P_G3E(ssi, id, busif) } } + }, + /* SSIU */ + /* Capture */ + {{{ RDMA_SSIU_O_N_G3E(ssi, id, busif), 0 }, + { RDMA_SSIU_O_P_G3E(ssi, id, busif), 0 }, + { RDMA_SSIU_O_P_G3E(ssi, id, busif), 0 } }, + /* Playback */ + {{ 0, RDMA_SSIU_I_N_G3E(ssi, id, busif) }, + { 0, RDMA_SSIU_I_P_G3E(ssi, id, busif) }, + { 0, RDMA_SSIU_I_P_G3E(ssi, id, busif) } } }, + }; + + return rsnd_dma_addr_lookup(io, mod, tbl, is_play, is_from); +} + +static dma_addr_t +rsnd_gen2_dma_addr(struct rsnd_dai_stream *io, + struct rsnd_mod *mod, int is_play, int is_from) +{ + struct rsnd_priv *priv =3D rsnd_io_to_priv(io); + phys_addr_t ssi_reg =3D rsnd_gen_get_phy_addr(priv, RSND_BASE_SSI); + phys_addr_t src_reg =3D rsnd_gen_get_phy_addr(priv, RSND_BASE_SCU); + int id =3D rsnd_mod_id(mod); + int busif =3D rsnd_mod_id_sub(rsnd_io_to_mod_ssiu(io)); + const struct rsnd_dma_addr tbl[3][2][3] =3D { /* SRC */ /* Capture */ {{{ 0, 0 }, @@ -574,20 +671,10 @@ rsnd_gen2_dma_addr(struct rsnd_dai_stream *io, * out of calculation rule */ if ((id =3D=3D 9) && (busif >=3D 4)) - dev_err(dev, "This driver doesn't support SSI%d-%d, so far", - id, busif); - - /* it shouldn't happen */ - if (use_cmd && !use_src) - dev_err(dev, "DVC is selected without SRC\n"); - - /* use SSIU or SSI ? */ - if (is_ssi && rsnd_ssi_use_busif(io)) - is_ssi++; + dev_err(rsnd_priv_to_dev(priv), + "This driver doesn't support SSI%d-%d, so far", id, busif); =20 - return (is_from) ? - dma_addrs[is_ssi][is_play][use_src + use_cmd].out_addr : - dma_addrs[is_ssi][is_play][use_src + use_cmd].in_addr; + return rsnd_dma_addr_lookup(io, mod, tbl, is_play, is_from); } =20 /* @@ -636,6 +723,8 @@ static dma_addr_t rsnd_dma_addr(struct rsnd_dai_stream = *io, return 0; else if (rsnd_is_gen4(priv)) return rsnd_gen4_dma_addr(io, mod, is_play, is_from); + else if (rsnd_is_rzg3e(priv)) + return rsnd_rzg3e_dma_addr(io, mod, is_play, is_from); else return rsnd_gen2_dma_addr(io, mod, is_play, is_from); } --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 73E723F0A84; Thu, 2 Apr 2026 16:25:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147150; cv=none; b=QXqkAHmCjyw1QUVUnYuzd9aTz7uQaYLfKq7TB8se+tdL1its0AFrx614VYS4OT8tLtqhNLtEsw+l2qpBcBTJaM4bVp6LUmVyRkxw+v1wCB2Z1HA0k0+NsjUiWkMxOMjb5GbIXtd+PZDATsQxLnfGrWid4DReOfapANp34laNKlw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147150; c=relaxed/simple; bh=D6u2srRCJyjc2MIj/qAPQ+xoymTmg13jHA3UeNc8SMo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BWiHDf9oZ+gYwUXNpGt4j3+4TzEv+/cUS1v96D8qdF/lYTGJCQ0aS/6IWz73HtM5CIptJsEH/xgeR0rjER3WJkpHBtav9XSoE3HqHDh3SzFUSGFOMOQzDF3BZXF+NyJN/aLYLufF8tm7n5zJMK4O/MmbZLHsBpH2NLBfC7sily8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: iZIcDgb2Sb6U60jJjSI0hA== X-CSE-MsgGUID: xU0Bl0QDRbOsrU+eEMx4+w== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 03 Apr 2026 01:25:47 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 3A5924018E95; Fri, 3 Apr 2026 01:25:41 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 07/14] ASoC: rsnd: ssui: Add RZ/G3E SSIU BUSIF support Date: Thu, 2 Apr 2026 18:24:29 +0200 Message-ID: <20260402162436.12059-8-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support for the SSIU found on the Renesas RZ/G3E SoC, which provides a different BUSIF layout compared to earlier generations: - SSI0-SSI4: 4 BUSIF instances each (BUSIF0-3) - SSI5-SSI8: 1 BUSIF instance each (BUSIF0 only) - SSI9: 4 BUSIF instances (BUSIF0-3) - Total: 28 BUSIFs RZ/G3E also differs from Gen2/Gen3 implementations in that only two pairs of BUSIF error-status registers are available instead of four, and the SSI always operates in BUSIF mode with no PIO fallback. Rather than scattering SoC-specific checks across functional code, introduce an extra capability flags in the match data: - RSND_SSIU_BUSIF_STATUS_COUNT_2: only two BUSIF error-status register pairs are present. Used in rsnd_ssiu_busif_err_irq_ctrl() and rsnd_ssiu_busif_err_status_clear() to limit register iteration. Future SoCs sharing these constraints can set the flags without requiring code changes. Signed-off-by: John Madieu --- Changes: v3: No changes v2: - Droped RSND_SSI_ALWAYS_BUSIF flag; PIO is only enabled explicitly, so no guard needed; use direct rsnd_is_rzg3e() check for skipping SSI_MODE0 instead sound/soc/renesas/rcar/core.c | 4 ++- sound/soc/renesas/rcar/rsnd.h | 2 ++ sound/soc/renesas/rcar/ssiu.c | 47 +++++++++++++++++++++-------------- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/sound/soc/renesas/rcar/core.c b/sound/soc/renesas/rcar/core.c index 8d0c5440cb70..d85c614af598 100644 --- a/sound/soc/renesas/rcar/core.c +++ b/sound/soc/renesas/rcar/core.c @@ -107,7 +107,8 @@ static const struct of_device_id rsnd_of_match[] =3D { { .compatible =3D "renesas,rcar_sound-gen4", .data =3D (void *)RSND_GEN4 = }, /* Special Handling */ { .compatible =3D "renesas,rcar_sound-r8a77990", .data =3D (void *)(RSND_= GEN3 | RSND_SOC_E) }, - { .compatible =3D "renesas,r9a09g047-sound", .data =3D (void *)(RSND_RZ3 = | RSND_RZG3E) }, + { .compatible =3D "renesas,r9a09g047-sound", .data =3D (void *)(RSND_RZ3 = | RSND_RZG3E | + RSND_SSIU_BUSIF_STATUS_COUNT_2) }, {}, }; MODULE_DEVICE_TABLE(of, rsnd_of_match); @@ -1960,6 +1961,7 @@ static int rsnd_probe(struct platform_device *pdev) =20 priv->pdev =3D pdev; priv->flags =3D (unsigned long)of_device_get_match_data(dev); + priv->ssiu_busif_count =3D rsnd_flags_has(priv, RSND_SSIU_BUSIF_STATUS_CO= UNT_2) ? 2 : 4; spin_lock_init(&priv->lock); =20 /* diff --git a/sound/soc/renesas/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h index 4ff410a96336..5c5be0f64cb1 100644 --- a/sound/soc/renesas/rcar/rsnd.h +++ b/sound/soc/renesas/rcar/rsnd.h @@ -631,6 +631,7 @@ struct rsnd_priv { struct reset_control *audmapp_rstc; =20 spinlock_t lock; + unsigned int ssiu_busif_count; unsigned long flags; #define RSND_GEN_MASK (0xF << 0) #define RSND_GEN1 (1 << 0) @@ -642,6 +643,7 @@ struct rsnd_priv { #define RSND_RZ_MASK (0xFF << 8) #define RSND_RZ3 (3 << 8) #define RSND_RZG3E (1 << 12) +#define RSND_SSIU_BUSIF_STATUS_COUNT_2 BIT(16) /* Only 2 BUSIF error-statu= s register pairs */ /* * below value will be filled on rsnd_gen_probe() */ diff --git a/sound/soc/renesas/rcar/ssiu.c b/sound/soc/renesas/rcar/ssiu.c index 0cfa84fe5ea8..f377d9414633 100644 --- a/sound/soc/renesas/rcar/ssiu.c +++ b/sound/soc/renesas/rcar/ssiu.c @@ -29,31 +29,32 @@ struct rsnd_ssiu { i++) =20 /* - * SSI Gen2 Gen3 Gen4 - * 0 BUSIF0-3 BUSIF0-7 BUSIF0-7 - * 1 BUSIF0-3 BUSIF0-7 - * 2 BUSIF0-3 BUSIF0-7 - * 3 BUSIF0 BUSIF0-7 - * 4 BUSIF0 BUSIF0-7 - * 5 BUSIF0 BUSIF0 - * 6 BUSIF0 BUSIF0 - * 7 BUSIF0 BUSIF0 - * 8 BUSIF0 BUSIF0 - * 9 BUSIF0-3 BUSIF0-7 - * total 22 52 8 + * SSI Gen2 Gen3 Gen4 RZ/G3E + * 0 BUSIF0-3 BUSIF0-7 BUSIF0-7 BUSIF0-3 + * 1 BUSIF0-3 BUSIF0-7 BUSIF0-3 + * 2 BUSIF0-3 BUSIF0-7 BUSIF0-3 + * 3 BUSIF0 BUSIF0-7 BUSIF0-3 + * 4 BUSIF0 BUSIF0-7 BUSIF0-3 + * 5 BUSIF0 BUSIF0 BUSIF0 + * 6 BUSIF0 BUSIF0 BUSIF0 + * 7 BUSIF0 BUSIF0 BUSIF0 + * 8 BUSIF0 BUSIF0 BUSIF0 + * 9 BUSIF0-3 BUSIF0-7 BUSIF0-3 + * total 22 52 8 28 */ static const int gen2_id[] =3D { 0, 4, 8, 12, 13, 14, 15, 16, 17, 18 }; static const int gen3_id[] =3D { 0, 8, 16, 24, 32, 40, 41, 42, 43, 44 }; static const int gen4_id[] =3D { 0 }; +static const int rzg3e_id[] =3D { 0, 4, 8, 12, 16, 20, 21, 22, 23, 24 }; =20 /* enable busif buffer over/under run interrupt. */ #define rsnd_ssiu_busif_err_irq_enable(mod) rsnd_ssiu_busif_err_irq_ctrl(= mod, 1) #define rsnd_ssiu_busif_err_irq_disable(mod) rsnd_ssiu_busif_err_irq_ctrl(= mod, 0) static void rsnd_ssiu_busif_err_irq_ctrl(struct rsnd_mod *mod, int enable) { + struct rsnd_priv *priv =3D rsnd_mod_to_priv(mod); int id =3D rsnd_mod_id(mod); int shift, offset; - int i; =20 switch (id) { case 0: @@ -72,7 +73,7 @@ static void rsnd_ssiu_busif_err_irq_ctrl(struct rsnd_mod = *mod, int enable) return; } =20 - for (i =3D 0; i < 4; i++) { + for (unsigned int i =3D 0; i < priv->ssiu_busif_count; i++) { enum rsnd_reg reg =3D SSI_SYS_INT_ENABLE((i * 2) + offset); u32 val =3D 0xf << (shift * 4); u32 sys_int_enable =3D rsnd_mod_read(mod, reg); @@ -87,10 +88,10 @@ static void rsnd_ssiu_busif_err_irq_ctrl(struct rsnd_mo= d *mod, int enable) =20 bool rsnd_ssiu_busif_err_status_clear(struct rsnd_mod *mod) { + struct rsnd_priv *priv =3D rsnd_mod_to_priv(mod); bool error =3D false; int id =3D rsnd_mod_id(mod); int shift, offset; - int i; =20 switch (id) { case 0: @@ -109,7 +110,7 @@ bool rsnd_ssiu_busif_err_status_clear(struct rsnd_mod *= mod) goto out; } =20 - for (i =3D 0; i < 4; i++) { + for (unsigned int i =3D 0; i < priv->ssiu_busif_count; i++) { u32 reg =3D SSI_SYS_STATUS(i * 2) + offset; u32 status =3D rsnd_mod_read(mod, reg); u32 val =3D 0xf << (shift * 4); @@ -160,7 +161,8 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, /* * SSI_MODE0 */ - rsnd_mod_bset(mod, SSI_MODE0, (1 << id), !use_busif << id); + if (!rsnd_is_rzg3e(priv)) + rsnd_mod_bset(mod, SSI_MODE0, (1 << id), !use_busif << id); =20 /* * SSI_MODE1 / SSI_MODE2 @@ -510,6 +512,7 @@ int rsnd_ssiu_probe(struct rsnd_priv *priv) { struct device *dev =3D rsnd_priv_to_dev(priv); struct device_node *node __free(device_node) =3D rsnd_ssiu_of_node(priv); + struct reset_control *rstc; struct rsnd_ssiu *ssiu; struct rsnd_mod_ops *ops; const int *list =3D NULL; @@ -558,12 +561,20 @@ int rsnd_ssiu_probe(struct rsnd_priv *priv) } else if (rsnd_is_gen4(priv)) { list =3D gen4_id; nr =3D ARRAY_SIZE(gen4_id); + } else if (rsnd_is_rzg3e(priv)) { + list =3D rzg3e_id; + nr =3D ARRAY_SIZE(rzg3e_id); } else { dev_err(dev, "unknown SSIU\n"); return -ENODEV; } } =20 + /* Acquire shared reset once for all SSIU modules */ + rstc =3D devm_reset_control_get_optional_shared(dev, "ssi-all"); + if (IS_ERR(rstc)) + rstc =3D NULL; + for_each_rsnd_ssiu(ssiu, priv, i) { int ret; =20 @@ -586,7 +597,7 @@ int rsnd_ssiu_probe(struct rsnd_priv *priv) } =20 ret =3D rsnd_mod_init(priv, rsnd_mod_get(ssiu), - ops, NULL, NULL, RSND_MOD_SSIU, i); + ops, NULL, rstc, RSND_MOD_SSIU, i); if (ret) return ret; } --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 13E303F0A9F; Thu, 2 Apr 2026 16:25:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147155; cv=none; b=dJn5EAknJCxmbaTLddwvpJmxEv1xHJzUKbSNenlutnLp+yyVIQF0rxDdBFIQLDTjBS/bfjkDSeMTkqb4QWPbZK/V702QiXy2AjvQFa6gsvYdw6gZmBs1dzQTtdOHx+8n9YQzJR0qcTrf81aiTeawFR+ApibLQdfWhJaBPbjl/1M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147155; c=relaxed/simple; bh=ZS6QaeCHyPuuakh+cH9LVhh4E2RkktdcpTTULoFEq94=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VAqsPFUt81ow2pOX5qV1J0Lkzc82Hz6MF5e64JKJmzoJqjl7ncvJQpXMDzYEMtGYliqfVFt/v/PRpbLM3iJbdP+HV1Uk7q04GiDqWlI+Ll7ywOO/3FGNPaNgwNW7S2vlngs6ZuJ0eXJxqWnFHi2R0S/DIQRqOwvkSr5kwhd3MQc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: W5EmyZXdTZKp7y09o+IUag== X-CSE-MsgGUID: HtUAafzOQ4yBavdWqqdsJg== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Apr 2026 01:25:53 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 1F5594018E95; Fri, 3 Apr 2026 01:25:47 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 08/14] ASoC: rsnd: Add SSI reset support for RZ/G3E platforms Date: Thu, 2 Apr 2026 18:24:30 +0200 Message-ID: <20260402162436.12059-9-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add SSI reset support for the Renesas RZ/G3E SoC, which differs from earlier generations in several ways: - The SSI block always operates in BUSIF mode; RZ/G3E does not implement the SSITDR/SSIRDR registers used by R-Car Gen2/Gen3/Gen4 for direct SSI DMA. Consequently, all audio data must pass through BUSIF. - Each SSI instance has its own reset line, exposed using per-SSI names such as "ssi0", "ssi1", etc., rather than a single shared reset. To support these differences, rsnd_ssi_use_busif() always return 1 on RZ/G3E, ensuring that the driver consistently selects the BUSIF DMA path. While at it, update the reset acquisition logic to request the appropriate per-SSI reset controller based on the SSI instance name. Signed-off-by: John Madieu --- Changes: v3: No changes v2: - Drop rsnd_dma_detach() from rsnd_ssi_common_remove() upon NULL pointer dereference on R-Car Gen3/Gen4 (reported by Geert) - Drop RSND_SSI_ALWAYS_BUSIF flag; use direct rsnd_is_rzg3e() check instead sound/soc/renesas/rcar/ssi.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sound/soc/renesas/rcar/ssi.c b/sound/soc/renesas/rcar/ssi.c index c06cebb36170..c65435551283 100644 --- a/sound/soc/renesas/rcar/ssi.c +++ b/sound/soc/renesas/rcar/ssi.c @@ -1158,6 +1158,7 @@ int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod) =20 int rsnd_ssi_probe(struct rsnd_priv *priv) { + struct reset_control *rstc; struct device_node *node; struct device *dev =3D rsnd_priv_to_dev(priv); struct rsnd_mod_ops *ops; @@ -1207,6 +1208,16 @@ int rsnd_ssi_probe(struct rsnd_priv *priv) goto rsnd_ssi_probe_done; } =20 + /* + * RZ/G3E uses per-SSI reset controllers. + * R-Car platforms typically don't have SSI reset controls. + */ + rstc =3D devm_reset_control_get_optional(dev, name); + if (IS_ERR(rstc)) { + ret =3D PTR_ERR(rstc); + goto rsnd_ssi_probe_done; + } + if (of_property_read_bool(np, "shared-pin")) rsnd_flags_set(ssi, RSND_SSI_CLK_PIN_SHARE); =20 @@ -1225,7 +1236,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv) ops =3D &rsnd_ssi_dma_ops; =20 ret =3D rsnd_mod_init(priv, rsnd_mod_get(ssi), ops, clk, - NULL, RSND_MOD_SSI, i); + rstc, RSND_MOD_SSI, i); if (ret) goto rsnd_ssi_probe_done; =20 --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2383B3F1642; Thu, 2 Apr 2026 16:25:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147161; cv=none; b=EtMdsFlpx3XlBlehVW/hhsGaOmb/k9GX8M/+iq8vc2WIgtvcl9zf7nzRSkb2N4jj5ykCbPottJ7aV8wsk/eQIF+kXvJhycIzzqhn6xXDBVrAbgi+z9MSHLNC5xBjxVTwV6r9hU7O702Ymg/Lou5GdH+YTnW4KeN1//BrCbXtNj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147161; c=relaxed/simple; bh=mBjtMBNgMCL/dKANccZ9BpWpbmjgFyCYmvqBeBorvSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u58l8CMLNiPxcYKAExKi5wEd/atRk3N1x1VFE/T5mxvMBE35YvV7Syw0jJXXLLDudFOuj1uKqeM4sYOAtGJ7T+faagy2xr6RHVrVj3n3qg4vC0ctE59ilOXfKPce6DeceSNCsjqq5tGrTlP0sKit7GzZbRmR4CnjVIQqZeUpgVo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: 68DRvilBQzSShth49N4oYQ== X-CSE-MsgGUID: wEipLl/GQBeSyoKidErtBQ== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 03 Apr 2026 01:25:59 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id D42154018E95; Fri, 3 Apr 2026 01:25:53 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 09/14] ASoC: rsnd: Add ADG reset support for RZ/G3E Date: Thu, 2 Apr 2026 18:24:31 +0200 Message-ID: <20260402162436.12059-10-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" RZ/G3E requires the ADG reset line to be deasserted for the audio subsystem to operate. The ADG module clock is already managed via rsnd_adg_clk_enable/disable() through adg->adg, so no additional clock handling is needed. Add support for the optional "adg" reset control on Renesas RZ/G3E SoC. Signed-off-by: John Madieu --- changes: v3: No changes v2: No changes sound/soc/renesas/rcar/adg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/soc/renesas/rcar/adg.c b/sound/soc/renesas/rcar/adg.c index 0105c60a144e..cbb5c4432a2d 100644 --- a/sound/soc/renesas/rcar/adg.c +++ b/sound/soc/renesas/rcar/adg.c @@ -771,6 +771,7 @@ void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, stru= ct seq_file *m) =20 int rsnd_adg_probe(struct rsnd_priv *priv) { + struct reset_control *rstc; struct rsnd_adg *adg; struct device *dev =3D rsnd_priv_to_dev(priv); int ret; @@ -779,8 +780,13 @@ int rsnd_adg_probe(struct rsnd_priv *priv) if (!adg) return -ENOMEM; =20 + rstc =3D devm_reset_control_get_optional_exclusive(dev, "adg"); + if (IS_ERR(rstc)) + return dev_err_probe(dev, PTR_ERR(rstc), + "failed to get adg reset\n"); + ret =3D rsnd_mod_init(priv, &adg->mod, &adg_ops, - NULL, NULL, 0, 0); + NULL, rstc, 0, 0); if (ret) return ret; =20 --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 23996349B1C; Thu, 2 Apr 2026 16:26:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147167; cv=none; b=pn9D1dKW/DKDMJeoG8H4LxxlxVnJBvYTYNlN2wX0Z+8aG5iNt6iRqAQbLg5VgBjVS4NVTJeS99A3c2UZkZ5Wm34oXucdMHGAMa3FHpWo67xLgNtwdrM9Yyi4Nwwm993RgeiCbmAKI51Ec//vl5XuX1PL4mCyS6IWP4QFENEZSJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147167; c=relaxed/simple; bh=GHVI8raHT7tGtkieqa35eRoq3AJOFMy64nb6YAyJ3Jc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uPjJCfmB5mAxO602DykiJk2W/GNTHoc0bJlsmQdsdOY09QWsieCtJLCwLtawZHX/yBnzEo/rWMmg7/QDrvOJassXyYSqdas/bUeEIv4ys1MpH/tix9nghBiDbSSA6yj8hXIWs22vhevVMJ3vamddi6yBN9FSztZM/xc7xQ9dB3A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: sQFs4m6RQr6HnpVL0WaGBQ== X-CSE-MsgGUID: DLxIT9V2QC6RF1N7MkKW8A== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 03 Apr 2026 01:26:04 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 96A20401911D; Fri, 3 Apr 2026 01:25:59 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 10/14] ASoC: rsnd: adg: Add per-SSI ADG and SSIF supply clock management Date: Thu, 2 Apr 2026 18:24:32 +0200 Message-ID: <20260402162436.12059-11-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" RZ/G3E's ADG module requires explicit clock management for SSI audio interfaces that differs from R-Car Gen2/Gen3/Gen4: - Per-SSI ADG clocks (adg.ssi.N) for each SSI module - A shared SSIF supply clock for the SSI subsystem These clocks are acquired using optional APIs, making them transparent to platforms that do not require them. Additionally, since rsnd_adg_ssi_clk_try_start() is called from the trigger path (atomic context), clk_prepare_enable() cannot be used directly as clk_prepare() may sleep. Split clock handling into: - hw_params: clk_prepare() - sleepable context - trigger (start): clk_enable() - atomic safe - trigger (stop): clk_disable() - atomic safe - hw_free: clk_unprepare() - sleepable context Signed-off-by: John Madieu --- Changes: v3: No changes v2: No changes sound/soc/renesas/rcar/adg.c | 99 ++++++++++++++++++++++++++++++++++- sound/soc/renesas/rcar/rsnd.h | 2 + sound/soc/renesas/rcar/ssi.c | 18 +++++++ 3 files changed, 118 insertions(+), 1 deletion(-) diff --git a/sound/soc/renesas/rcar/adg.c b/sound/soc/renesas/rcar/adg.c index cbb5c4432a2d..131a60689f6d 100644 --- a/sound/soc/renesas/rcar/adg.c +++ b/sound/soc/renesas/rcar/adg.c @@ -19,6 +19,9 @@ #define CLKOUT3 3 #define CLKOUTMAX 4 =20 +/* Maximum SSI count for per-SSI clocks */ +#define ADG_SSI_MAX 10 + #define BRGCKR_31 (1 << 31) #define BRRx_MASK(x) (0x3FF & x) =20 @@ -34,6 +37,9 @@ struct rsnd_adg { struct clk *adg; struct clk *clkin[CLKINMAX]; struct clk *clkout[CLKOUTMAX]; + /* RZ/G3E: per-SSI ADG clocks (adg.ssi.0 through adg.ssi.9) */ + struct clk *clk_adg_ssi[ADG_SSI_MAX]; + struct clk *clk_ssif_supply; struct clk *null_clk; struct clk_onecell_data onecell; struct rsnd_mod mod; @@ -341,10 +347,58 @@ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsign= ed int rate) return -EIO; } =20 +/* + * RZ/G3E: Prepare SSI clocks - call from hw_params (can sleep) + */ +int rsnd_adg_ssi_clk_prepare(struct rsnd_mod *ssi_mod) +{ + struct rsnd_priv *priv =3D rsnd_mod_to_priv(ssi_mod); + struct rsnd_adg *adg =3D rsnd_priv_to_adg(priv); + struct device *dev =3D rsnd_priv_to_dev(priv); + int id =3D rsnd_mod_id(ssi_mod); + int ret; + + ret =3D clk_prepare(adg->clk_adg_ssi[id]); + if (ret) { + dev_err(dev, "Cannot prepare adg.ssi.%d ADG clock\n", id); + return ret; + } + + ret =3D clk_prepare(adg->clk_ssif_supply); + if (ret) { + dev_err(dev, "Cannot prepare SSIF supply clock\n"); + clk_unprepare(adg->clk_adg_ssi[id]); + return ret; + } + + return 0; +} + +/* + * RZ/G3E: Unprepare SSI clocks - call from hw_free (can sleep) + */ +void rsnd_adg_ssi_clk_unprepare(struct rsnd_mod *ssi_mod) +{ + struct rsnd_priv *priv =3D rsnd_mod_to_priv(ssi_mod); + struct rsnd_adg *adg =3D rsnd_priv_to_adg(priv); + int id =3D rsnd_mod_id(ssi_mod); + + clk_unprepare(adg->clk_adg_ssi[id]); + clk_unprepare(adg->clk_ssif_supply); +} + int rsnd_adg_ssi_clk_stop(struct rsnd_mod *ssi_mod) { + struct rsnd_priv *priv =3D rsnd_mod_to_priv(ssi_mod); + struct rsnd_adg *adg =3D rsnd_priv_to_adg(priv); + int id =3D rsnd_mod_id(ssi_mod); + rsnd_adg_set_ssi_clk(ssi_mod, 0); =20 + /* RZ/G3E: only disable here, unprepare is done in hw_free */ + clk_disable(adg->clk_adg_ssi[id]); + clk_disable(adg->clk_ssif_supply); + return 0; } =20 @@ -354,7 +408,8 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod= , unsigned int rate) struct rsnd_adg *adg =3D rsnd_priv_to_adg(priv); struct device *dev =3D rsnd_priv_to_dev(priv); struct rsnd_mod *adg_mod =3D rsnd_mod_get(adg); - int data; + int id =3D rsnd_mod_id(ssi_mod); + int ret, data; u32 ckr =3D 0; =20 data =3D rsnd_adg_clk_query(priv, rate); @@ -376,6 +431,18 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mo= d, unsigned int rate) (ckr) ? adg->brg_rate[ADG_HZ_48] : adg->brg_rate[ADG_HZ_441]); =20 + /* + * RZ/G3E: enable per-SSI and supply clocks + * Prepare was done in hw_params + */ + ret =3D clk_enable(adg->clk_adg_ssi[id]); + if (ret) + dev_warn(dev, "Cannot enable adg.ssi.%d ADG clock\n", id); + + ret =3D clk_enable(adg->clk_ssif_supply); + if (ret) + dev_warn(dev, "Cannot enable SSIF supply clock\n"); + return 0; } =20 @@ -769,6 +836,31 @@ void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, str= uct seq_file *m) #define rsnd_adg_clk_dbg_info(priv, m) #endif =20 +static int rsnd_adg_get_ssi_clks(struct rsnd_priv *priv) +{ + struct rsnd_adg *adg =3D rsnd_priv_to_adg(priv); + struct device *dev =3D rsnd_priv_to_dev(priv); + char name[16]; + int i; + + /* SSIF supply clock */ + adg->clk_ssif_supply =3D devm_clk_get_optional(dev, "ssif_supply"); + if (IS_ERR(adg->clk_ssif_supply)) + return dev_err_probe(dev, PTR_ERR(adg->clk_ssif_supply), + "failed to get ssif_supply clock\n"); + + /* Per-SSI ADG clocks */ + for (i =3D 0; i < ADG_SSI_MAX; i++) { + snprintf(name, sizeof(name), "adg.ssi.%d", i); + adg->clk_adg_ssi[i] =3D devm_clk_get_optional(dev, name); + if (IS_ERR(adg->clk_adg_ssi[i])) + return dev_err_probe(dev, PTR_ERR(adg->clk_adg_ssi[i]), + "failed to get %s clock\n", name); + } + + return 0; +} + int rsnd_adg_probe(struct rsnd_priv *priv) { struct reset_control *rstc; @@ -800,6 +892,11 @@ int rsnd_adg_probe(struct rsnd_priv *priv) if (ret) return ret; =20 + /* RZ/G3E-specific: per-SSI ADG and SSIF supply clocks */ + ret =3D rsnd_adg_get_ssi_clks(priv); + if (ret) + return ret; + ret =3D rsnd_adg_clk_enable(priv); if (ret) return ret; diff --git a/sound/soc/renesas/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h index 5c5be0f64cb1..2c5738926093 100644 --- a/sound/soc/renesas/rcar/rsnd.h +++ b/sound/soc/renesas/rcar/rsnd.h @@ -602,6 +602,8 @@ void __iomem *rsnd_gen_get_base_addr(struct rsnd_priv *= priv, int reg_id); * R-Car ADG */ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate); +int rsnd_adg_ssi_clk_prepare(struct rsnd_mod *ssi_mod); +void rsnd_adg_ssi_clk_unprepare(struct rsnd_mod *ssi_mod); int rsnd_adg_ssi_clk_stop(struct rsnd_mod *ssi_mod); int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate= ); int rsnd_adg_probe(struct rsnd_priv *priv); diff --git a/sound/soc/renesas/rcar/ssi.c b/sound/soc/renesas/rcar/ssi.c index c65435551283..c61750922aff 100644 --- a/sound/soc/renesas/rcar/ssi.c +++ b/sound/soc/renesas/rcar/ssi.c @@ -537,6 +537,7 @@ static int rsnd_ssi_hw_params(struct rsnd_mod *mod, { struct rsnd_dai *rdai =3D rsnd_io_to_rdai(io); unsigned int fmt_width =3D snd_pcm_format_width(params_format(params)); + int ret; =20 if (fmt_width > rdai->chan_width) { struct rsnd_priv *priv =3D rsnd_io_to_priv(io); @@ -546,6 +547,21 @@ static int rsnd_ssi_hw_params(struct rsnd_mod *mod, return -EINVAL; } =20 + /* RZ/G3E: prepare clocks here (can sleep) */ + ret =3D rsnd_adg_ssi_clk_prepare(mod); + if (ret < 0) + return ret; + + return 0; +} + +static int rsnd_ssi_hw_free(struct rsnd_mod *mod, + struct rsnd_dai_stream *io, + struct snd_pcm_substream *substream) +{ + /* RZ/G3E: unprepare clocks here (can sleep) */ + rsnd_adg_ssi_clk_unprepare(mod); + return 0; } =20 @@ -956,6 +972,7 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops =3D { .pointer =3D rsnd_ssi_pio_pointer, .pcm_new =3D rsnd_ssi_pcm_new, .hw_params =3D rsnd_ssi_hw_params, + .hw_free =3D rsnd_ssi_hw_free, .get_status =3D rsnd_ssi_get_status, }; =20 @@ -1070,6 +1087,7 @@ static struct rsnd_mod_ops rsnd_ssi_dma_ops =3D { .pcm_new =3D rsnd_ssi_pcm_new, .fallback =3D rsnd_ssi_fallback, .hw_params =3D rsnd_ssi_hw_params, + .hw_free =3D rsnd_ssi_hw_free, .get_status =3D rsnd_ssi_get_status, DEBUG_INFO }; --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7F87230FC26; Thu, 2 Apr 2026 16:26:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147173; cv=none; b=PHQvmYaHtpRHY8K3NFU33jHgSBrsKf39sEjFIF9TF2J5HpyzucAEqvs/f1MHw0PycHtTIICn4Oe4ZIBPp7K1vxDyOr9Uf5RQ/6sRO8nLxnFxzI0btEA49EdRD/ZyyX4HYKEMjZoSALUbtXV3mIT3xyQfpn6QawYQrCNN+67rjIM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147173; c=relaxed/simple; bh=oqA9FCtTDjJ3hkd4hCTmhwM5nYUxzjIzV+i+rJvSrxM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n2ulAALaiQd7RuFTluMusk//uJlTk1hERP7BfJ9lPTEEHEQl3SP4pMRlDzhI6oRjACOFUqrX785HAy13SXa9sdd/S4TEkPWd69lJ/+lqBTJEjiyQXY+eZUs+WmInqlTfPjBb5EnZ16xyDty+SUdeVambP+PjCxWOcqg5WsJS/r4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: XnEgzdlvRAqDX5C9S1L5nA== X-CSE-MsgGUID: wsNLB5rJTiyUjeTCLfr9yQ== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Apr 2026 01:26:10 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 6F818401911D; Fri, 3 Apr 2026 01:26:05 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 11/14] ASoC: rsnd: src: Add SRC reset and clock support for RZ/G3E Date: Thu, 2 Apr 2026 18:24:33 +0200 Message-ID: <20260402162436.12059-12-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The RZ/G3E SoC requires explicit SCU (Sampling Rate Converter Unit) reset and clock management unlike previous R-Car generations: - scu_clk: SCU module clock - scu_clkx2: SCU double-rate clock - scu_supply_clk: SCU supply clock Without these clocks enabled, the SRC module cannot operate on RZ/G3E. Add support for the shared SCU reset controller used by the SRC modules on the Renesas RZ/G3E SoC. All SRC instances are gated by the same "scu" reset line. Signed-off-by: John Madieu --- Changes: v3: No changes v2: No changes sound/soc/renesas/rcar/rsnd.h | 7 ++++++ sound/soc/renesas/rcar/src.c | 45 +++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/sound/soc/renesas/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h index 2c5738926093..8700b39b535e 100644 --- a/sound/soc/renesas/rcar/rsnd.h +++ b/sound/soc/renesas/rcar/rsnd.h @@ -632,6 +632,13 @@ struct rsnd_priv { struct clk *audmapp_clk; struct reset_control *audmapp_rstc; =20 + /* + * Below values will be filled in rsnd_src_probe() + */ + struct clk *clk_scu; + struct clk *clk_scu_x2; + struct clk *clk_scu_supply; + spinlock_t lock; unsigned int ssiu_busif_count; unsigned long flags; diff --git a/sound/soc/renesas/rcar/src.c b/sound/soc/renesas/rcar/src.c index 8b58cc20e7a8..e1f609589406 100644 --- a/sound/soc/renesas/rcar/src.c +++ b/sound/soc/renesas/rcar/src.c @@ -516,6 +516,7 @@ static int rsnd_src_init(struct rsnd_mod *mod, struct rsnd_priv *priv) { struct rsnd_src *src =3D rsnd_mod_to_src(mod); + struct device *dev =3D rsnd_priv_to_dev(priv); int ret; =20 /* reset sync convert_rate */ @@ -526,6 +527,12 @@ static int rsnd_src_init(struct rsnd_mod *mod, if (ret < 0) return ret; =20 + ret =3D clk_prepare_enable(priv->clk_scu_supply); + if (ret) { + dev_err(dev, "Cannot enable scu_supply_clk\n"); + return ret; + } + rsnd_src_activation(mod); =20 rsnd_src_init_convert_rate(io, mod); @@ -549,6 +556,8 @@ static int rsnd_src_quit(struct rsnd_mod *mod, src->sync.val =3D src->current_sync_rate =3D 0; =20 + clk_disable_unprepare(priv->clk_scu_supply); + return 0; } =20 @@ -711,8 +720,9 @@ struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *pri= v, int id) =20 int rsnd_src_probe(struct rsnd_priv *priv) { - struct device_node *node; struct device *dev =3D rsnd_priv_to_dev(priv); + struct reset_control *rstc; + struct device_node *node; struct rsnd_src *src; struct clk *clk; char name[RSND_SRC_NAME_SIZE]; @@ -737,6 +747,27 @@ int rsnd_src_probe(struct rsnd_priv *priv) priv->src_nr =3D nr; priv->src =3D src; =20 + priv->clk_scu =3D devm_clk_get_optional_enabled(dev, "scu"); + if (IS_ERR(priv->clk_scu)) { + ret =3D dev_err_probe(dev, PTR_ERR(priv->clk_scu), + "failed to get scu clock\n"); + goto rsnd_src_probe_done; + } + + priv->clk_scu_x2 =3D devm_clk_get_optional_enabled(dev, "scu_x2"); + if (IS_ERR(priv->clk_scu_x2)) { + ret =3D dev_err_probe(dev, PTR_ERR(priv->clk_scu_x2), + "failed to get scu_x2 clock\n"); + goto rsnd_src_probe_done; + } + + priv->clk_scu_supply =3D devm_clk_get_optional(dev, "scu_supply"); + if (IS_ERR(priv->clk_scu_supply)) { + ret =3D dev_err_probe(dev, PTR_ERR(priv->clk_scu_supply), + "failed to get scu_supply clock\n"); + goto rsnd_src_probe_done; + } + i =3D 0; for_each_child_of_node_scoped(node, np) { if (!of_device_is_available(np)) @@ -759,6 +790,16 @@ int rsnd_src_probe(struct rsnd_priv *priv) goto rsnd_src_probe_done; } =20 + /* + * RZ/G3E uses a shared SCU reset controller for all SRC modules. + * R-Car platforms typically don't have SRC reset controls. + */ + rstc =3D devm_reset_control_get_optional_shared(dev, "scu"); + if (IS_ERR(rstc)) { + ret =3D PTR_ERR(rstc); + goto rsnd_src_probe_done; + } + clk =3D devm_clk_get(dev, name); if (IS_ERR(clk)) { ret =3D PTR_ERR(clk); @@ -766,7 +807,7 @@ int rsnd_src_probe(struct rsnd_priv *priv) } =20 ret =3D rsnd_mod_init(priv, rsnd_mod_get(src), - &rsnd_src_ops, clk, NULL, RSND_MOD_SRC, i); + &rsnd_src_ops, clk, rstc, RSND_MOD_SRC, i); if (ret) goto rsnd_src_probe_done; =20 --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BF9923F0AB0; Thu, 2 Apr 2026 16:26:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147178; cv=none; b=WScIhWW8+mmEZ5rKw/FBHEZKTvvsEe+/n+Vqbg+njSvC1G+4ODUq4MiyhlK09x3pisqgrRU5L+aWcoqocZdzj4n6KPB0oQt180gdINH7aXxV35QsUeoLSkA4V29i3R8SDO8/aypt5Nh1IwvwR/1A6Y8v5znUxUPyqe6xRevS4Ek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147178; c=relaxed/simple; bh=jybpBL0C3UTwg19W79ip5i/N9B/YhKEN2YkEI5P8cDQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dfTl+6zDLEHEJD8WadK45V2OETZ1S4ZCJK+Ye+w3iF/HnPjJ7YXeN/UHC1wwFmKrvHJvj2F6NEh8ASFXKGkNmPDETkzbudwTBthyE9d1EPhOkREUqN+MJxgAvIrAef5/nYmC8mbVq7/9tgiB8YSM88JFhnfm0NjFiMmAqXw8mZc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: 1KTr8n+4QAqgZRYgIdoNdQ== X-CSE-MsgGUID: POPK5Q6JSUaLEnmEShtfew== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Apr 2026 01:26:16 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 31736401911D; Fri, 3 Apr 2026 01:26:10 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 12/14] ASoC: rsnd: Add rsnd_adg_mod_get() for PM support Date: Thu, 2 Apr 2026 18:24:34 +0200 Message-ID: <20260402162436.12059-13-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add rsnd_adg_mod_get() to retrieve the ADG module handle. This is preparation for system suspend/resume support, where the PM callbacks need to access the ADG module to manage its clock and reset state. Other modules (SSI, SRC, CTU, MIX, DVC) already have their getters exported. Signed-off-by: John Madieu --- Changes: v3: No changes v2: Moved export part into a new patch (the next one) sound/soc/renesas/rcar/adg.c | 10 ++++++++++ sound/soc/renesas/rcar/rsnd.h | 1 + 2 files changed, 11 insertions(+) diff --git a/sound/soc/renesas/rcar/adg.c b/sound/soc/renesas/rcar/adg.c index 131a60689f6d..d73f29bc9de7 100644 --- a/sound/soc/renesas/rcar/adg.c +++ b/sound/soc/renesas/rcar/adg.c @@ -906,6 +906,16 @@ int rsnd_adg_probe(struct rsnd_priv *priv) return 0; } =20 +struct rsnd_mod *rsnd_adg_mod_get(struct rsnd_priv *priv) +{ + struct rsnd_adg *adg =3D rsnd_priv_to_adg(priv); + + if (!adg) + return NULL; + + return rsnd_mod_get(adg); +} + void rsnd_adg_remove(struct rsnd_priv *priv) { struct device *dev =3D rsnd_priv_to_dev(priv); diff --git a/sound/soc/renesas/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h index 8700b39b535e..3860e1c4943f 100644 --- a/sound/soc/renesas/rcar/rsnd.h +++ b/sound/soc/renesas/rcar/rsnd.h @@ -618,6 +618,7 @@ int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *cmd_m= od, #define rsnd_adg_clk_disable(priv) rsnd_adg_clk_control(priv, 0) int rsnd_adg_clk_control(struct rsnd_priv *priv, int enable); void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, struct seq_file *m); +struct rsnd_mod *rsnd_adg_mod_get(struct rsnd_priv *priv); =20 /* * R-Car sound priv --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 96E443EFD2A; Thu, 2 Apr 2026 16:26:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147184; cv=none; b=KhhHnNem3GX88nyA4c+vdMpoAXcOOaVk6RHuaSE1yy5vTz8aPnYYmknLCs0EUzcP8LoFPimp8Jy2PQ+RxkjkAB6dNEYQ8HPlCfTJhnk+/kM835ADKs5lKqhGsqrkOExySiB1leVCYWZQRMWr1mzWNwueu/onSkG+c4oTNaBQpt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147184; c=relaxed/simple; bh=jb9uyIPGFq3YPf7/nUlxrA7jLYfE3LblZe9j+F12GMs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ptQ9UrVMzkqYJ2+ARifIMDG56DeDMSoU/8I475NBBkhHT1MUFi2ZDbpgnyuXBPTq6MAcDCT5YKgyyupClB80ufrBVwz/NnE10IIMvZZ7MUyhlqcpN0MRJHiaSsfTjAxEfQAeOfvLnxkVd0IRCtRkDcFAG2vjjRvrCDK4jy0k144= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: LHvO1VwYTZ+dq44Ot15KFg== X-CSE-MsgGUID: vM08R+SXTpOjDKc7TZHheQ== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Apr 2026 01:26:22 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 19C3A401911D; Fri, 3 Apr 2026 01:26:16 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 13/14] ASoC: rsnd: Export rsnd_ssiu_mod_get() for PM support Date: Thu, 2 Apr 2026 18:24:35 +0200 Message-ID: <20260402162436.12059-14-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the static qualifier from rsnd_ssiu_mod_get() and export it via rsnd.h. This is preparation for system suspend/resume support, where the PM callbacks need to access SSIU modules to manage their clock and reset state. Signed-off-by: John Madieu --- Changes: v3: No changes v2: New patch, resulting from a split of the previous one sound/soc/renesas/rcar/rsnd.h | 1 + sound/soc/renesas/rcar/ssiu.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/renesas/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h index 3860e1c4943f..ddaac350a049 100644 --- a/sound/soc/renesas/rcar/rsnd.h +++ b/sound/soc/renesas/rcar/rsnd.h @@ -815,6 +815,7 @@ int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod); int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod); =20 #define rsnd_ssi_of_node(priv) rsnd_parse_of_node(priv, RSND_NODE_SSI) +struct rsnd_mod *rsnd_ssiu_mod_get(struct rsnd_priv *priv, int id); void rsnd_parse_connect_ssi(struct rsnd_dai *rdai, struct device_node *playback, struct device_node *capture); diff --git a/sound/soc/renesas/rcar/ssiu.c b/sound/soc/renesas/rcar/ssiu.c index f377d9414633..1462f02c2a7f 100644 --- a/sound/soc/renesas/rcar/ssiu.c +++ b/sound/soc/renesas/rcar/ssiu.c @@ -434,7 +434,7 @@ static struct rsnd_mod_ops rsnd_ssiu_ops_gen2 =3D { DEBUG_INFO }; =20 -static struct rsnd_mod *rsnd_ssiu_mod_get(struct rsnd_priv *priv, int id) +struct rsnd_mod *rsnd_ssiu_mod_get(struct rsnd_priv *priv, int id) { if (WARN_ON(id < 0 || id >=3D rsnd_ssiu_nr(priv))) id =3D 0; --=20 2.25.1 From nobody Sun Jun 21 16:15:04 2026 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DAC043EFD2A; Thu, 2 Apr 2026 16:26:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147190; cv=none; b=r7FLcglxykj2R/OxtHo7FKeoZjJqKtp4FRy1dmXHW7adg5plHcVk3i/nmpst2r8PM4Lp0P4FF0i9v/n7s/ozc0kpIi6Q/2CaONPvRlUYwQYtkKwQvDc8a4aqIeW9T7ZIE1aNwkIqna1e+p7nZ6MdaAd7zCPjW0AFyu0IC7ky3DA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775147190; c=relaxed/simple; bh=PzZb3xSNwVChB+/GMQGGnDFP2GVYuK9QLShBEZzlf5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qkCKg3ovtb2iIRjervtj+gVmyJ5pRix0WROaYN9kp//A8yf6N/uUNaCAXZxYsOvOBGdVDY6tY3u9gTbRxnjBrDrYNO/QuhR5rz9O0h1NqSLe4rX98VDtKsn/TbHBwEuGxsXr57deCEdNi6MHXrcGgK4tj6RyzKUketGDigUpJN0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-CSE-ConnectionGUID: avwuBm4eRHWCf3dHVj+aKA== X-CSE-MsgGUID: /xWjDa2PQgqhcV/GoQH7cA== Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 03 Apr 2026 01:26:28 +0900 Received: from ubuntu.adwin.renesas.com (unknown [10.226.92.38]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id DF40E401911D; Fri, 3 Apr 2026 01:26:22 +0900 (JST) From: John Madieu To: Kuninori Morimoto , Mark Brown , Liam Girdwood , Geert Uytterhoeven Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Magnus Damm , Philipp Zabel , Claudiu Beznea , Biju Das , john.madieu@gmail.com, linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, John Madieu Subject: [PATCh v3 14/14] ASoC: rsnd: Add system suspend/resume support Date: Thu, 2 Apr 2026 18:24:36 +0200 Message-ID: <20260402162436.12059-15-john.madieu.xa@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> References: <20260402162436.12059-1-john.madieu.xa@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add per-module suspend/resume functions following the existing driver architecture where each module manages its own resources in its own file. core.c provides common clock/reset helpers and orchestrates the calls in the correct order (reverse probe for suspend, probe order for resume). Infrastructure clocks (ADG, audmacpp, SCU) are managed globally using optional APIs to remain transparent to platforms that don't specify these clocks/resets. Signed-off-by: John Madieu --- Changes: v3: No changes v2: - Distribute suspend/resume into per-module files (ssi.c, ssiu.c, src.c, ctu.c, mix.c, dvc.c, adg.c, dma.c) instead of monolithic loops in core.c, following Morimoto-san's architecture suggestion sound/soc/renesas/rcar/adg.c | 16 +++++++++++++ sound/soc/renesas/rcar/core.c | 43 +++++++++++++++++++++++++++++++++-- sound/soc/renesas/rcar/ctu.c | 20 ++++++++++++++++ sound/soc/renesas/rcar/dma.c | 12 ++++++++++ sound/soc/renesas/rcar/dvc.c | 20 ++++++++++++++++ sound/soc/renesas/rcar/mix.c | 20 ++++++++++++++++ sound/soc/renesas/rcar/rsnd.h | 22 ++++++++++++++++++ sound/soc/renesas/rcar/src.c | 26 +++++++++++++++++++++ sound/soc/renesas/rcar/ssi.c | 20 ++++++++++++++++ sound/soc/renesas/rcar/ssiu.c | 20 ++++++++++++++++ 10 files changed, 217 insertions(+), 2 deletions(-) diff --git a/sound/soc/renesas/rcar/adg.c b/sound/soc/renesas/rcar/adg.c index d73f29bc9de7..b84627c0f32d 100644 --- a/sound/soc/renesas/rcar/adg.c +++ b/sound/soc/renesas/rcar/adg.c @@ -930,3 +930,19 @@ void rsnd_adg_remove(struct rsnd_priv *priv) /* It should be called after rsnd_adg_clk_disable() */ rsnd_adg_null_clk_clean(priv); } + +void rsnd_adg_suspend(struct rsnd_priv *priv) +{ + struct rsnd_mod *mod =3D rsnd_adg_mod_get(priv); + + if (mod) + rsnd_suspend_clk_reset(mod->clk, mod->rstc); +} + +void rsnd_adg_resume(struct rsnd_priv *priv) +{ + struct rsnd_mod *mod =3D rsnd_adg_mod_get(priv); + + if (mod) + rsnd_resume_clk_reset(mod->clk, mod->rstc); +} diff --git a/sound/soc/renesas/rcar/core.c b/sound/soc/renesas/rcar/core.c index d85c614af598..ff19c49b57e8 100644 --- a/sound/soc/renesas/rcar/core.c +++ b/sound/soc/renesas/rcar/core.c @@ -961,7 +961,8 @@ static int rsnd_soc_hw_rule_channels(struct snd_pcm_hw_= params *params, static const struct snd_pcm_hardware rsnd_pcm_hardware =3D { .info =3D SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID, + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_RESUME, .buffer_bytes_max =3D 64 * 1024, .period_bytes_min =3D 32, .period_bytes_max =3D 8192, @@ -2058,11 +2059,35 @@ static void rsnd_remove(struct platform_device *pde= v) remove_func[i](priv); } =20 +void rsnd_suspend_clk_reset(struct clk *clk, struct reset_control *rstc) +{ + clk_unprepare(clk); + reset_control_assert(rstc); +} + +void rsnd_resume_clk_reset(struct clk *clk, struct reset_control *rstc) +{ + reset_control_deassert(rstc); + clk_prepare(clk); +} + static int rsnd_suspend(struct device *dev) { struct rsnd_priv *priv =3D dev_get_drvdata(dev); =20 + /* + * Reverse order of probe: + * ADG -> DVC -> MIX -> CTU -> SRC -> SSIU -> SSI -> DMA + */ rsnd_adg_clk_disable(priv); + rsnd_adg_suspend(priv); + rsnd_dvc_suspend(priv); + rsnd_mix_suspend(priv); + rsnd_ctu_suspend(priv); + rsnd_src_suspend(priv); + rsnd_ssiu_suspend(priv); + rsnd_ssi_suspend(priv); + rsnd_dma_suspend(priv); =20 return 0; } @@ -2071,7 +2096,21 @@ static int rsnd_resume(struct device *dev) { struct rsnd_priv *priv =3D dev_get_drvdata(dev); =20 - return rsnd_adg_clk_enable(priv); + /* + * Same order as probe: + * DMA -> SSI -> SSIU -> SRC -> CTU -> MIX -> DVC -> ADG + */ + rsnd_dma_resume(priv); + rsnd_ssi_resume(priv); + rsnd_ssiu_resume(priv); + rsnd_src_resume(priv); + rsnd_ctu_resume(priv); + rsnd_mix_resume(priv); + rsnd_dvc_resume(priv); + rsnd_adg_resume(priv); + rsnd_adg_clk_enable(priv); + + return 0; } =20 static const struct dev_pm_ops rsnd_pm_ops =3D { diff --git a/sound/soc/renesas/rcar/ctu.c b/sound/soc/renesas/rcar/ctu.c index 81bba6a1af6e..73795d5b2817 100644 --- a/sound/soc/renesas/rcar/ctu.c +++ b/sound/soc/renesas/rcar/ctu.c @@ -383,3 +383,23 @@ void rsnd_ctu_remove(struct rsnd_priv *priv) rsnd_mod_quit(rsnd_mod_get(ctu)); } } + +void rsnd_ctu_suspend(struct rsnd_priv *priv) +{ + struct rsnd_ctu *ctu; + int i; + + for_each_rsnd_ctu(ctu, priv, i) + rsnd_suspend_clk_reset(rsnd_mod_get(ctu)->clk, + rsnd_mod_get(ctu)->rstc); +} + +void rsnd_ctu_resume(struct rsnd_priv *priv) +{ + struct rsnd_ctu *ctu; + int i; + + for_each_rsnd_ctu(ctu, priv, i) + rsnd_resume_clk_reset(rsnd_mod_get(ctu)->clk, + rsnd_mod_get(ctu)->rstc); +} diff --git a/sound/soc/renesas/rcar/dma.c b/sound/soc/renesas/rcar/dma.c index 5b63206361ef..b1b07072cf8e 100644 --- a/sound/soc/renesas/rcar/dma.c +++ b/sound/soc/renesas/rcar/dma.c @@ -984,3 +984,15 @@ int rsnd_dma_probe(struct rsnd_priv *priv) /* dummy mem mod for debug */ return rsnd_mod_init(NULL, &mem, &mem_ops, NULL, NULL, 0, 0); } + +void rsnd_dma_suspend(struct rsnd_priv *priv) +{ + clk_disable_unprepare(priv->audmapp_clk); + rsnd_suspend_clk_reset(NULL, priv->audmapp_rstc); +} + +void rsnd_dma_resume(struct rsnd_priv *priv) +{ + rsnd_resume_clk_reset(NULL, priv->audmapp_rstc); + clk_prepare_enable(priv->audmapp_clk); +} diff --git a/sound/soc/renesas/rcar/dvc.c b/sound/soc/renesas/rcar/dvc.c index bf7146ceb5f6..0e81fdf0e97b 100644 --- a/sound/soc/renesas/rcar/dvc.c +++ b/sound/soc/renesas/rcar/dvc.c @@ -386,3 +386,23 @@ void rsnd_dvc_remove(struct rsnd_priv *priv) rsnd_mod_quit(rsnd_mod_get(dvc)); } } + +void rsnd_dvc_suspend(struct rsnd_priv *priv) +{ + struct rsnd_dvc *dvc; + int i; + + for_each_rsnd_dvc(dvc, priv, i) + rsnd_suspend_clk_reset(rsnd_mod_get(dvc)->clk, + rsnd_mod_get(dvc)->rstc); +} + +void rsnd_dvc_resume(struct rsnd_priv *priv) +{ + struct rsnd_dvc *dvc; + int i; + + for_each_rsnd_dvc(dvc, priv, i) + rsnd_resume_clk_reset(rsnd_mod_get(dvc)->clk, + rsnd_mod_get(dvc)->rstc); +} diff --git a/sound/soc/renesas/rcar/mix.c b/sound/soc/renesas/rcar/mix.c index 566e9b2a488c..42bb07ade3c8 100644 --- a/sound/soc/renesas/rcar/mix.c +++ b/sound/soc/renesas/rcar/mix.c @@ -350,3 +350,23 @@ void rsnd_mix_remove(struct rsnd_priv *priv) rsnd_mod_quit(rsnd_mod_get(mix)); } } + +void rsnd_mix_suspend(struct rsnd_priv *priv) +{ + struct rsnd_mix *mix; + int i; + + for_each_rsnd_mix(mix, priv, i) + rsnd_suspend_clk_reset(rsnd_mod_get(mix)->clk, + rsnd_mod_get(mix)->rstc); +} + +void rsnd_mix_resume(struct rsnd_priv *priv) +{ + struct rsnd_mix *mix; + int i; + + for_each_rsnd_mix(mix, priv, i) + rsnd_resume_clk_reset(rsnd_mod_get(mix)->clk, + rsnd_mod_get(mix)->rstc); +} diff --git a/sound/soc/renesas/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h index ddaac350a049..4b62e051e3e1 100644 --- a/sound/soc/renesas/rcar/rsnd.h +++ b/sound/soc/renesas/rcar/rsnd.h @@ -921,4 +921,26 @@ void rsnd_debugfs_mod_reg_show(struct seq_file *m, str= uct rsnd_mod *mod, #define rsnd_debugfs_probe NULL #endif =20 +/* PM helpers */ +void rsnd_suspend_clk_reset(struct clk *clk, struct reset_control *rstc); +void rsnd_resume_clk_reset(struct clk *clk, struct reset_control *rstc); + +/* Per-module suspend/resume */ +void rsnd_ssi_suspend(struct rsnd_priv *priv); +void rsnd_ssi_resume(struct rsnd_priv *priv); +void rsnd_ssiu_suspend(struct rsnd_priv *priv); +void rsnd_ssiu_resume(struct rsnd_priv *priv); +void rsnd_src_suspend(struct rsnd_priv *priv); +void rsnd_src_resume(struct rsnd_priv *priv); +void rsnd_ctu_suspend(struct rsnd_priv *priv); +void rsnd_ctu_resume(struct rsnd_priv *priv); +void rsnd_mix_suspend(struct rsnd_priv *priv); +void rsnd_mix_resume(struct rsnd_priv *priv); +void rsnd_dvc_suspend(struct rsnd_priv *priv); +void rsnd_dvc_resume(struct rsnd_priv *priv); +void rsnd_adg_suspend(struct rsnd_priv *priv); +void rsnd_adg_resume(struct rsnd_priv *priv); +void rsnd_dma_suspend(struct rsnd_priv *priv); +void rsnd_dma_resume(struct rsnd_priv *priv); + #endif /* RSND_H */ diff --git a/sound/soc/renesas/rcar/src.c b/sound/soc/renesas/rcar/src.c index e1f609589406..51190deaeee0 100644 --- a/sound/soc/renesas/rcar/src.c +++ b/sound/soc/renesas/rcar/src.c @@ -832,3 +832,29 @@ void rsnd_src_remove(struct rsnd_priv *priv) rsnd_mod_quit(rsnd_mod_get(src)); } } + +void rsnd_src_suspend(struct rsnd_priv *priv) +{ + struct rsnd_src *src; + int i; + + for_each_rsnd_src(src, priv, i) + rsnd_suspend_clk_reset(rsnd_mod_get(src)->clk, + rsnd_mod_get(src)->rstc); + + clk_disable_unprepare(priv->clk_scu_x2); + clk_disable_unprepare(priv->clk_scu); +} + +void rsnd_src_resume(struct rsnd_priv *priv) +{ + struct rsnd_src *src; + int i; + + clk_prepare_enable(priv->clk_scu); + clk_prepare_enable(priv->clk_scu_x2); + + for_each_rsnd_src(src, priv, i) + rsnd_resume_clk_reset(rsnd_mod_get(src)->clk, + rsnd_mod_get(src)->rstc); +} diff --git a/sound/soc/renesas/rcar/ssi.c b/sound/soc/renesas/rcar/ssi.c index c61750922aff..f5333c9e7c33 100644 --- a/sound/soc/renesas/rcar/ssi.c +++ b/sound/soc/renesas/rcar/ssi.c @@ -1279,3 +1279,23 @@ void rsnd_ssi_remove(struct rsnd_priv *priv) rsnd_mod_quit(rsnd_mod_get(ssi)); } } + +void rsnd_ssi_suspend(struct rsnd_priv *priv) +{ + struct rsnd_ssi *ssi; + int i; + + for_each_rsnd_ssi(ssi, priv, i) + rsnd_suspend_clk_reset(rsnd_mod_get(ssi)->clk, + rsnd_mod_get(ssi)->rstc); +} + +void rsnd_ssi_resume(struct rsnd_priv *priv) +{ + struct rsnd_ssi *ssi; + int i; + + for_each_rsnd_ssi(ssi, priv, i) + rsnd_resume_clk_reset(rsnd_mod_get(ssi)->clk, + rsnd_mod_get(ssi)->rstc); +} diff --git a/sound/soc/renesas/rcar/ssiu.c b/sound/soc/renesas/rcar/ssiu.c index 1462f02c2a7f..9cb9d12cee1f 100644 --- a/sound/soc/renesas/rcar/ssiu.c +++ b/sound/soc/renesas/rcar/ssiu.c @@ -614,3 +614,23 @@ void rsnd_ssiu_remove(struct rsnd_priv *priv) rsnd_mod_quit(rsnd_mod_get(ssiu)); } } + +void rsnd_ssiu_suspend(struct rsnd_priv *priv) +{ + struct rsnd_ssiu *ssiu; + int i; + + for_each_rsnd_ssiu(ssiu, priv, i) + rsnd_suspend_clk_reset(rsnd_mod_get(ssiu)->clk, + rsnd_mod_get(ssiu)->rstc); +} + +void rsnd_ssiu_resume(struct rsnd_priv *priv) +{ + struct rsnd_ssiu *ssiu; + int i; + + for_each_rsnd_ssiu(ssiu, priv, i) + rsnd_resume_clk_reset(rsnd_mod_get(ssiu)->clk, + rsnd_mod_get(ssiu)->rstc); +} --=20 2.25.1