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

Commit a58bdba7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/firewire' into for-next 

This is a merge of big firewire audio stack updates by Takashi Sakamoto.
parents 00a6d7b6 51fa31d4

Documentation/ABI/testing/sysfs-bus-pci

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ Description: 


What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Contact:	Ben Hutchings <bwh@kernel.org>

Description:

		A file named vpd in a device directory will be a

		binary file containing the Vital Product Data for the

Documentation/devicetree/bindings/clock/at91-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Required properties for PMC node: 
- interrupt-controller : tell that the PMC is an interrupt controller.

- #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,

	and reflect the bit position in the PMC_ER/DR/SR registers.

	You can use the dt macros defined in dt-bindings/clk/at91.h.

	You can use the dt macros defined in dt-bindings/clock/at91.h.

	0 (AT91_PMC_MOSCS) -> main oscillator ready

	1 (AT91_PMC_LOCKA) -> PLL A ready

	2 (AT91_PMC_LOCKB) -> PLL B ready

Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Example 
		clock-output-names =

			"tpu0", "mmcif1", "sdhi3", "sdhi2",

			 "sdhi1", "sdhi0", "mmcif0";

		renesas,clock-indices = <

		clock-indices = <

			R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3

			R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0

			R8A7790_CLK_MMCIF0

Documentation/devicetree/bindings/dma/ti-edma.txt

+2 −2
Original line number Diff line number Diff line
@@ -29,6 +29,6 @@ edma: edma@49000000 { 
	dma-channels = <64>;

	ti,edma-regions = <4>;

	ti,edma-slots = <256>;

	ti,edma-xbar-event-map = <1 12

	ti,edma-xbar-event-map = /bits/ 16 <1 12

					    2 13>;

};

Documentation/kernel-parameters.txt

+4 −4
Original line number Diff line number Diff line
@@ -2218,10 +2218,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	noreplace-smp	[X86-32,SMP] Don't replace SMP instructions

			with UP alternatives



	nordrand	[X86] Disable the direct use of the RDRAND

			instruction even if it is supported by the

			processor.  RDRAND is still available to user

			space applications.

	nordrand	[X86] Disable kernel use of the RDRAND and

			RDSEED instructions even if they are supported

			by the processor.  RDRAND and RDSEED are still

			available to user space applications.



	noresume	[SWSUSP] Disables resume and restores original swap

			space.