Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e695e7a4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/kirkwood' into asoc-linus

parents c34c0d76 d098b2f0

Documentation/devicetree/bindings/sound/mvebu-audio.txt

+8 −4
Original line number Diff line number Diff line
@@ -2,13 +2,17 @@ 


Required properties:



- compatible: "marvell,mvebu-audio"

- compatible:

  "marvell,kirkwood-audio" for Kirkwood platforms

  "marvell,dove-audio" for Dove platforms



- reg: physical base address of the controller and length of memory mapped

  region.



- interrupts: list of two irq numbers.

  The first irq is used for data flow and the second one is used for errors.

- interrupts:

  with "marvell,kirkwood-audio", the audio interrupt

  with "marvell,dove-audio", a list of two interrupts, the first for

  the data flow, and the second for errors.



- clocks: one or two phandles.

  The first one is mandatory and defines the internal clock.
@@ -21,7 +25,7 @@ Required properties: 
Example:



i2s1: audio-controller@b4000 {

	compatible = "marvell,mvebu-audio";

	compatible = "marvell,dove-audio";

	reg = <0xb4000 0x2210>;

	interrupts = <21>, <22>;

	clocks = <&gate_clk 13>;

sound/soc/kirkwood/kirkwood-i2s.c

+2 −1
Original line number Diff line number Diff line
@@ -559,7 +559,8 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) 


#ifdef CONFIG_OF

static struct of_device_id mvebu_audio_of_match[] = {

	{ .compatible = "marvell,mvebu-audio" },

	{ .compatible = "marvell,kirkwood-audio" },

	{ .compatible = "marvell,dove-audio" },

	{ }

};

MODULE_DEVICE_TABLE(of, mvebu_audio_of_match);