| Message ID | 87fsymci1d.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | arm64: dts: renesas: r8a77995: draak: add R-Car Sound support | expand |
Hi Morimoto-san, On Mon, May 17, 2021 at 2:37 AM Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > This patch adds R-Car Sound support for D3 draak. Thanks for your patch! > One note is that it is using different clock definition style > from ulcb/salvator boards to avoid verbose clocks settings > on rcar_sound node (see ulcb.dtsi rcar_sound::clocks). > > cs2000 and ADG are closs connected, and needs each other. cross connected? need > ulcb/salvator boards assume drivers are probed cs2000 -> rcar_sound. > This draak board assumes drivers are probed rcar_sound -> cs2000. > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > .../arm64/boot/dts/renesas/r8a77995-draak.dts | 103 ++++++++++++++++++ > 1 file changed, 103 insertions(+) > > diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts > index 6783c3ad0856..591fad289802 100644 > --- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts > +++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts > @@ -6,6 +6,11 @@ > * Copyright (C) 2017 Glider bvba > */ > > +/* > + * This assumes... > + * SW60 : 2-1 Perhaps this comment should be extended (why is this SW60 setting needed?), and moved to the audio block below? > + */ > + > /dts-v1/; > #include "r8a77995.dtsi" > @@ -347,6 +366,39 @@ eeprom@50 { > reg = <0x50>; > pagesize = <8>; > }; > + > + ak4613: codec@10 { > + compatible = "asahi-kasei,ak4613"; > + #sound-dai-cells = <0>; > + reg = <0x10>; > + clocks = <&rcar_sound 0>; /* audio_clkout */ > + > + asahi-kasei,in1-single-end; > + asahi-kasei,in2-single-end; > + asahi-kasei,out1-single-end; > + asahi-kasei,out2-single-end; > + asahi-kasei,out3-single-end; > + asahi-kasei,out4-single-end; > + asahi-kasei,out5-single-end; > + asahi-kasei,out6-single-end; > + > + port { > + ak4613_endpoint: endpoint { > + remote-endpoint = <&rsnd_for_ak4613>; > + }; > + }; The "port" node seems to be missing from the ak4613 DT bindings: arch/arm64/boot/dts/renesas/r8a77995-draak.dt.yaml: codec@10: 'port' does not match any of the regexes: '^asahi-kasei,in[1-2]-single-end$', '^asahi-kasei,out[1-6]-single-end$', 'pinctrl-[0-9]+' From schema: Documentation/devicetree/bindings/sound/ak4613.yaml > +&rcar_sound { > + pinctrl-0 = <&sound_pins>, <&sound_clk_pins>; > + pinctrl-names = "default"; > + > + /* Single DAI */ > + #sound-dai-cells = <0>; arch/arm64/boot/dts/renesas/r8a77995-draak.dt.yaml: sound@ec500000: 'dais' is a required property From schema: Documentation/devicetree/bindings/sound/renesas,rsnd.yaml As this error is reported for all Renesas boards, perhaps the bindings should be fixed instead? > + > + /* audio_clkout0/1 */ > + #clock-cells = <1>; > + clock-frequency = <12288000 11289600>; > + > + status = "okay"; > + > + ports { > + rsnd_port0: port { > + rsnd_for_ak4613: endpoint { > + remote-endpoint = <&ak4613_endpoint>; > + dai-format = "left_j"; > + bitclock-master = <&rsnd_for_ak4613>; > + frame-master = <&rsnd_for_ak4613>; > + playback = <&ssi3>, <&src5>, <&dvc0>; > + capture = <&ssi4>, <&src6>, <&dvc1>; > + }; > + }; > + }; arch/arm64/boot/dts/renesas/r8a77995-draak.dt.yaml: sound@ec500000: 'ports' does not match any of the regexes: '^rcar_sound,ctu$', '^rcar_sound,dai$', '^rcar_sound,dvc$', '^rcar_sound,mix$', '^rcar_sound,src$', '^rcar_sound,ssi$', '^rcar_sound,ssiu$', 'pinctrl-[0-9]+' From schema: Documentation/devicetree/bindings/sound/renesas,rsnd.yaml > +}; > + > +&ssi4 { > + shared-pin; > +}; > + > &pfc { > avb0_pins: avb { > groups = "avb0_link", "avb0_mdio", "avb0_mii"; > @@ -449,6 +541,17 @@ sdhi2_pins_uhs: sd2_uhs { > power-source = <1800>; > }; > > + sound_pins: sound { > + groups = "ssi34_ctrl", "ssi3_data", "ssi4_data_a"; > + function = "ssi"; > + }; > + > + sound_clk_pins: sound-clk { > + groups = "audio_clk_a", "audio_clk_b", > + "audio_clkout", "audio_clkout1"; > + function = "audio_clk"; > + }; > + Pin control looks good to me. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts index 6783c3ad0856..591fad289802 100644 --- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts +++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts @@ -6,6 +6,11 @@ * Copyright (C) 2017 Glider bvba */ +/* + * This assumes... + * SW60 : 2-1 + */ + /dts-v1/; #include "r8a77995.dtsi" #include <dt-bindings/gpio/gpio.h> @@ -156,11 +161,25 @@ adv7123_out: endpoint { }; }; + sound_card: sound { + compatible = "audio-graph-card"; + + dais = <&rsnd_port0 /* ak4613 */ + /* HDMI is not yet supported */ + >; + }; + x12_clk: x12 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <74250000>; }; + + x19_clk: x19 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24576000>; + }; }; &avb { @@ -347,6 +366,39 @@ eeprom@50 { reg = <0x50>; pagesize = <8>; }; + + ak4613: codec@10 { + compatible = "asahi-kasei,ak4613"; + #sound-dai-cells = <0>; + reg = <0x10>; + clocks = <&rcar_sound 0>; /* audio_clkout */ + + asahi-kasei,in1-single-end; + asahi-kasei,in2-single-end; + asahi-kasei,out1-single-end; + asahi-kasei,out2-single-end; + asahi-kasei,out3-single-end; + asahi-kasei,out4-single-end; + asahi-kasei,out5-single-end; + asahi-kasei,out6-single-end; + + port { + ak4613_endpoint: endpoint { + remote-endpoint = <&rsnd_for_ak4613>; + }; + }; + }; + + cs2000: clk-multiplier@4f { + #clock-cells = <0>; + compatible = "cirrus,cs2000-cp"; + reg = <0x4f>; + clocks = <&rcar_sound 1>, <&x19_clk>; /* audio_clkout_1, x19 */ + clock-names = "clk_in", "ref_clk"; + + assigned-clocks = <&cs2000>; + assigned-clock-rates = <24576000>; /* 1/1 divide */ + }; }; &i2c1 { @@ -391,6 +443,46 @@ &ohci0 { status = "okay"; }; +&audio_clk_a { + /* same as cs2000 */ + clock-frequency = <24576000>; +}; + +&audio_clk_b { + clock-frequency = <22579200>; +}; + +&rcar_sound { + pinctrl-0 = <&sound_pins>, <&sound_clk_pins>; + pinctrl-names = "default"; + + /* Single DAI */ + #sound-dai-cells = <0>; + + /* audio_clkout0/1 */ + #clock-cells = <1>; + clock-frequency = <12288000 11289600>; + + status = "okay"; + + ports { + rsnd_port0: port { + rsnd_for_ak4613: endpoint { + remote-endpoint = <&ak4613_endpoint>; + dai-format = "left_j"; + bitclock-master = <&rsnd_for_ak4613>; + frame-master = <&rsnd_for_ak4613>; + playback = <&ssi3>, <&src5>, <&dvc0>; + capture = <&ssi4>, <&src6>, <&dvc1>; + }; + }; + }; +}; + +&ssi4 { + shared-pin; +}; + &pfc { avb0_pins: avb { groups = "avb0_link", "avb0_mdio", "avb0_mii"; @@ -449,6 +541,17 @@ sdhi2_pins_uhs: sd2_uhs { power-source = <1800>; }; + sound_pins: sound { + groups = "ssi34_ctrl", "ssi3_data", "ssi4_data_a"; + function = "ssi"; + }; + + sound_clk_pins: sound-clk { + groups = "audio_clk_a", "audio_clk_b", + "audio_clkout", "audio_clkout1"; + function = "audio_clk"; + }; + usb0_pins: usb0 { groups = "usb0"; function = "usb0";