Merge tag 'ib-mfd-spi-tty-v4.20-1' of... (30ecfff4) · Commits · 戴 / test

Documentation/devicetree/bindings/mfd/atmel-usart.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ Example:
		compatible = "atmel,at91rm9200-usart", "atmel,at91sam9260-usart";
		atmel,usart-mode = <AT91_USART_MODE_SPI>;
		reg = <0xf001c000 0x100>;
		interrupts = <12 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <12 IRQ_TYPE_LEVEL_HIGH 5>;
		clocks = <&usart0_clk>;
		clock-names = "usart";
		cs-gpios = <&pioB 3 0>;

+2 −2

Original line number	Diff line number	Diff line
		@@ -9536,7 +9536,7 @@ F: drivers/mtd/nand/raw/atmel/*
		F: Documentation/devicetree/bindings/mtd/atmel-nand.txt

		MICROCHIP AT91 USART MFD DRIVER
		M: Radu Pirea <radu.pirea@microchip.com>
		M: Radu Pirea <radu_nicolae.pirea@upb.ro>
		L: linux-kernel@vger.kernel.org
		S: Supported
		F: drivers/mfd/at91-usart.c
		@@ -9544,7 +9544,7 @@ F: include/dt-bindings/mfd/at91-usart.h
		F: Documentation/devicetree/bindings/mfd/atmel-usart.txt

		MICROCHIP AT91 USART SPI DRIVER
		M: Radu Pirea <radu.pirea@microchip.com>
		M: Radu Pirea <radu_nicolae.pirea@upb.ro>
		L: linux-spi@vger.kernel.org
		S: Supported
		F: drivers/spi/spi-at91-usart.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@

		#include <linux/module.h>
		#include <linux/mfd/core.h>
		#include <linux/of.h>
		#include <linux/property.h>

		static struct mfd_cell at91_usart_spi_subdev = {

+7 −7

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@ static int at91_usart_spi_setup(struct spi_device *spi)
		return 0;
		}

		int at91_usart_spi_transfer_one(struct spi_controller *ctlr,
		static int at91_usart_spi_transfer_one(struct spi_controller *ctlr,
		struct spi_device *spi,
		struct spi_transfer *xfer)
		{
		@@ -242,7 +242,7 @@ int at91_usart_spi_transfer_one(struct spi_controller *ctlr,
		return 0;
		}

		int at91_usart_spi_prepare_message(struct spi_controller *ctlr,
		static int at91_usart_spi_prepare_message(struct spi_controller *ctlr,
		struct spi_message *message)
		{
		struct at91_usart_spi *aus = spi_master_get_devdata(ctlr);
		@@ -256,7 +256,7 @@ int at91_usart_spi_prepare_message(struct spi_controller *ctlr,
		return 0;
		}

		int at91_usart_spi_unprepare_message(struct spi_controller *ctlr,
		static int at91_usart_spi_unprepare_message(struct spi_controller *ctlr,
		struct spi_message *message)
		{
		struct at91_usart_spi *aus = spi_master_get_devdata(ctlr);