[PATCH 0/3] Add F1C100s audio support

[PATCH 0/3] Add F1C100s audio support

[Csókás, Bence]

Support for Allwinner F1C100s/200s series audio was
merged in the for-next branches of the DMA and ALSA
trees, the last step is to add the codec to DT.
This series was forward-ported/rebased to the best of
my abilities, on top of Linus' tree as of now:
commit feffde684ac2 ("Merge tag 'for-6.13-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux")

Mesih Kilinc (3):
  ARM: dts: suniv: f1c100s: Add support for DMA
  ARM: dts: suniv: f1c100s: Add support for Audio Codec
  ARM: dts: suniv: f1c100s: Activate Audio Codec for Lichee Pi Nano

 .../allwinner/suniv-f1c100s-licheepi-nano.dts |  8 +++++++
 .../arm/boot/dts/allwinner/suniv-f1c100s.dtsi | 24 +++++++++++++++++++
 2 files changed, 32 insertions(+)

-- 
2.34.1

[PATCH 1/3] ARM: dts: suniv: f1c100s: Add support for DMA

[Csókás, Bence]

From: Mesih Kilinc <mesihkilinc@gmail.com>

Allwinner suniv F1C100s now has DMA support. Enable it under device
tree.

Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com>
[ csokas.bence: Rebased on current master ]
Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>
---
 arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
index 3c61d59ab5f8..290efe026ceb 100644
--- a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
+++ b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
@@ -6,6 +6,7 @@
 
 #include <dt-bindings/clock/suniv-ccu-f1c100s.h>
 #include <dt-bindings/reset/suniv-ccu-f1c100s.h>
+#include <dt-bindings/dma/sun4i-a10.h>
 
 / {
 	#address-cells = <1>;
@@ -159,6 +160,15 @@ usbphy: phy@1c13400 {
 			status = "disabled";
 		};
 
+		dma: dma-controller@1c02000 {
+			compatible = "allwinner,suniv-f1c100s-dma";
+			reg = <0x01c02000 0x1000>;
+			interrupts = <18>;
+			clocks = <&ccu CLK_BUS_DMA>;
+			resets = <&ccu RST_BUS_DMA>;
+			#dma-cells = <2>;
+		};
+
 		ccu: clock@1c20000 {
 			compatible = "allwinner,suniv-f1c100s-ccu";
 			reg = <0x01c20000 0x400>;
-- 
2.34.1

Re: [PATCH 1/3] ARM: dts: suniv: f1c100s: Add support for DMA

[Andre Przywara]

On Thu, 5 Dec 2024 01:01:36 +0100
"Csókás, Bence" <csokas.bence@prolan.hu> wrote:

> From: Mesih Kilinc <mesihkilinc@gmail.com>
> 
> Allwinner suniv F1C100s now has DMA support. Enable it under device
> tree.
> 
> Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com>
> [ csokas.bence: Rebased on current master ]
> Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>

Compared against the manual:

Reviewed-by: Andre Przywara <andre.przywara@arm.com>

Cheers,
Andre

> ---
>  arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
> index 3c61d59ab5f8..290efe026ceb 100644
> --- a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
> +++ b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
> @@ -6,6 +6,7 @@
>  
>  #include <dt-bindings/clock/suniv-ccu-f1c100s.h>
>  #include <dt-bindings/reset/suniv-ccu-f1c100s.h>
> +#include <dt-bindings/dma/sun4i-a10.h>
>  
>  / {
>  	#address-cells = <1>;
> @@ -159,6 +160,15 @@ usbphy: phy@1c13400 {
>  			status = "disabled";
>  		};
>  
> +		dma: dma-controller@1c02000 {
> +			compatible = "allwinner,suniv-f1c100s-dma";
> +			reg = <0x01c02000 0x1000>;
> +			interrupts = <18>;
> +			clocks = <&ccu CLK_BUS_DMA>;
> +			resets = <&ccu RST_BUS_DMA>;
> +			#dma-cells = <2>;
> +		};
> +
>  		ccu: clock@1c20000 {
>  			compatible = "allwinner,suniv-f1c100s-ccu";
>  			reg = <0x01c20000 0x400>;

Re: [PATCH 1/3] ARM: dts: suniv: f1c100s: Add support for DMA

[Chen-Yu Tsai]

On Tue, Dec 10, 2024 at 1:56 AM Andre Przywara <andre.przywara@arm.com> wrote:
>
> On Thu, 5 Dec 2024 01:01:36 +0100
> "Csókás, Bence" <csokas.bence@prolan.hu> wrote:
>
> > From: Mesih Kilinc <mesihkilinc@gmail.com>
> >
> > Allwinner suniv F1C100s now has DMA support. Enable it under device
> > tree.
> >
> > Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com>
> > [ csokas.bence: Rebased on current master ]
> > Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>
>
> Compared against the manual:
>
> Reviewed-by: Andre Przywara <andre.przywara@arm.com>

These have already been merged. I picked them from their original
series.

ChenYu

> Cheers,
> Andre
>
> > ---
> >  arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi | 10 ++++++++++
> >  1 file changed, 10 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
> > index 3c61d59ab5f8..290efe026ceb 100644
> > --- a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
> > +++ b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
> > @@ -6,6 +6,7 @@
> >
> >  #include <dt-bindings/clock/suniv-ccu-f1c100s.h>
> >  #include <dt-bindings/reset/suniv-ccu-f1c100s.h>
> > +#include <dt-bindings/dma/sun4i-a10.h>
> >
> >  / {
> >       #address-cells = <1>;
> > @@ -159,6 +160,15 @@ usbphy: phy@1c13400 {
> >                       status = "disabled";
> >               };
> >
> > +             dma: dma-controller@1c02000 {
> > +                     compatible = "allwinner,suniv-f1c100s-dma";
> > +                     reg = <0x01c02000 0x1000>;
> > +                     interrupts = <18>;
> > +                     clocks = <&ccu CLK_BUS_DMA>;
> > +                     resets = <&ccu RST_BUS_DMA>;
> > +                     #dma-cells = <2>;
> > +             };
> > +
> >               ccu: clock@1c20000 {
> >                       compatible = "allwinner,suniv-f1c100s-ccu";
> >                       reg = <0x01c20000 0x400>;
>
>

[PATCH 2/3] ARM: dts: suniv: f1c100s: Add support for Audio Codec

[Csókás, Bence]

From: Mesih Kilinc <mesihkilinc@gmail.com>

Allwinner suniv F1C100s now has basic audio codec support. Enable it
under device tree.

Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com>
[ csokas.bence: Rebased on current master ]
Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>
---
 arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
index 290efe026ceb..e4b41bc93852 100644
--- a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
+++ b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
@@ -336,5 +336,19 @@ uart2: serial@1c25800 {
 			resets = <&ccu RST_BUS_UART2>;
 			status = "disabled";
 		};
+
+		codec: codec@1c23c00 {
+			#sound-dai-cells = <0>;
+			compatible = "allwinner,suniv-f1c100s-codec";
+			reg = <0x01c23c00 0x400>;
+			interrupts = <21>;
+			clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_CODEC>;
+			clock-names = "apb", "codec";
+			dmas = <&dma SUN4I_DMA_NORMAL 12>,
+			       <&dma SUN4I_DMA_NORMAL 12>;
+			dma-names = "rx", "tx";
+			resets = <&ccu RST_BUS_CODEC>;
+			status = "disabled";
+		};
 	};
 };
-- 
2.34.1

Re: [PATCH 2/3] ARM: dts: suniv: f1c100s: Add support for Audio Codec

[Andre Przywara]

On Thu, 5 Dec 2024 01:01:37 +0100
"Csókás, Bence" <csokas.bence@prolan.hu> wrote:

> From: Mesih Kilinc <mesihkilinc@gmail.com>
> 
> Allwinner suniv F1C100s now has basic audio codec support. Enable it
> under device tree.
> 
> Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com>
> [ csokas.bence: Rebased on current master ]
> Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>

Compared against the F1C200s user manual:

Reviewed-by: Andre Przywara <andre.przywara@arm.com>

Cheers,
Andre

> ---
>  arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
> index 290efe026ceb..e4b41bc93852 100644
> --- a/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
> +++ b/arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
> @@ -336,5 +336,19 @@ uart2: serial@1c25800 {
>  			resets = <&ccu RST_BUS_UART2>;
>  			status = "disabled";
>  		};
> +
> +		codec: codec@1c23c00 {
> +			#sound-dai-cells = <0>;
> +			compatible = "allwinner,suniv-f1c100s-codec";
> +			reg = <0x01c23c00 0x400>;
> +			interrupts = <21>;
> +			clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_CODEC>;
> +			clock-names = "apb", "codec";
> +			dmas = <&dma SUN4I_DMA_NORMAL 12>,
> +			       <&dma SUN4I_DMA_NORMAL 12>;
> +			dma-names = "rx", "tx";
> +			resets = <&ccu RST_BUS_CODEC>;
> +			status = "disabled";
> +		};
>  	};
>  };

[PATCH 3/3] ARM: dts: suniv: f1c100s: Activate Audio Codec for Lichee Pi Nano

[Csókás, Bence]

From: Mesih Kilinc <mesihkilinc@gmail.com>

Allwinner suniv F1C100s now has basic audio codec support. Activate it
for Lichee Pi Nano board.

Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com>
[ csokas.bence: Moved and fixed conflict ]
Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>
---
 .../boot/dts/allwinner/suniv-f1c100s-licheepi-nano.dts    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/allwinner/suniv-f1c100s-licheepi-nano.dts b/arch/arm/boot/dts/allwinner/suniv-f1c100s-licheepi-nano.dts
index 43896723a994..472ded0aafcf 100644
--- a/arch/arm/boot/dts/allwinner/suniv-f1c100s-licheepi-nano.dts
+++ b/arch/arm/boot/dts/allwinner/suniv-f1c100s-licheepi-nano.dts
@@ -62,6 +62,14 @@ &uart0 {
 	status = "okay";
 };
 
+&codec {
+	allwinner,audio-routing =
+		"Headphone", "HP",
+		"Headphone", "HPCOM",
+		"MIC", "Mic";
+	status = "okay";
+};
+
 &usb_otg {
 	dr_mode = "otg";
 	status = "okay";
-- 
2.34.1

Re: [PATCH 0/3] Add F1C100s audio support

[Chen-Yu Tsai]

On Thu, Dec 5, 2024 at 8:03 AM Csókás, Bence <csokas.bence@prolan.hu> wrote:
>
> Support for Allwinner F1C100s/200s series audio was
> merged in the for-next branches of the DMA and ALSA
> trees, the last step is to add the codec to DT.
> This series was forward-ported/rebased to the best of
> my abilities, on top of Linus' tree as of now:
> commit feffde684ac2 ("Merge tag 'for-6.13-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux")

There's no real need to resend just the DTS bits, though I appreciate
the effort of making it easier to pick. There should be no difference
due to rebasing, since we didn't have many F1C100s changes.

The DTS bits can only be merged after driver bits have been accepted,
otherwise we would get DT validation errors in -next. After the
notifications yesterday, I started to pick the patches, but it got
late so I hadn't pushed them out yet. Just want you to know that they
haven't been forgotten. :)

BTW, if you merge different patch series and resending, please keep
the highest version number, like you would when resending a single
patch series, and also provide reference links to the originals.
That way we know where it came from and which version it was from.
There have been cases where the latest version was rejected and
an older version was resent.


Thanks
ChenYu

> Mesih Kilinc (3):
>   ARM: dts: suniv: f1c100s: Add support for DMA
>   ARM: dts: suniv: f1c100s: Add support for Audio Codec
>   ARM: dts: suniv: f1c100s: Activate Audio Codec for Lichee Pi Nano
>
>  .../allwinner/suniv-f1c100s-licheepi-nano.dts |  8 +++++++
>  .../arm/boot/dts/allwinner/suniv-f1c100s.dtsi | 24 +++++++++++++++++++
>  2 files changed, 32 insertions(+)
>
> --
> 2.34.1
>
>