Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next (0fd0ba5f) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-class-regulator

+21 −0

Original line number	Diff line number	Diff line
		@@ -349,3 +349,24 @@ Description:

		This will be one of the same strings reported by
		the "state" attribute.

		What: /sys/class/regulator/.../bypass
		Date: September 2012
		KernelVersion: 3.7
		Contact: Mark Brown <broonie@opensource.wolfsonmicro.com>
		Description:
		Some regulator directories will contain a field called
		bypass. This indicates if the device is in bypass mode.

		This will be one of the following strings:

		'enabled'
		'disabled'
		'unknown'

		'enabled' means the regulator is in bypass mode.

		'disabled' means that the regulator is regulating.

		'unknown' means software cannot determine the state, or
		the reported state is invalid.

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		Cirrus Logic CS4271 DT bindings

		This driver supports both the I2C and the SPI bus.

		Required properties:

		- compatible: "cirrus,cs4271"

		For required properties on SPI, please consult
		Documentation/devicetree/bindings/spi/spi-bus.txt

		Required properties on I2C:

		- reg: the i2c address


		Optional properties:

		- reset-gpio: a GPIO spec to define which pin is connected to the chip's
		!RESET pin

		Examples:

		codec_i2c: cs4271@10 {
		compatible = "cirrus,cs4271";
		reg = <0x10>;
		reset-gpio = <&gpio 23 0>;
		};

		codec_spi: cs4271@0 {
		compatible = "cirrus,cs4271";
		reg = <0x0>;
		reset-gpio = <&gpio 23 0>;
		spi-max-frequency = <6000000>;
		};

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		* MOP500 Audio Machine Driver

		This node is responsible for linking together all ux500 Audio Driver components.

		Required properties:
		- compatible : "stericsson,snd-soc-mop500"

		Non-standard properties:
		- stericsson,cpu-dai : Phandle to the CPU-side DAI
		- stericsson,audio-codec : Phandle to the Audio CODEC
		- stericsson,card-name : Over-ride default card name

		Example:

		sound {
		compatible = "stericsson,snd-soc-mop500";

		stericsson,cpu-dai = <&msp1 &msp3>;
		stericsson,audio-codec = <&codec>;
		};

		msp1: msp@80124000 {
		compatible = "stericsson,ux500-msp-i2s";
		reg = <0x80124000 0x1000>;
		interrupts = <0 62 0x4>;
		v-ape-supply = <&db8500_vape_reg>;
		};

		msp3: msp@80125000 {
		compatible = "stericsson,ux500-msp-i2s";
		reg = <0x80125000 0x1000>;
		interrupts = <0 62 0x4>;
		v-ape-supply = <&db8500_vape_reg>;
		};

		codec: ab8500-codec {
		compatible = "stericsson,ab8500-codec";
		stericsson,earpeice-cmv = <950>; /* Units in mV. */
		};

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		* ux500 MSP (CPU-side Digital Audio Interface)

		Required properties:
		- compatible :"stericsson,ux500-msp-i2s"
		- reg : Physical base address and length of the device's registers.

		Optional properties:
		- interrupts : The interrupt output from the device.
		- interrupt-parent : The parent interrupt controller.
		- <name>-supply : Phandle to the regulator <name> supply

		Example:

		sound {
		compatible = "stericsson,snd-soc-mop500";

		stericsson,platform-pcm-dma = <&pcm>;
		stericsson,cpu-dai = <&msp1 &msp3>;
		stericsson,audio-codec = <&codec>;
		};

		pcm: ux500-pcm {
		compatible = "stericsson,ux500-pcm";
		};

		msp1: msp@80124000 {
		compatible = "stericsson,ux500-msp-i2s";
		reg = <0x80124000 0x1000>;
		interrupts = <0 62 0x4>;
		v-ape-supply = <&db8500_vape_reg>;
		};

		msp3: msp@80125000 {
		compatible = "stericsson,ux500-msp-i2s";
		reg = <0x80125000 0x1000>;
		interrupts = <0 62 0x4>;
		v-ape-supply = <&db8500_vape_reg>;
		};

		codec: ab8500-codec {
		compatible = "stericsson,ab8500-codec";
		stericsson,earpeice-cmv = <950>; /* Units in mV. */
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -348,4 +348,5 @@ void __init eukrea_mbimx27_baseboard_init(void)
		imx27_add_imx_keypad(&eukrea_mbimx27_keymap_data);

		gpio_led_register_device(-1, &eukrea_mbimx27_gpio_led_info);
		imx_add_platform_device("eukrea_tlv320", 0, NULL, 0, NULL, 0);
		}