Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/st-ssc4' and... (082f6968) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/devicetree/bindings/spi/spi-stm32.txt

0 → 100644

+59 −0

Original line number	Original line	Diff line number	Diff line
			STMicroelectronics STM32 SPI Controller

			The STM32 SPI controller is used to communicate with external devices using
			the Serial Peripheral Interface. It supports full-duplex, half-duplex and
			simplex synchronous serial communication with external devices. It supports
			from 4 to 32-bit data size. Although it can be configured as master or slave,
			only master is supported by the driver.

			Required properties:
			- compatible: Must be "st,stm32h7-spi".
			- reg: Offset and length of the device's register set.
			- interrupts: Must contain the interrupt id.
			- clocks: Must contain an entry for spiclk (which feeds the internal clock
			generator).
			- #address-cells: Number of cells required to define a chip select address.
			- #size-cells: Should be zero.

			Optional properties:
			- resets: Must contain the phandle to the reset controller.
			- A pinctrl state named "default" may be defined to set pins in mode of
			operation for SPI transfer.
			- dmas: DMA specifiers for tx and rx dma. DMA fifo mode must be used. See the
			STM32 DMA bindings, Documentation/devicetree/bindings/dma/stm32-dma.txt.
			- dma-names: DMA request names should include "tx" and "rx" if present.
			- cs-gpios: list of GPIO chip selects. See the SPI bus bindings,
			Documentation/devicetree/bindings/spi/spi-bus.txt


			Child nodes represent devices on the SPI bus
			See ../spi/spi-bus.txt

			Optional properties:
			- st,spi-midi-ns: (Master Inter-Data Idleness) minimum time delay in
			nanoseconds inserted between two consecutive data frames.


			Example:
			spi2: spi@40003800 {
			#address-cells = <1>;
			#size-cells = <0>;
			compatible = "st,stm32h7-spi";
			reg = <0x40003800 0x400>;
			interrupts = <36>;
			clocks = <&rcc SPI2_CK>;
			resets = <&rcc 1166>;
			dmas = <&dmamux1 0 39 0x400 0x01>,
			<&dmamux1 1 40 0x400 0x01>;
			dma-names = "rx", "tx";
			pinctrl-0 = <&spi2_pins_b>;
			pinctrl-names = "default";
			cs-gpios = <&gpioa 11 0>;

			aardvark@0 {
			compatible = "totalphase,aardvark";
			reg = <0>;
			spi-max-frequency = <4000000>;
			st,spi-midi-ns = <4000>;
			};
			};

drivers/spi/Kconfig

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -627,6 +627,16 @@ config SPI_SIRF
	help		help
	SPI driver for CSR SiRFprimaII SoCs		SPI driver for CSR SiRFprimaII SoCs

			config SPI_STM32
			tristate "STMicroelectronics STM32 SPI controller"
			depends on ARCH_STM32 \|\| COMPILE_TEST
			help
			SPI driver for STMicroelectonics STM32 SoCs.

			STM32 SPI controller supports DMA and PIO modes. When DMA
			is not available, the driver automatically falls back to
			PIO mode.

	config SPI_ST_SSC4		config SPI_ST_SSC4
	tristate "STMicroelectronics SPI SSC-based driver"		tristate "STMicroelectronics SPI SSC-based driver"
	depends on ARCH_STI \|\| COMPILE_TEST		depends on ARCH_STI \|\| COMPILE_TEST

drivers/spi/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,7 @@ obj-$(CONFIG_SPI_SH_HSPI) += spi-sh-hspi.o
	obj-$(CONFIG_SPI_SH_MSIOF) += spi-sh-msiof.o		obj-$(CONFIG_SPI_SH_MSIOF) += spi-sh-msiof.o
	obj-$(CONFIG_SPI_SH_SCI) += spi-sh-sci.o		obj-$(CONFIG_SPI_SH_SCI) += spi-sh-sci.o
	obj-$(CONFIG_SPI_SIRF) += spi-sirf.o		obj-$(CONFIG_SPI_SIRF) += spi-sirf.o
			obj-$(CONFIG_SPI_STM32) += spi-stm32.o
	obj-$(CONFIG_SPI_ST_SSC4) += spi-st-ssc4.o		obj-$(CONFIG_SPI_ST_SSC4) += spi-st-ssc4.o
	obj-$(CONFIG_SPI_SUN4I) += spi-sun4i.o		obj-$(CONFIG_SPI_SUN4I) += spi-sun4i.o
	obj-$(CONFIG_SPI_SUN6I) += spi-sun6i.o		obj-$(CONFIG_SPI_SUN6I) += spi-sun6i.o

drivers/spi/spi-stm32.c

0 → 100644

+1322 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/spi/spidev.c

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -99,7 +99,6 @@ MODULE_PARM_DESC(bufsiz, "data bytes in biggest supported SPI message");
	static ssize_t		static ssize_t
	spidev_sync(struct spidev_data spidev, struct spi_message message)		spidev_sync(struct spidev_data spidev, struct spi_message message)
	{		{
	DECLARE_COMPLETION_ONSTACK(done);
	int status;		int status;
	struct spi_device *spi;		struct spi_device *spi;

	@@ -325,7 +324,6 @@ static struct spi_ioc_transfer *
	spidev_get_ioc_message(unsigned int cmd, struct spi_ioc_transfer __user *u_ioc,		spidev_get_ioc_message(unsigned int cmd, struct spi_ioc_transfer __user *u_ioc,
	unsigned *n_ioc)		unsigned *n_ioc)
	{		{
	struct spi_ioc_transfer *ioc;
	u32 tmp;		u32 tmp;

	/* Check type, command number and direction */		/* Check type, command number and direction */
	@@ -342,14 +340,7 @@ spidev_get_ioc_message(unsigned int cmd, struct spi_ioc_transfer __user *u_ioc,
	return NULL;		return NULL;

	/* copy into scratch area */		/* copy into scratch area */
	ioc = kmalloc(tmp, GFP_KERNEL);		return memdup_user(u_ioc, tmp);
	if (!ioc)
	return ERR_PTR(-ENOMEM);
	if (__copy_from_user(ioc, u_ioc, tmp)) {
	kfree(ioc);
	return ERR_PTR(-EFAULT);
	}
	return ioc;
	}		}

	static long		static long

drivers/spi/spi-st-ssc4.c

+19 −19

File changed.

Contains only whitespace changes.