Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000',... (7cc64172) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/sound/simple-card.txt

+15 −2

Original line number	Diff line number	Diff line
		@@ -8,13 +8,18 @@ Required properties:

		Optional properties:

		- simple-audio-card,name : User specified audio sound card name, one string
		property.
		- simple-audio-card,format : CPU/CODEC common audio format.
		"i2s", "right_j", "left_j" , "dsp_a"
		"dsp_b", "ac97", "pdm", "msb", "lsb"
		- simple-audio-card,widgets : Please refer to widgets.txt.
		- simple-audio-card,routing : A list of the connections between audio components.
		Each entry is a pair of strings, the first being the
		connection's sink, the second being the connection's
		source.
		- dai-tdm-slot-num : Please refer to tdm-slot.txt.
		- dai-tdm-slot-width : Please refer to tdm-slot.txt.

		Required subnodes:

		@@ -42,11 +47,19 @@ Example:

		sound {
		compatible = "simple-audio-card";
		simple-audio-card,name = "VF610-Tower-Sound-Card";
		simple-audio-card,format = "left_j";
		simple-audio-card,widgets =
		"Microphone", "Microphone Jack",
		"Headphone", "Headphone Jack",
		"Speaker", "External Speaker";
		simple-audio-card,routing =
		"MIC_IN", "Mic Jack",
		"MIC_IN", "Microphone Jack",
		"Headphone Jack", "HP_OUT",
		"Ext Spk", "LINE_OUT";
		"External Speaker", "LINE_OUT";

		dai-tdm-slot-num = <2>;
		dai-tdm-slot-width = <8>;

		simple-audio-card,cpu {
		sound-dai = <&sh_fsi2 0>;

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		SiRF internal audio CODEC

		Required properties:

		- compatible : "sirf,atlas6-audio-codec" or "sirf,prima2-audio-codec"

		- reg : the register address of the device.

		- clocks: the clock of SiRF internal audio codec

		Example:

		audiocodec: audiocodec@b0040000 {
		compatible = "sirf,atlas6-audio-codec";
		reg = <0xb0040000 0x10000>;
		clocks = <&clks 27>;
		};

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		* SiRF SoC audio port

		Required properties:
		- compatible: "sirf,audio-port"
		- reg: Base address and size entries:
		- dmas: List of DMA controller phandle and DMA request line ordered pairs.
		- dma-names: Identifier string for each DMA request line in the dmas property.
		These strings correspond 1:1 with the ordered pairs in dmas.

		One of the DMA channels will be responsible for transmission (should be
		named "tx") and one for reception (should be named "rx").

		Example:

		audioport: audioport@b0040000 {
		compatible = "sirf,audio-port";
		reg = <0xb0040000 0x10000>;
		dmas = <&dmac1 3>, <&dmac1 8>;
		dma-names = "rx", "tx";
		};

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		* SiRF atlas6 and prima2 internal audio codec and port based audio setups

		Required properties:
		- compatible: "sirf,sirf-audio-card"
		- sirf,audio-platform: phandle for the platform node
		- sirf,audio-codec: phandle for the SiRF internal codec node

		Optional properties:
		- hp-pa-gpios: Need to be present if the board need control external
		headphone amplifier.
		- spk-pa-gpios: Need to be present if the board need control external
		speaker amplifier.
		- hp-switch-gpios: Need to be present if the board capable to detect jack
		insertion, removal.

		Available audio endpoints for the audio-routing table:

		Board connectors:
		* Headset Stereophone
		* Ext Spk
		* Line In
		* Mic

		SiRF internal audio codec pins:
		* HPOUTL
		* HPOUTR
		* SPKOUT
		* Ext Mic
		* Mic Bias

		Example:

		sound {
		compatible = "sirf,sirf-audio-card";
		sirf,audio-codec = <&audiocodec>;
		sirf,audio-platform = <&audioport>;
		hp-pa-gpios = <&gpio 44 0>;
		spk-pa-gpios = <&gpio 46 0>;
		hp-switch-gpios = <&gpio 45 0>;
		};

+1 −2

Original line number	Diff line number	Diff line
		/* arch/arm/plat-samsung/include/plat/audio.h
		*
		/*
		* Copyright (c) 2009 Samsung Electronics Co. Ltd
		* Author: Jaswinder Singh <jassi.brar@samsung.com>
		*