diff options
author | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 17:50:01 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 17:50:02 +0200 |
commit | 01c65733fadbd1f48d8c1fbd366be49ce44d6471 (patch) | |
tree | 5f03fc8067357fea87606b6fc37505173dd14daf /arch/arm/boot/dts/armada-388-db.dts | |
parent | 79a9059970f73df1a4e418d4805d5f18f662dcc8 (diff) | |
parent | 649acf24d8c86ab8861a05cdd6833100a5fe4e78 (diff) |
Merge tag 'mvebu-dt-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt
mvebu dt for 6.1 (part 1)
Add definitions for PCIe legacy INTx interrupts for dts using
pci-mvebu.c controller driver.
Add gpio-ranges for pin muxing for Armada 38x
Add audio support for Armada 38x
Turris-omnia (Armada 385 based) fix a pin name
lsxl (kirkwood based)
- Fix fix serial line
- Remove first ethernet port
* tag 'mvebu-dt-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: (22 commits)
ARM: dts: turris-omnia: Add label for wan port
ARM: dts: turris-omnia: Define S/PDIF audio card
ARM: mvebu: Add spdif-pins mpp pins for Armada 38x
ARM: mvebu: add audio support to Armada 385 DB
ARM: mvebu: add audio I2S controller to Armada 38x Device Tree
ARM: dts: armada-38x: Add gpio-ranges for pin muxing
ARM: dts: dove: Add definitions for PCIe error interrupts
ARM: dts: kirkwood: Add definitions for PCIe error interrupts
ARM: dts: armada-39x.dtsi: Add definitions for PCIe legacy INTx interrupts
ARM: dts: armada-380.dtsi: Add definitions for PCIe legacy INTx interrupts
ARM: dts: armada-375.dtsi: Add definitions for PCIe legacy INTx interrupts
ARM: dts: armada-xp-mv78460.dtsi: Add definitions for PCIe legacy INTx interrupts
ARM: dts: armada-xp-mv78260.dtsi: Add definitions for PCIe legacy INTx interrupts
ARM: dts: armada-xp-mv78230.dtsi: Add definitions for PCIe legacy INTx interrupts
ARM: dts: armada-xp-98dx3236.dtsi: Add definitions for PCIe legacy INTx interrupts
ARM: dts: armada-370.dtsi: Add definitions for PCIe legacy INTx interrupts
ARM: dts: dove: Add definitions for PCIe legacy INTx interrupts
ARM: dts: kirkwood: Add definitions for PCIe legacy INTx interrupts
ARM: dts: kirkwood: lsxl: remove first ethernet port
ARM: dts: kirkwood: lsxl: fix serial line
...
Link: https://lore.kernel.org/r/87edw2xfle.fsf@BL-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/armada-388-db.dts')
-rw-r--r-- | arch/arm/boot/dts/armada-388-db.dts | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts index 5130eccc32af..2bcec5419b66 100644 --- a/arch/arm/boot/dts/armada-388-db.dts +++ b/arch/arm/boot/dts/armada-388-db.dts @@ -36,6 +36,11 @@ i2c@11000 { status = "okay"; clock-frequency = <100000>; + audio_codec: audio-codec@4a { + #sound-dai-cells = <0>; + compatible = "cirrus,cs42l51"; + reg = <0x4a>; + }; }; i2c@11100 { @@ -99,6 +104,12 @@ no-1-8-v; }; + audio-controller@e8000 { + pinctrl-0 = <&i2s_pins>; + pinctrl-names = "default"; + status = "disabled"; + }; + usb3@f0000 { status = "okay"; }; @@ -128,6 +139,64 @@ }; }; }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "Armada 385 DB Audio"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,widgets = + "Headphone", "Out Jack", + "Line", "In Jack"; + simple-audio-card,routing = + "Out Jack", "HPL", + "Out Jack", "HPR", + "AIN1L", "In Jack", + "AIN1R", "In Jack"; + status = "disabled"; + + simple-audio-card,dai-link@0 { + format = "i2s"; + cpu { + sound-dai = <&audio_controller 0>; + }; + + codec { + sound-dai = <&audio_codec>; + }; + }; + + simple-audio-card,dai-link@1 { + format = "i2s"; + cpu { + sound-dai = <&audio_controller 1>; + }; + + codec { + sound-dai = <&spdif_out>; + }; + }; + + simple-audio-card,dai-link@2 { + format = "i2s"; + cpu { + sound-dai = <&audio_controller 1>; + }; + + codec { + sound-dai = <&spdif_in>; + }; + }; + }; + + spdif_out: spdif-out { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + }; + + spdif_in: spdif-in { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dir"; + }; }; &spi0 { |