Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek',... (2c0248d6) · Commits · e / devices / android_kernel_oneplus_sm7250

.mailmap

+3 −0

Original line number	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@ascom.ch>
		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>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
		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@parallels.com>
		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
		Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
		Yusuke Goda <goda.yusuke@renesas.com>
		Gustavo Padovan <gustavo@las.ic.unicamp.br>
		Gustavo Padovan <padovan@profusion.mobi>

+21 −0

Original line number	Diff line number	Diff line
		@@ -1578,6 +1578,15 @@
		extended tables themselves, and also PASID support. With
		this option set, extended tables will not be used even
		on hardware which claims to support them.
		tboot_noforce [Default Off]
		Do not force the Intel IOMMU enabled under tboot.
		By default, tboot will force Intel IOMMU on, which
		could harm performance of some high-throughput
		devices like 40GBit network cards, even if identity
		mapping is enabled.
		Note that using this option lowers the security
		provided by tboot because it makes the system
		vulnerable to DMA attacks.

		intel_idle.max_cstate= [KNL,HW,ACPI,X86]
		0 disables intel_idle and fall back on acpi_idle.
		@@ -1644,6 +1653,12 @@
		nobypass [PPC/POWERNV]
		Disable IOMMU bypass, using IOMMU for PCI devices.

		iommu.passthrough=
		[ARM64] Configure DMA to bypass the IOMMU by default.
		Format: { "0" \| "1" }
		0 - Use IOMMU translation for DMA.
		1 - Bypass the IOMMU for DMA.
		unset - Use IOMMU translation for DMA.

		io7= [HW] IO7 for Marvel based alpha systems
		See comment before marvel_specify_io7 in
		@@ -1725,6 +1740,12 @@
		kernel and module base offset ASLR (Address Space
		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]

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ The following clocks are available:
		- 1 15 SATA
		- 1 16 SATA USB
		- 1 17 Main
		- 1 18 SD/MMC
		- 1 18 SD/MMC/GOP
		- 1 21 Slow IO (SPI, NOR, BootROM, I2C, UART)
		- 1 22 USB3H0
		- 1 23 USB3H1
		@@ -65,7 +65,7 @@ Required properties:
		"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-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";

		Example:
		@@ -78,6 +78,6 @@ Example:
		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-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";
		};

+0 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ Required properties:
		- compatible: value should be one of the following
		"samsung,exynos3250-mipi-dsi" /* for Exynos3250/3472 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,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */
		"samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ Required properties:
		"samsung,s5pv210-fimd"; /* for S5PV210 SoC */
		"samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */
		"samsung,exynos4210-fimd"; /* for Exynos4 SoCs */
		"samsung,exynos4415-fimd"; /* for Exynos4415 SoC */
		"samsung,exynos5250-fimd"; /* for Exynos5250 SoCs */
		"samsung,exynos5420-fimd"; /* for Exynos5420/5422/5800 SoCs */