Merge tag 'ib-mfd-spi-tty-v4.20-1' of git://git.kernel.org/pub/scm/li…

…nux/kernel/git/lee/mfd into tty-next Immutable branch between MFD, SPI and TTY due for the v4.20 merge window (v2)
mariux64 · Sep 11, 2018 · 30ecfff · 30ecfff
2 parents 7779265 + 65b80df
commit 30ecfff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Documentation/devicetree/bindings/mfd/atmel-usart.txt b/Documentation/devicetree/bindings/mfd/atmel-usart.txt
@@ -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>;

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -9536,15 +9536,15 @@ 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
 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

diff --git a/drivers/mfd/at91-usart.c b/drivers/mfd/at91-usart.c
@@ -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 = {

diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c
@@ -215,9 +215,9 @@ static int at91_usart_spi_setup(struct spi_device *spi)
 	return 0;
 }
 
-int at91_usart_spi_transfer_one(struct spi_controller *ctlr,
-				struct spi_device *spi,
-				struct spi_transfer *xfer)
+static int at91_usart_spi_transfer_one(struct spi_controller *ctlr,
+				       struct spi_device *spi,
+				       struct spi_transfer *xfer)
 {
 	struct at91_usart_spi *aus = spi_master_get_devdata(ctlr);
 
@@ -242,8 +242,8 @@ int at91_usart_spi_transfer_one(struct spi_controller *ctlr,
 	return 0;
 }
 
-int at91_usart_spi_prepare_message(struct spi_controller *ctlr,
-				   struct spi_message *message)
+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);
 	struct spi_device *spi = message->spi;
@@ -256,8 +256,8 @@ int at91_usart_spi_prepare_message(struct spi_controller *ctlr,
 	return 0;
 }
 
-int at91_usart_spi_unprepare_message(struct spi_controller *ctlr,
-				     struct spi_message *message)
+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);