add MFD support for MediaTek audio subsystem

As the new MFD parent is in place, switch probing method to adapt it.

Signed-off-by Ryder Lee <[email protected]>

---
 drivers/clk/mediatek/clk-mt7622-aud.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/clk/mediatek/clk-mt7622-aud.c +0 -0

index 13f752d..8c18536 100644

drivers/clk/mediatek/clk-mt7622-aud.c +0 -0

 			       clk_data);
 
 	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

Quoted 20 lines · Ryder Lee

As the new MFD parent is in place, switch probing method to adapt it.

Signed-off-by Ryder Lee <[email protected]>

---
 drivers/clk/mediatek/clk-mt7622-aud.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/clk/mediatek/clk-mt7622-aud.c +1 -0

index 13f752d..8c18536 100644
@@ -142,11 +142,12 @@ static int clk_mt7622_audiosys_init(struct platform_device *pdev)
 {
 	struct clk_onecell_data *clk_data;
 	struct device_node *node = pdev->dev.of_node;
+	struct device_node *pnode = pdev->dev.parent->of_node;
 	int r;
 
 	clk_data = mtk_alloc_clk_data(CLK_AUDIO_NR_CLK);
 

drivers/clk/mediatek/clk-mt7622-aud.c static int clk_mt7622_audiosys_init(struct platform_device *pdev) · line 150

Quoted 2 lines

drivers/clk/mediatek/clk-mt7622-aud.c +1 -1

-	mtk_clk_register_gates(node, audio_clks, ARRAY_SIZE(audio_clks),
+	mtk_clk_register_gates(pnode, audio_clks, ARRAY_SIZE(audio_clks),

We will need a fallback here for older device tree bindings.

Regards,
Matthias

Add missing clock data 'CLK_AUDIO_AFE_CONN' for MT7622 audsys.

Signed-off-by Ryder Lee <[email protected]>

---
 drivers/clk/mediatek/clk-mt7622-aud.c  | 1 +
 include/dt-bindings/clock/mt7622-clk.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

As the MediaTek audio hardware block that expose functionalities that are handled by separate subsystems in the kernel, and there are registers that are shared between related drivers.

Switch the current device to an MFD device, add more descriptions about the subsystem and modify example accordingly.

Signed-off-by Ryder Lee <[email protected]>

---
 .../bindings/arm/mediatek/mediatek,audsys.txt      | 37 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +0 -0

index 9b8f578..677af40 100644

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +6 -0

+- reg: register area of the Audio Subsystem
+
+Required sub-nodes:
+
+AUDSYS clocks:
+-------
 The MediaTek AUDSYS controller provides various clocks to the system.
 
 Required Properties:

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +16 -5

+AFE components:
+-------
+For common binding part and usage, refer to
+../sonud/mt2701-afe-pcm.txt.
+
 Example:
 
-audsys: audsys at 11220000 {
-	compatible = "mediatek,mt7622-audsys", "syscon";
-	reg = <0 0x11220000 0 0x1000>;
-	#clock-cells = <1>;
-};
+	audio-subsystem at 11220000 {
+		compatible = "syscon", "simple-mfd";
+		reg = <0 0x11220000 0 0x2000>;
+
+		audsys: clock {
+			compatible = "mediatek,mt2701-audsys";
+			#clock-cells = <1>;
+		};
+
+		...
+	};

Signature · 1 line

1.9.1

Quoted 24 lines · Ryder Lee

As the MediaTek audio hardware block that expose functionalities that are handled by separate subsystems in the kernel, and there are registers that are shared between related drivers.

Switch the current device to an MFD device, add more descriptions about the subsystem and modify example accordingly.

Signed-off-by Ryder Lee <[email protected]>

---
 .../bindings/arm/mediatek/mediatek,audsys.txt      | 37 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +4 -1

index 9b8f578..677af40 100644
@@ -1,22 +1,45 @@
-MediaTek AUDSYS controller
+MediaTek Audio Subsystem
 ============================
+The audio subsystem is one of the multi-function blocks of MediaTek SoCs.
+It contains a system controller, which provides a number registers giving
+access to two features: AUDSYS clocks and Audio Front End (AFE) components.
 

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt line 8

Quoted 2 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +2 -0

+For the top level node:
+- compatible: must be: "syscon", "simple-mfd";

This should have some SoC specific compatible.

Quoted 16 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +8 -1

+- reg: register area of the Audio Subsystem
+
+Required sub-nodes:
+
+AUDSYS clocks:
+-------
 The MediaTek AUDSYS controller provides various clocks to the system.
 
 Required Properties:
 
 - compatible: Should be one of:
-	- "mediatek,mt7622-audsys", "syscon"
+	- "mediatek,mt2701-audsys";
+	- "mediatek,mt7622-audsys";
 - #clock-cells: Must be 1
 

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt line 26

Quoted 3 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +0 -0

 The AUDSYS controller uses the common clk binding from
 Documentation/devicetree/bindings/clock/clock-bindings.txt
 The available clocks are defined in dt-bindings/clock/mt*-clk.h.

There's no register range associated with the clocks? If there is, add a reg property.

Quoted 27 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +16 -5

+AFE components:
+-------
+For common binding part and usage, refer to
+../sonud/mt2701-afe-pcm.txt.
+
 Example:
 
-audsys: audsys at 11220000 {
-	compatible = "mediatek,mt7622-audsys", "syscon";
-	reg = <0 0x11220000 0 0x1000>;
-	#clock-cells = <1>;
-};
+	audio-subsystem at 11220000 {
+		compatible = "syscon", "simple-mfd";
+		reg = <0 0x11220000 0 0x2000>;
+
+		audsys: clock {
+			compatible = "mediatek,mt2701-audsys";
+			#clock-cells = <1>;
+		};
+
+		...
+	};

Signature · 1 line

1.9.1

_______________________________________________
Linux-mediatek mailing list
Linux-mediatek at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek

Quoted 27 lines · Matthias Brugger

Quoted 12 lines · Ryder Lee

As the new MFD parent is in place, switch probing method to adapt it.

Signed-off-by Ryder Lee <[email protected]>

---
 drivers/clk/mediatek/clk-mt7622-aud.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/clk/mediatek/clk-mt7622-aud.c +0 -0

index 13f752d..8c18536 100644

drivers/clk/mediatek/clk-mt7622-aud.c static int clk_mt7622_audiosys_init(struct platform_device *pdev) · line 150

Quoted 10 lines

drivers/clk/mediatek/clk-mt7622-aud.c +2 -1

@@ -142,11 +142,12 @@ static int clk_mt7622_audiosys_init(struct platform_device *pdev)
 {
 	struct clk_onecell_data *clk_data;
 	struct device_node *node = pdev->dev.of_node;
+	struct device_node *pnode = pdev->dev.parent->of_node;
 	int r;
 
 	clk_data = mtk_alloc_clk_data(CLK_AUDIO_NR_CLK);
 
-	mtk_clk_register_gates(node, audio_clks, ARRAY_SIZE(audio_clks),
+	mtk_clk_register_gates(pnode, audio_clks, ARRAY_SIZE(audio_clks),

We will need a fallback here for older device tree bindings.

Quoted 2 lines

Regards,
Matthias

Up to now, I didn't see both driver and bindings are used anywhere. Should I still care about that?

Quoted 25 lines · Rob Herring

Quoted 24 lines · Ryder Lee

As the MediaTek audio hardware block that expose functionalities that are handled by separate subsystems in the kernel, and there are registers that are shared between related drivers.

Switch the current device to an MFD device, add more descriptions about the subsystem and modify example accordingly.

Signed-off-by Ryder Lee <[email protected]>

---
 .../bindings/arm/mediatek/mediatek,audsys.txt      | 37 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +4 -1

index 9b8f578..677af40 100644
@@ -1,22 +1,45 @@
-MediaTek AUDSYS controller
+MediaTek Audio Subsystem
 ============================
+The audio subsystem is one of the multi-function blocks of MediaTek SoCs.
+It contains a system controller, which provides a number registers giving
+access to two features: AUDSYS clocks and Audio Front End (AFE) components.
 

Quoted 4 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt line 8

Quoted 2 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +2 -0

+For the top level node:
+- compatible: must be: "syscon", "simple-mfd";

This should have some SoC specific compatible.

As we don't have a specific driver (compatible string) for it and if we need to add that I think the term '*-audsys' is very suitable here, but unfortunately, it has already picked for clock driver (see child node).

I also took ../../marvell/*-system-controller.txt as examples for my case. Thus, I'm not sure should we still need a new one here?

Quoted 16 lines

Quoted 16 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +8 -1

+- reg: register area of the Audio Subsystem
+
+Required sub-nodes:
+
+AUDSYS clocks:
+-------
 The MediaTek AUDSYS controller provides various clocks to the system.
 
 Required Properties:
 
 - compatible: Should be one of:
-   - "mediatek,mt7622-audsys", "syscon"
+   - "mediatek,mt2701-audsys";
+   - "mediatek,mt7622-audsys";
 - #clock-cells: Must be 1
 

Quoted 6 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt line 26

Quoted 3 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +0 -0

 The AUDSYS controller uses the common clk binding from
 Documentation/devicetree/bindings/clock/clock-bindings.txt
 The available clocks are defined in dt-bindings/clock/mt*-clk.h.

There's no register range associated with the clocks? If there is, add a reg property.

No, we don't need reg property here, as the two sub-drivers will obtain the regmap which is propagated from the parent.

Quoted 12 lines

Quoted 12 lines

Quoted 12 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +4 -1

index 9b8f578..677af40 100644
@@ -1,22 +1,45 @@
-MediaTek AUDSYS controller
+MediaTek Audio Subsystem
 ============================
+The audio subsystem is one of the multi-function blocks of MediaTek SoCs.
+It contains a system controller, which provides a number registers giving
+access to two features: AUDSYS clocks and Audio Front End (AFE) components.
 

Quoted 8 lines

Quoted 4 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt line 8

Quoted 2 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +2 -0

+For the top level node:
+- compatible: must be: "syscon", "simple-mfd";

This should have some SoC specific compatible.

As we don't have a specific driver (compatible string) for it and if we need to add that I think the term '*-audsys' is very suitable here, but unfortunately, it has already picked for clock driver (see child node).

Perhaps the clocks block should have "-clk" on the end or something.

Why do you really need to change this in the first place? You don't have to have DT child nodes to create child (struct) devices and child drivers.

Quoted 21 lines

Quoted 20 lines

Quoted 7 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +4 -0

+Required sub-nodes:
+
+AUDSYS clocks:
+-------
 The MediaTek AUDSYS controller provides various clocks to the system.
 
 Required Properties:

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt line 26

Quoted 10 lines

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +2 -1

 
 - compatible: Should be one of:
-   - "mediatek,mt7622-audsys", "syscon"
+   - "mediatek,mt2701-audsys";
+   - "mediatek,mt7622-audsys";
 - #clock-cells: Must be 1
 
 The AUDSYS controller uses the common clk binding from
 Documentation/devicetree/bindings/clock/clock-bindings.txt
 The available clocks are defined in dt-bindings/clock/mt*-clk.h.

There's no register range associated with the clocks? If there is, add a reg property.

Quoted 2 lines

No, we don't need reg property here, as the two sub-drivers will obtain the regmap which is propagated from the parent.

I know regmap doesn't need it. That's not what I asked. If you have a range of registers for the clocks, then define that in reg. Only if the clock control bits are mixed up with other functions within the same registers, then you can omit it.

Quoted 31 lines · Ryder Lee

Quoted 29 lines · Matthias Brugger

Quoted 12 lines · Ryder Lee

As the new MFD parent is in place, switch probing method to adapt it.

Signed-off-by Ryder Lee <[email protected]>

---
 drivers/clk/mediatek/clk-mt7622-aud.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/clk/mediatek/clk-mt7622-aud.c +0 -0

index 13f752d..8c18536 100644

drivers/clk/mediatek/clk-mt7622-aud.c static int clk_mt7622_audiosys_init(struct platform_device *pdev) · line 150

Quoted 10 lines

drivers/clk/mediatek/clk-mt7622-aud.c +2 -1

@@ -142,11 +142,12 @@ static int clk_mt7622_audiosys_init(struct platform_device *pdev)
 {
 	struct clk_onecell_data *clk_data;
 	struct device_node *node = pdev->dev.of_node;
+	struct device_node *pnode = pdev->dev.parent->of_node;
 	int r;
 
 	clk_data = mtk_alloc_clk_data(CLK_AUDIO_NR_CLK);
 
-	mtk_clk_register_gates(node, audio_clks, ARRAY_SIZE(audio_clks),
+	mtk_clk_register_gates(pnode, audio_clks, ARRAY_SIZE(audio_clks),

We will need a fallback here for older device tree bindings.

Regards,
Matthias

Quoted 3 lines

Up to now, I didn't see both driver and bindings are used anywhere. Should I still care about that?

Yes please, we have to ensure that newer kernel work with older bindings and vice-versa.

Quoted 37 lines · Matthias Brugger

Quoted 34 lines · Ryder Lee

Quoted 22 lines · Matthias Brugger

Quoted 20 lines · Ryder Lee

As the new MFD parent is in place, switch probing method to adapt it.

Signed-off-by Ryder Lee <[email protected]>

---
 drivers/clk/mediatek/clk-mt7622-aud.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/clk/mediatek/clk-mt7622-aud.c +1 -0

index 13f752d..8c18536 100644
@@ -142,11 +142,12 @@ static int clk_mt7622_audiosys_init(struct platform_device *pdev)
 {
 	struct clk_onecell_data *clk_data;
 	struct device_node *node = pdev->dev.of_node;
+	struct device_node *pnode = pdev->dev.parent->of_node;
 	int r;
 
 	clk_data = mtk_alloc_clk_data(CLK_AUDIO_NR_CLK);
 

Quoted 7 lines

drivers/clk/mediatek/clk-mt7622-aud.c static int clk_mt7622_audiosys_init(struct platform_device *pdev) · line 150

Quoted 2 lines

drivers/clk/mediatek/clk-mt7622-aud.c +1 -1

-	mtk_clk_register_gates(node, audio_clks, ARRAY_SIZE(audio_clks),
+	mtk_clk_register_gates(pnode, audio_clks, ARRAY_SIZE(audio_clks),

We will need a fallback here for older device tree bindings.

Regards,
Matthias

Up to now, I didn't see both driver and bindings are used anywhere. Should I still care about that?

Quoted 2 lines

Yes please, we have to ensure that newer kernel work with older bindings and vice-versa.

OKay. An unrelated question - is it possible to change the compatible string (*-audsys-clk) without breaking backward compatible?