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

Merge tag 'asoc-v4.12' of... 

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

ASoC: Updates for v4.12

A quiet release for the core, but lots of new drivers this time around:

 - A new, generalized, API for hooking up jacks which makes it easier to
   write generic machine drivers for simple cases.
 - Continuing fixes for issues with the x86 CPU drivers.
 - New drivers for Cirrus CS35L35, DIO DIO2125, Everest ES7132,
   HiSilicon hi6210, Maxim MAX98927, MT2701 systems with WM8960, Nuvoton
   NAU8824, Odroid systems, ST STM32 SAI controllers and x86 systems with
   DA7213
parents d7dc450d 20d5c84b

.mailmap

+3 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,8 @@ Linas Vepstas <linas@austin.ibm.com> 
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Mark Brown <broonie@sirena.org.uk>

Mark Brown <broonie@sirena.org.uk>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Matthieu CASTET <castet.matthieu@free.fr>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
@@ -171,6 +173,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>
 
Gustavo Padovan <padovan@profusion.mobi>

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -1725,6 +1725,12 @@ 
			kernel and module base offset ASLR (Address Space

			kernel and module base offset ASLR (Address Space

			Layout Randomization).

			Layout Randomization).





	kasan_multi_shot

			[KNL] Enforce KASAN (Kernel Address Sanitizer) to print

			report on every invalid memory access. Without this

			parameter KASAN will print report only for the first

			invalid access.



	keepinitrd	[HW,ARM]

	keepinitrd	[HW,ARM]





	kernelcore=	[KNL,X86,IA-64,PPC]

	kernelcore=	[KNL,X86,IA-64,PPC]

Documentation/devicetree/bindings/arm/marvell/cp110-system-controller0.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ The following clocks are available: 
   - 1 15	SATA

   - 1 15	SATA

   - 1 16	SATA USB

   - 1 16	SATA USB

   - 1 17	Main

   - 1 17	Main

   - 1 18	SD/MMC

   - 1 18	SD/MMC/GOP

   - 1 21	Slow IO (SPI, NOR, BootROM, I2C, UART)

   - 1 21	Slow IO (SPI, NOR, BootROM, I2C, UART)

   - 1 22	USB3H0

   - 1 22	USB3H0

   - 1 23	USB3H1

   - 1 23	USB3H1
@@ -65,7 +65,7 @@ Required properties: 
	"cpm-audio", "cpm-communit", "cpm-nand", "cpm-ppv2", "cpm-sdio",

	"cpm-audio", "cpm-communit", "cpm-nand", "cpm-ppv2", "cpm-sdio",

	"cpm-mg-domain", "cpm-mg-core", "cpm-xor1", "cpm-xor0", "cpm-gop-dp", "none",

	"cpm-mg-domain", "cpm-mg-core", "cpm-xor1", "cpm-xor0", "cpm-gop-dp", "none",

	"cpm-pcie_x10", "cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor", "cpm-sata",

	"cpm-pcie_x10", "cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor", "cpm-sata",

	"cpm-sata-usb", "cpm-main", "cpm-sd-mmc", "none", "none", "cpm-slow-io",

	"cpm-sata-usb", "cpm-main", "cpm-sd-mmc-gop", "none", "none", "cpm-slow-io",

	"cpm-usb3h0", "cpm-usb3h1", "cpm-usb3dev", "cpm-eip150", "cpm-eip197";

	"cpm-usb3h0", "cpm-usb3h1", "cpm-usb3dev", "cpm-eip150", "cpm-eip197";





Example:

Example:
@@ -78,6 +78,6 @@ Example: 
		gate-clock-output-names = "cpm-audio", "cpm-communit", "cpm-nand", "cpm-ppv2", "cpm-sdio",

		gate-clock-output-names = "cpm-audio", "cpm-communit", "cpm-nand", "cpm-ppv2", "cpm-sdio",

			"cpm-mg-domain", "cpm-mg-core", "cpm-xor1", "cpm-xor0", "cpm-gop-dp", "none",

			"cpm-mg-domain", "cpm-mg-core", "cpm-xor1", "cpm-xor0", "cpm-gop-dp", "none",

			"cpm-pcie_x10", "cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor", "cpm-sata",

			"cpm-pcie_x10", "cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor", "cpm-sata",

			"cpm-sata-usb", "cpm-main", "cpm-sd-mmc", "none", "none", "cpm-slow-io",

			"cpm-sata-usb", "cpm-main", "cpm-sd-mmc-gop", "none", "none", "cpm-slow-io",

			"cpm-usb3h0", "cpm-usb3h1", "cpm-usb3dev", "cpm-eip150", "cpm-eip197";

			"cpm-usb3h0", "cpm-usb3h1", "cpm-usb3dev", "cpm-eip150", "cpm-eip197";

	};
 
	};

Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ Required properties: 
  - compatible: value should be one of the following

  - compatible: value should be one of the following

		"samsung,exynos3250-mipi-dsi" /* for Exynos3250/3472 SoCs */

		"samsung,exynos3250-mipi-dsi" /* for Exynos3250/3472 SoCs */

		"samsung,exynos4210-mipi-dsi" /* for Exynos4 SoCs */

		"samsung,exynos4210-mipi-dsi" /* for Exynos4 SoCs */

		"samsung,exynos4415-mipi-dsi" /* for Exynos4415 SoC */

		"samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */

		"samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */

		"samsung,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */

		"samsung,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */

		"samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */

		"samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */

Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,6 @@ Required properties: 
		"samsung,s5pv210-fimd"; /* for S5PV210 SoC */

		"samsung,s5pv210-fimd"; /* for S5PV210 SoC */

		"samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */

		"samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */

		"samsung,exynos4210-fimd"; /* for Exynos4 SoCs */

		"samsung,exynos4210-fimd"; /* for Exynos4 SoCs */

		"samsung,exynos4415-fimd"; /* for Exynos4415 SoC */

		"samsung,exynos5250-fimd"; /* for Exynos5250 SoCs */

		"samsung,exynos5250-fimd"; /* for Exynos5250 SoCs */

		"samsung,exynos5420-fimd"; /* for Exynos5420/5422/5800 SoCs */

		"samsung,exynos5420-fimd"; /* for Exynos5420/5422/5800 SoCs */

CRA Git | Maintained and supported by SUSTech CRA and CCSE