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

Commit 6214b54c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus 

ASoC: Fixes for v3.7

A few small fixes plus a large but simple change for WM5102 which writes
out a bunch of register updates to the device when we enable the clock
as recommended following chip evaluation.
parents 05193639 ba027da8

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ local_ops.txt 
	- semantics and behavior of local atomic operations.

lockdep-design.txt

	- documentation on the runtime locking correctness validator.

lockup-watchdogs.txt

	- info on soft and hard lockup detectors (aka nmi_watchdog).

logo.gif

	- full colour GIF image of Linux logo (penguin - Tux).

logo.txt
@@ -240,8 +242,6 @@ netlabel/ 
	- directory with information on the NetLabel subsystem.

networking/

	- directory with info on various aspects of networking with Linux.

nmi_watchdog.txt

	- info on NMI watchdog for SMP systems.

nommu-mmap.txt

	- documentation about no-mmu memory mapping support.

numastat.txt

Documentation/arm64/memory.txt

+6 −6
Original line number Diff line number Diff line
@@ -27,17 +27,17 @@ Start End Size Use 
-----------------------------------------------------------------------

0000000000000000	0000007fffffffff	 512GB		user



ffffff8000000000	ffffffbbfffcffff	~240GB		vmalloc

ffffff8000000000	ffffffbbfffeffff	~240GB		vmalloc



ffffffbbfffd0000	ffffffbcfffdffff	  64KB		[guard page]

ffffffbbffff0000	ffffffbbffffffff	  64KB		[guard page]



ffffffbbfffe0000	ffffffbcfffeffff	  64KB		PCI I/O space

ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap



ffffffbbffff0000	ffffffbcffffffff	  64KB		[guard page]

ffffffbe00000000	ffffffbffbbfffff	  ~8GB		[guard, future vmmemap]



ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap

ffffffbffbe00000	ffffffbffbe0ffff	  64KB		PCI I/O space



ffffffbe00000000	ffffffbffbffffff	  ~8GB		[guard, future vmmemap]

ffffffbbffff0000	ffffffbcffffffff	  ~2MB		[guard]



ffffffbffc000000	ffffffbfffffffff	  64MB		modules

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ PIT Timer required properties: 
  shared across all System Controller members.



TC/TCLIB Timer required properties:

- compatible: Should be "atmel,<chip>-pit".

- compatible: Should be "atmel,<chip>-tcb".

  <chip> can be "at91rm9200" or "at91sam9x5"

- reg: Should contain registers location and length

- interrupts: Should contain all interrupts for the TC block

Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* EETI eGalax Multiple Touch Controller



Required properties:

- compatible: must be "eeti,egalax_ts"

- reg: i2c slave address

- interrupt-parent: the phandle for the interrupt controller

- interrupts: touch controller interrupt

- wakeup-gpios: the gpio pin to be used for waking up the controller

  as well as uased as irq pin



Example:



	egalax_ts@04 {

		compatible = "eeti,egalax_ts";

		reg = <0x04>;

		interrupt-parent = <&gpio1>;

		interrupts = <9 2>;

		wakeup-gpios = <&gpio1 9 0>;

	};

Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ Valid values for pin and group names are: 


    With some exceptions, these support nvidia,high-speed-mode,

    nvidia,schmitt, nvidia,low-power-mode, nvidia,pull-down-strength,

    nvidia,pull-up-strength, nvidia,slew_rate-rising, nvidia,slew_rate-falling.

    nvidia,pull-up-strength, nvidia,slew-rate-rising, nvidia,slew-rate-falling.



    drive_ao1, drive_ao2, drive_at1, drive_at2, drive_cdev1, drive_cdev2,

    drive_csus, drive_dap1, drive_dap2, drive_dap3, drive_dap4, drive_dbg,