Unverified Commit cb71d8ef authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "Compatible string consolidation for NXP DSPI driver" from... 

Merge series "Compatible string consolidation for NXP DSPI driver" from Vladimir Oltean <olteanv@gmail.com>:

This series makes room in the driver for differentiation between the
controllers which currently operate in TCFQ mode. Most of these are
actually capable of a lot more in terms of throughput. This is in
preparation of a second series which will convert the remaining users of
TCFQ mode altogether to XSPI mode with command cycling.

Vladimir Oltean (6):
  doc: spi-fsl-dspi: Add specific compatibles for all Layerscape SoCs
  spi: spi-fsl-dspi: Use specific compatible strings for all SoC
    instantiations
  spi: spi-fsl-dspi: Parameterize the FIFO size and DMA buffer size
  spi: spi-fsl-dspi: LS2080A and LX2160A support XSPI mode
  spi: spi-fsl-dspi: Support SPI software timestamping in all non-DMA
    modes
  spi: spi-fsl-dspi: Convert the instantiations that support it to DMA

 .../devicetree/bindings/spi/spi-fsl-dspi.txt  |  17 +-
 drivers/spi/spi-fsl-dspi.c                    | 162 +++++++++++++-----
 2 files changed, 128 insertions(+), 51 deletions(-)

--
2.17.1
parents 4709d86c 50b62071

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ modules.order 
/include/ksym/

/arch/*/include/generated/



# Generated lkdtm tests

/tools/testing/selftests/lkdtm/*.sh

!/tools/testing/selftests/lkdtm/run.sh



# stgit generated dirs

patches-*

COPYING

+2 −0
Original line number Diff line number Diff line
@@ -16,3 +16,5 @@ In addition, other licenses may also apply. Please see: 
	Documentation/process/license-rules.rst



for more details.



All contributions to the Linux Kernel are subject to this COPYING file.

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -567,6 +567,11 @@ D: Original author of Amiga FFS filesystem 
S: Orlando, Florida

S: USA



N: Paul Burton

E: paulburton@kernel.org

W: https://pburton.com

D: MIPS maintainer 2018-2020



N: Lennert Buytenhek

E: kernel@wantstofly.org

D: Original (2.4) rewrite of the ethernet bridging code

Documentation/admin-guide/bootconfig.rst

+31 −3
Original line number Diff line number Diff line
@@ -62,6 +62,30 @@ Or more shorter, written as following:: 
In both styles, same key words are automatically merged when parsing it

at boot time. So you can append similar trees or key-values.



Same-key Values

---------------



It is prohibited that two or more values or arrays share a same-key.

For example,::



 foo = bar, baz

 foo = qux  # !ERROR! we can not re-define same key



If you want to append the value to existing key as an array member,

you can use ``+=`` operator. For example::



 foo = bar, baz

 foo += qux



In this case, the key ``foo`` has ``bar``, ``baz`` and ``qux``.



However, a sub-key and a value can not co-exist under a parent key.

For example, following config is NOT allowed.::



 foo = value1

 foo.bar = value2 # !ERROR! subkey "bar" and value "value1" can NOT co-exist





Comments

--------
@@ -102,9 +126,13 @@ Boot Kernel With a Boot Config 
==============================



Since the boot configuration file is loaded with initrd, it will be added

to the end of the initrd (initramfs) image file. The Linux kernel decodes

the last part of the initrd image in memory to get the boot configuration

data.

to the end of the initrd (initramfs) image file with size, checksum and

12-byte magic word as below.



[initrd][bootconfig][size(u32)][checksum(u32)][#BOOTCONFIG\n]



The Linux kernel decodes the last part of the initrd image in memory to

get the boot configuration data.

Because of this "piggyback" method, there is no need to change or

update the boot loader and the kernel image itself.

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@ 
			dynamic table installation which will install SSDT

			tables to /sys/firmware/acpi/tables/dynamic.



	acpi_no_watchdog	[HW,ACPI,WDT]

			Ignore the ACPI-based watchdog interface (WDAT) and let

			a native driver control the watchdog device instead.



	acpi_rsdp=	[ACPI,EFI,KEXEC]

			Pass the RSDP address to the kernel, mostly used

			on machines running EFI runtime service to boot the

CRA Git | Maintained and supported by SUSTech CRA and CCSE