Skip to content

Khadas vims 4.9.y #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2022
Merged

Khadas vims 4.9.y #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
198ee67
arm64: dts: VIM1: move pwm_aoab pinctrol to overlay
yan-wyb Oct 28, 2022
2644916
arm64: dts: VIM3/VIM3L: move i2s to frist device
yan-wyb Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions arch/arm64/boot/dts/amlogic/kvim_linux.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,8 +1180,6 @@

&pwm_aoab {
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&pwm_ao_a_pin>;
};

&pwm_ef {
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/amlogic/overlays/kvim/pwm_ao_a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
target = <&pwm_aoab>;

__overlay__ {
pinctrl-names="default";
pinctrl-0=<&pwm_ao_a_pin>;
status = "okay";
};
};
Expand Down
58 changes: 29 additions & 29 deletions arch/arm64/boot/dts/amlogic/overlays/kvim3/i2s.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,34 @@

__overlay__ {
aml-audio-card,dai-link@0 {
format = "i2s";
mclk-fs = <256>;
//continuous-clock;
//bitclock-inversion;
//frame-inversion;
bitclock-master = <&aml_tdmb>;
frame-master = <&aml_tdmb>;
//bitclock-master = <&tdmbcodec>;
//frame-master = <&tdmbcodec>;
/* suffix-name, sync with android audio hal
* what's the dai link used for
*/
suffix-name = "alsaPORT-i2s";
cpu {
sound-dai = <&aml_tdmb>;
dai-tdm-slot-tx-mask = <1 1>;
dai-tdm-slot-rx-mask = <1 1>;
dai-tdm-slot-num = <2>;
dai-tdm-slot-width = <32>;
system-clock-frequency = <12288000>;
};
tdmbcodec: codec {
sound-dai = <&dummy_codec &dummy_codec
&amlogic_codec>;
};
};

aml-audio-card,dai-link@1 {
mclk-fs = <128>;
/* suffix-name, sync with android audio hal
* what's the dai link used for
Expand All @@ -21,7 +49,7 @@
};
};

aml-audio-card,dai-link@1 {
aml-audio-card,dai-link@2 {
format = "dsp_a";
mclk-fs = <512>;
//continuous-clock;
Expand All @@ -48,34 +76,6 @@
};
};

aml-audio-card,dai-link@2 {
format = "i2s";
mclk-fs = <256>;
//continuous-clock;
//bitclock-inversion;
//frame-inversion;
bitclock-master = <&aml_tdmb>;
frame-master = <&aml_tdmb>;
//bitclock-master = <&tdmbcodec>;
//frame-master = <&tdmbcodec>;
/* suffix-name, sync with android audio hal
* what's the dai link used for
*/
suffix-name = "alsaPORT-i2s";
cpu {
sound-dai = <&aml_tdmb>;
dai-tdm-slot-tx-mask = <1 1>;
dai-tdm-slot-rx-mask = <1 1>;
dai-tdm-slot-num = <2>;
dai-tdm-slot-width = <32>;
system-clock-frequency = <12288000>;
};
tdmbcodec: codec {
sound-dai = <&dummy_codec &dummy_codec
&amlogic_codec>;
};
};

aml-audio-card,dai-link@3 {
format = "i2s";
mclk-fs = <256>;
Expand Down
76 changes: 38 additions & 38 deletions arch/arm64/boot/dts/amlogic/overlays/kvim3l/i2s.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,43 @@

__overlay__ {
aml-audio-card,dai-link@0 {
format = "i2s";// "dsp_a";
mclk-fs = <256>;
//continuous-clock;
//bitclock-inversion;
//frame-inversion;
/* master mode */
bitclock-master = <&tdmb>;
frame-master = <&tdmb>;
/* slave mode */
//bitclock-master = <&tdmbcodec>;
//frame-master = <&tdmbcodec>;
/* suffix-name, sync with android audio hal
* what's the dai link used for
*/
suffix-name = "alsaPORT-i2s";
cpu {
sound-dai = <&tdmb>;
dai-tdm-slot-tx-mask = <1 1>;
dai-tdm-slot-rx-mask = <1 1>;
dai-tdm-slot-num = <2>;
/*
* dai-tdm-slot-tx-mask =
* <1 1 1 1 1 1 1 1>;
* dai-tdm-slot-rx-mask =
* <1 1 1 1 1 1 1 1>;
* dai-tdm-slot-num = <8>;
*/
dai-tdm-slot-width = <32>;
system-clock-frequency = <12288000>;
};
tdmbcodec: codec {
sound-dai = <&dummy_codec &dummy_codec
&amlogic_codec>;
};
};

aml-audio-card,dai-link@1 {
mclk-fs = <128>;
/* suffix-name, sync with android audio hal
* what's the dai link used for
Expand All @@ -21,7 +58,7 @@
};
};

aml-audio-card,dai-link@1 {
aml-audio-card,dai-link@2 {
format = "dsp_a";
mclk-fs = <512>;
//continuous-clock;
Expand Down Expand Up @@ -51,43 +88,6 @@
};
};

aml-audio-card,dai-link@2 {
format = "i2s";// "dsp_a";
mclk-fs = <256>;
//continuous-clock;
//bitclock-inversion;
//frame-inversion;
/* master mode */
bitclock-master = <&tdmb>;
frame-master = <&tdmb>;
/* slave mode */
//bitclock-master = <&tdmbcodec>;
//frame-master = <&tdmbcodec>;
/* suffix-name, sync with android audio hal
* what's the dai link used for
*/
suffix-name = "alsaPORT-i2s";
cpu {
sound-dai = <&tdmb>;
dai-tdm-slot-tx-mask = <1 1>;
dai-tdm-slot-rx-mask = <1 1>;
dai-tdm-slot-num = <2>;
/*
* dai-tdm-slot-tx-mask =
* <1 1 1 1 1 1 1 1>;
* dai-tdm-slot-rx-mask =
* <1 1 1 1 1 1 1 1>;
* dai-tdm-slot-num = <8>;
*/
dai-tdm-slot-width = <32>;
system-clock-frequency = <12288000>;
};
tdmbcodec: codec {
sound-dai = <&dummy_codec &dummy_codec
&amlogic_codec>;
};
};

aml-audio-card,dai-link@3 {
format = "i2s";
mclk-fs = <256>;
Expand Down