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-385-turris-omnia.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-385-turris-omnia.dts')
| -rw-r--r-- | arch/arm/boot/dts/armada-385-turris-omnia.dts | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts index d1e0db6e5730..72ac807cae25 100644 --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts @@ -105,6 +105,33 @@ */ status = "disabled"; }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "SPDIF"; + simple-audio-card,format = "i2s"; + + simple-audio-card,cpu { + sound-dai = <&audio_controller 1>; + }; + + simple-audio-card,codec { + sound-dai = <&spdif_out>; + }; + }; + + spdif_out: spdif-out { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + }; +}; + +&audio_controller { + /* Pin header U16, GPIO51 in SPDIFO mode */ + pinctrl-0 = <&spdif_pins>; + pinctrl-names = "default"; + spdif-mode; + status = "okay"; }; &bm { @@ -166,6 +193,7 @@ buffer-manager = <&bm>; bm,pool-long = <2>; bm,pool-short = <3>; + label = "wan"; }; &i2c0 { @@ -476,7 +504,7 @@ marvell,function = "spi0"; }; - spi0cs1_pins: spi0cs1-pins { + spi0cs2_pins: spi0cs2-pins { marvell,pins = "mpp26"; marvell,function = "spi0"; }; @@ -511,7 +539,7 @@ }; }; - /* MISO, MOSI, SCLK and CS1 are routed to pin header CN11 */ + /* MISO, MOSI, SCLK and CS2 are routed to pin header CN11 */ }; &uart0 { |