Merge branch 'for-next' into for-linus (9ddd84f8) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/DocBook/writing-an-alsa-driver.tmpl

+27 −45

Original line number	Original line	Diff line number	Diff line
	@@ -468,8 +468,6 @@
	return err;		return err;
	}		}

	snd_card_set_dev(card, &pci->dev);

	*rchip = chip;		*rchip = chip;
	return 0;		return 0;
	}		}
	@@ -492,7 +490,8 @@
	}		}

	/* (2) */		/* (2) */
	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);		err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
			0, &card);
	if (err < 0)		if (err < 0)
	return err;		return err;

	@@ -591,7 +590,8 @@
	struct snd_card *card;		struct snd_card *card;
	int err;		int err;
	....		....
	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);		err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
			0, &card);
	]]>		]]>
	</programlisting>		</programlisting>
	</informalexample>		</informalexample>
	@@ -809,28 +809,34 @@

	<para>		<para>
	As mentioned above, to create a card instance, call		As mentioned above, to create a card instance, call
	<function>snd_card_create()</function>.		<function>snd_card_new()</function>.

	<informalexample>		<informalexample>
	<programlisting>		<programlisting>
	<![CDATA[		<![CDATA[
	struct snd_card *card;		struct snd_card *card;
	int err;		int err;
	err = snd_card_create(index, id, module, extra_size, &card);		err = snd_card_new(&pci->dev, index, id, module, extra_size, &card);
	]]>		]]>
	</programlisting>		</programlisting>
	</informalexample>		</informalexample>
	</para>		</para>

	<para>		<para>
	The function takes five arguments, the card-index number, the		The function takes six arguments: the parent device pointer,
	id string, the module pointer (usually		the card-index number, the id string, the module pointer (usually
	<constant>THIS_MODULE</constant>),		<constant>THIS_MODULE</constant>),
	the size of extra-data space, and the pointer to return the		the size of extra-data space, and the pointer to return the
	card instance. The extra_size argument is used to		card instance. The extra_size argument is used to
	allocate card->private_data for the		allocate card->private_data for the
	chip-specific data. Note that these data		chip-specific data. Note that these data
	are allocated by <function>snd_card_create()</function>.		are allocated by <function>snd_card_new()</function>.
			</para>

			<para>
			The first argument, the pointer of struct
			<structname>device</structname>, specifies the parent device.
			For PCI devices, typically &pci-> is passed there.
	</para>		</para>
	</section>		</section>

	@@ -916,15 +922,15 @@
	</para>		</para>

	<section id="card-management-chip-specific-snd-card-new">		<section id="card-management-chip-specific-snd-card-new">
	<title>1. Allocating via <function>snd_card_create()</function>.</title>		<title>1. Allocating via <function>snd_card_new()</function>.</title>
	<para>		<para>
	As mentioned above, you can pass the extra-data-length		As mentioned above, you can pass the extra-data-length
	to the 4th argument of <function>snd_card_create()</function>, i.e.		to the 5th argument of <function>snd_card_new()</function>, i.e.

	<informalexample>		<informalexample>
	<programlisting>		<programlisting>
	<![CDATA[		<![CDATA[
	err = snd_card_create(index[dev], id[dev], THIS_MODULE,		err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
	sizeof(struct mychip), &card);		sizeof(struct mychip), &card);
	]]>		]]>
	</programlisting>		</programlisting>
	@@ -954,7 +960,7 @@

	<para>		<para>
	After allocating a card instance via		After allocating a card instance via
	<function>snd_card_create()</function> (with		<function>snd_card_new()</function> (with
	<constant>0</constant> on the 4th arg), call		<constant>0</constant> on the 4th arg), call
	<function>kzalloc()</function>.		<function>kzalloc()</function>.

	@@ -963,7 +969,8 @@
	<![CDATA[		<![CDATA[
	struct snd_card *card;		struct snd_card *card;
	struct mychip *chip;		struct mychip *chip;
	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);		err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
			0, &card);
	.....		.....
	chip = kzalloc(sizeof(*chip), GFP_KERNEL);		chip = kzalloc(sizeof(*chip), GFP_KERNEL);
	]]>		]]>
	@@ -1170,8 +1177,6 @@
	return err;		return err;
	}		}

	snd_card_set_dev(card, &pci->dev);

	*rchip = chip;		*rchip = chip;
	return 0;		return 0;
	}		}
	@@ -1526,30 +1531,6 @@

	</section>		</section>

	<section id="pci-resource-device-struct">
	<title>Registration of Device Struct</title>
	<para>
	At some point, typically after calling <function>snd_device_new()</function>,
	you need to register the struct <structname>device</structname> of the chip
	you're handling for udev and co. ALSA provides a macro for compatibility with
	older kernels. Simply call like the following:
	<informalexample>
	<programlisting>
	<![CDATA[
	snd_card_set_dev(card, &pci->dev);
	]]>
	</programlisting>
	</informalexample>
	so that it stores the PCI's device pointer to the card. This will be
	referred by ALSA core functions later when the devices are registered.
	</para>
	<para>
	In the case of non-PCI, pass the proper device struct pointer of the BUS
	instead. (In the case of legacy ISA without PnP, you don't have to do
	anything.)
	</para>
	</section>

	<section id="pci-resource-entries">		<section id="pci-resource-entries">
	<title>PCI Entries</title>		<title>PCI Entries</title>
	<para>		<para>
	@@ -5740,7 +5721,8 @@ struct _snd_pcm_runtime {
	struct mychip *chip;		struct mychip *chip;
	int err;		int err;
	....		....
	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);		err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
			0, &card);
	....		....
	chip = kzalloc(sizeof(*chip), GFP_KERNEL);		chip = kzalloc(sizeof(*chip), GFP_KERNEL);
	....		....
	@@ -5752,7 +5734,7 @@ struct _snd_pcm_runtime {
	</informalexample>		</informalexample>

	When you created the chip data with		When you created the chip data with
	<function>snd_card_create()</function>, it's anyway accessible		<function>snd_card_new()</function>, it's anyway accessible
	via <structfield>private_data</structfield> field.		via <structfield>private_data</structfield> field.

	<informalexample>		<informalexample>
	@@ -5766,7 +5748,7 @@ struct _snd_pcm_runtime {
	struct mychip *chip;		struct mychip *chip;
	int err;		int err;
	....		....
	err = snd_card_create(index[dev], id[dev], THIS_MODULE,		err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
	sizeof(struct mychip), &card);		sizeof(struct mychip), &card);
	....		....
	chip = card->private_data;		chip = card->private_data;

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ atmel,24c02 i2c serial eeprom (24cxx)
	atmel,at97sc3204t i2c trusted platform module (TPM)		atmel,at97sc3204t i2c trusted platform module (TPM)
	capella,cm32181 CM32181: Ambient Light Sensor		capella,cm32181 CM32181: Ambient Light Sensor
	catalyst,24c32 i2c serial eeprom		catalyst,24c32 i2c serial eeprom
			cirrus,cs42l51 Cirrus Logic CS42L51 audio codec
	dallas,ds1307 64 x 8, Serial, I2C Real-Time Clock		dallas,ds1307 64 x 8, Serial, I2C Real-Time Clock
	dallas,ds1338 I2C RTC with 56-Byte NV RAM		dallas,ds1338 I2C RTC with 56-Byte NV RAM
	dallas,ds1339 I2C Serial Real-Time Clock		dallas,ds1339 I2C Serial Real-Time Clock

Documentation/devicetree/bindings/misc/atmel-ssc.txt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,14 @@ Required properties for devices compatible with "atmel,at91sam9g45-ssc":
	See Documentation/devicetree/bindings/dma/atmel-dma.txt for details.		See Documentation/devicetree/bindings/dma/atmel-dma.txt for details.
	- dma-names: Must be "tx", "rx".		- dma-names: Must be "tx", "rx".

			Optional properties:
			- atmel,clk-from-rk-pin: bool property.
			- When SSC works in slave mode, according to the hardware design, the
			clock can get from TK pin, and also can get from RK pin. So, add
			this parameter to choose where the clock from.
			- By default the clock is from TK pin, if the clock from RK pin, this
			property is needed.

	Examples:		Examples:
	- PDC transfer:		- PDC transfer:
	ssc0: ssc@fffbc000 {		ssc0: ssc@fffbc000 {

Documentation/devicetree/bindings/sound/armada-370db-audio.txt

0 → 100644

+27 −0

Original line number	Original line	Diff line number	Diff line
			Device Tree bindings for the Armada 370 DB audio
			================================================

			These Device Tree bindings are used to describe the audio complex
			found on the Armada 370 DB platform.

			Mandatory properties:

			* compatible: must be "marvell,a370db-audio"

			* marvell,audio-controller: a phandle that points to the audio
			controller of the Armada 370 SoC.

			* marvell,audio-codec: a set of three phandles that points to:

			1/ the analog audio codec connected to the Armada 370 SoC
			2/ the S/PDIF transceiver
			3/ the S/PDIF receiver

			Example:

			sound {
			compatible = "marvell,a370db-audio";
			marvell,audio-controller = <&audio_controller>;
			marvell,audio-codec = <&audio_codec &spdif_out &spdif_in>;
			status = "okay";
			};

Documentation/devicetree/bindings/sound/cs42xx8.txt

0 → 100644

+28 −0

Original line number	Original line	Diff line number	Diff line
			CS42448/CS42888 audio CODEC

			Required properties:

			- compatible : must contain one of "cirrus,cs42448" and "cirrus,cs42888"

			- reg : the I2C address of the device for I2C

			- clocks : a list of phandles + clock-specifiers, one for each entry in
			clock-names

			- clock-names : must contain "mclk"

			- VA-supply, VD-supply, VLS-supply, VLC-supply: power supplies for the device,
			as covered in Documentation/devicetree/bindings/regulator/regulator.txt

			Example:

			codec: cs42888@48 {
			compatible = "cirrus,cs42888";
			reg = <0x48>;
			clocks = <&codec_mclk 0>;
			clock-names = "mclk";
			VA-supply = <&reg_audio>;
			VD-supply = <&reg_audio>;
			VLS-supply = <&reg_audio>;
			VLC-supply = <&reg_audio>;
			};