| Message ID | 20231229200245.259689-1-david@ixit.cz (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 278d3807d304c90e59edb61aa7ed8a05e1e836bf |
| Headers | show |
| Series | arm64: dts: qcom: sdm845-oneplus-common: improve DAI node naming | expand |
On Freitag, 29. Dezember 2023 21:02:33 CET David Heidelberg wrote: > Make it easier to understand what the reg in those nodes is by using the > constants provided by qcom,q6dsp-lpass-ports.h. > > Name nodes according to dt-binding expectations. > > Fix for > ``` > arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dtb: service@4: dais: > Unevaluated properties are not allowed ('qi2s@22', 'qi2s@23' were > unexpected) ``` > > Fixes: b7b734286856 ("arm64: dts: qcom: sdm845-oneplus-*: add audio > devices") Signed-off-by: David Heidelberg <david@ixit.cz> > --- > arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi > b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index > e821103d49c0..46e25c53829a 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi > @@ -508,13 +508,13 @@ led-1 { > }; > > &q6afedai { > - qi2s@22 { > - reg = <22>; > + dai@22 { > + reg = <QUATERNARY_MI2S_RX>; > qcom,sd-lines = <1>; > }; > > - qi2s@23 { > - reg = <23>; > + dai@23 { > + reg = <QUATERNARY_MI2S_TX>; I did the 'reg' part before, either I missed this file or it was added after I made the patch. https://lore.kernel.org/linux-arm-msm/20220603094710.64591-1-luca.weiss@fairphone.com/ But looks correct: Reviewed-by: Luca Weiss <luca@z3ntu.xyz> > qcom,sd-lines = <0>; > }; > };
Weird, I'm on next-20231222 so I assume it got missed somehow :( Thanks! On 29/12/2023 22:41, Luca Weiss wrote: > On Freitag, 29. Dezember 2023 21:02:33 CET David Heidelberg wrote: >> Make it easier to understand what the reg in those nodes is by using the >> constants provided by qcom,q6dsp-lpass-ports.h. >> >> Name nodes according to dt-binding expectations. >> >> Fix for >> ``` >> arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dtb: service@4: dais: >> Unevaluated properties are not allowed ('qi2s@22', 'qi2s@23' were >> unexpected) ``` >> >> Fixes: b7b734286856 ("arm64: dts: qcom: sdm845-oneplus-*: add audio >> devices") Signed-off-by: David Heidelberg <david@ixit.cz> >> --- >> arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi >> b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index >> e821103d49c0..46e25c53829a 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi >> @@ -508,13 +508,13 @@ led-1 { >> }; >> >> &q6afedai { >> - qi2s@22 { >> - reg = <22>; >> + dai@22 { >> + reg = <QUATERNARY_MI2S_RX>; >> qcom,sd-lines = <1>; >> }; >> >> - qi2s@23 { >> - reg = <23>; >> + dai@23 { >> + reg = <QUATERNARY_MI2S_TX>; > I did the 'reg' part before, either I missed this file or it was added after I > made the patch. > https://lore.kernel.org/linux-arm-msm/20220603094710.64591-1-luca.weiss@fairphone.com/ > > But looks correct: > > Reviewed-by: Luca Weiss <luca@z3ntu.xyz> > > >> qcom,sd-lines = <0>; >> }; >> }; > > >
On Fri, 29 Dec 2023 21:02:33 +0100, David Heidelberg wrote: > Make it easier to understand what the reg in those nodes is by using the > constants provided by qcom,q6dsp-lpass-ports.h. > > Name nodes according to dt-binding expectations. > > Fix for > ``` > arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dtb: service@4: dais: Unevaluated properties are not allowed ('qi2s@22', 'qi2s@23' were unexpected) > ``` > > [...] Applied, thanks! [1/1] arm64: dts: qcom: sdm845-oneplus-common: improve DAI node naming commit: 278d3807d304c90e59edb61aa7ed8a05e1e836bf Best regards,
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index e821103d49c0..46e25c53829a 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -508,13 +508,13 @@ led-1 { }; &q6afedai { - qi2s@22 { - reg = <22>; + dai@22 { + reg = <QUATERNARY_MI2S_RX>; qcom,sd-lines = <1>; }; - qi2s@23 { - reg = <23>; + dai@23 { + reg = <QUATERNARY_MI2S_TX>; qcom,sd-lines = <0>; }; };
Make it easier to understand what the reg in those nodes is by using the constants provided by qcom,q6dsp-lpass-ports.h. Name nodes according to dt-binding expectations. Fix for ``` arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dtb: service@4: dais: Unevaluated properties are not allowed ('qi2s@22', 'qi2s@23' were unexpected) ``` Fixes: b7b734286856 ("arm64: dts: qcom: sdm845-oneplus-*: add audio devices") Signed-off-by: David Heidelberg <david@ixit.cz> --- arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)