From 2a346cb642a7098eef8fbb4f92eeb4bf8aa31e69 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Mon, 25 May 2020 16:14:49 +0900 Subject: [PATCH] ODROID-C4: move Hifi-Shield supports as DTBO Signed-off-by: Dongjin Kim Change-Id: I5794046e446e6b55bccf9b062ebd62f2108f0f00 --- .../boot/dts/amlogic/meson64_odroidc4.dts | 71 +------------------ .../dts/amlogic/overlays/odroidc4/Makefile | 4 +- .../amlogic/overlays/odroidc4/hifishield.dts | 49 +++++++++++++ .../amlogic/overlays/odroidc4/hifishield2.dts | 68 ++++++++++++++++++ 4 files changed, 121 insertions(+), 71 deletions(-) create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidc4/hifishield.dts create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidc4/hifishield2.dts diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts index ddb1542a5b2c..ae635e658500 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts @@ -625,11 +625,6 @@ compatible = "amlogic, aml_dummy_codec"; status = "okay"; }; - pcm5102a: pcm5102a { - compatible = "ti,pcm5102a"; - #sound-dai-cells = <0>; - status = "okay"; - }; spdif_dit:spdif{ #sound-dai-cells = <0>; compatible = "linux,spdif-dit"; @@ -677,57 +672,6 @@ }; }; }; - odroid_hifi { - compatible = "amlogic, g12a-sound-card"; - aml-audio-card,name = "ODROID-HIFI"; - status = "disabled"; - - /* ODROID-C4: I2S out(J7)*/ - aml-audio-card,dai-link@0 { - format = "i2s"; - mclk-fs = <256>; - continuous-clock; - bitclock-master = <&tdmb>; - frame-master = <&tdmb>; - 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-width = <32>; - system-clock-frequency = <12288000>; - }; - codec { - sound-dai = <&pcm5102a &dummy_codec>; - }; - }; - }; - odroid_hifi2 { - compatible = "amlogic, g12a-sound-card"; - aml-audio-card,name = "ODROID-HIFI2"; - status = "disabled"; - - /* ODROID-C4: I2S out(J7)*/ - aml-audio-card,dai-link@0 { - format = "i2s"; - mclk-fs = <256>; - continuous-clock; - bitclock-master = <&tdmb>; - frame-master = <&tdmb>; - 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-width = <32>; - system-clock-frequency = <12288000>; - }; - codec { - sound-dai = <&pcm5242 &dummy_codec>; - }; - }; - }; - audiolocker: locker { compatible = "amlogic, audiolocker"; clocks = <&clkaudio CLKID_AUDIO_LOCKER_OUT @@ -786,7 +730,7 @@ start_clk_enable = <1>; /*tdm clk tuning enable*/ clk_tuning_enable = <1>; - status = "okay"; + status = "disabled"; }; spdifa: spdif@0 { @@ -979,19 +923,6 @@ &i2c2 { status = "disabled"; - - pcm5242: pcm5242@4c { - compatible = "ti,pcm5242"; - reg = <0x4c>; - #sound-dai-cells = <0>; - status = "disabled"; - - /* - AVDD-supply = <®_3v3_analog>; - DVDD-supply = <®_1v8>; - CPVDD-supply = <®_3v3>; - */ - }; }; &i2c3 { diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile index 81681dba8aa1..2ec52e50c788 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile @@ -12,7 +12,9 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo \ sx865x-i2c1.dtbo \ pcf8563.dtbo \ onewire.dtbo \ - can0.dtbo + can0.dtbo \ + hifishield.dtbo \ + hifishield2.dtbo targets += $(dtbo-y) always := $(dtbo-y) diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/hifishield.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/hifishield.dts new file mode 100644 index 000000000000..02fc5f456d87 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/hifishield.dts @@ -0,0 +1,49 @@ +/dts-v1/; +/plugin/; + +/ { + fragment@0 { + target = <&tdmb>; + __overlay__ { + status = "okay"; + }; + }; + + fragment@1 { + target-path = "/"; + + __overlay__ { + odroid_hifi: odroid_hifi { + compatible = "amlogic, g12a-sound-card"; + aml-audio-card,name = "ODROID-HIFI"; + status = "okay"; + + /* ODROID-C4: I2S out(J7)*/ + aml-audio-card,dai-link@0 { + format = "i2s"; + mclk-fs = <256>; + continuous-clock; + bitclock-master = <&tdmb>; + frame-master = <&tdmb>; + 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-width = <32>; + system-clock-frequency = <12288000>; + }; + codec { + sound-dai = <&pcm5102a &dummy_codec>; + }; + }; + }; + + pcm5102a: pcm5102a { + compatible = "ti,pcm5102a"; + #sound-dai-cells = <0>; + status = "okay"; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/hifishield2.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/hifishield2.dts new file mode 100644 index 000000000000..c86cf8136f4f --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/hifishield2.dts @@ -0,0 +1,68 @@ +/dts-v1/; +/plugin/; + +/ { + fragment@0 { + target = <&tdmb>; + __overlay__ { + status = "okay"; + }; + }; + + fragment@1 { + // i2c2 aliased with i2c0. + target = <&i2c2>; + + __overlay__ { + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + + pcm5242: pcm5242@4c { + compatible = "ti,pcm5242"; + reg = <0x4c>; + #sound-dai-cells = <0>; + status = "okay"; + + /* + AVDD-supply = <®_3v3_analog>; + DVDD-supply = <®_1v8>; + CPVDD-supply = <®_3v3>; + */ + }; + }; + }; + + fragment@2 { + target-path = "/"; + + __overlay__ { + odroid_hifi2: odroid_hifi2 { + compatible = "amlogic, g12a-sound-card"; + aml-audio-card,name = "ODROID-HIFI2"; + status = "okay"; + + /* ODROID-C4: I2S out(J7)*/ + aml-audio-card,dai-link@0 { + format = "i2s"; + mclk-fs = <256>; + continuous-clock; + bitclock-master = <&tdmb>; + frame-master = <&tdmb>; + 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-width = <32>; + system-clock-frequency = <12288000>; + }; + codec { + sound-dai = <&pcm5242 &dummy_codec>; + }; + }; + }; + }; + }; +};