From 56060b04c6d2986b6575019143df77c3c379a757 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 11 Sep 2018 11:38:30 +0100
Subject: [PATCH 1/4] dt-bindings: mfd: atmel-usart: Correct interrupts
property to include IRQ number
IRQ number was missing.
Suggested-by: Radu Nicolae Pirea <pirea.radu@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
Documentation/devicetree/bindings/mfd/atmel-usart.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mfd/atmel-usart.txt b/Documentation/devicetree/bindings/mfd/atmel-usart.txt
index 0348fef0f4972..7f0cd72f47d2c 100644
--- 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>;
From 8a3813235502b704fe7ee9247689e97a3c165565 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 11 Sep 2018 11:38:42 +0100
Subject: [PATCH 2/4] MAINTAINERS: Change Radu's email address
Radu is no longer with Microchip.
Suggested-by: Radu Nicolae Pirea <pirea.radu@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
MAINTAINERS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 6f28804e01bbc..d41cc6d9ab596 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9535,7 +9535,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
@@ -9543,7 +9543,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
From 259e0a00dc7c74617a8b2e33ae3604e4ffaed9cd Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 11 Sep 2018 11:38:50 +0100
Subject: [PATCH 3/4] spi: at91-usart: Make local functions static
Suggested-by: Radu Nicolae Pirea <pirea.radu@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/spi/spi-at91-usart.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c
index 4712bd470c89d..a924657642fa8 100644
--- 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);
From 65b80dfffeabd4eb253b93d07eadde4d89c18511 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 11 Sep 2018 11:34:27 +0100
Subject: [PATCH 4/4] mfd: at91-usart: Include Device Tree header
Will ensure 'of_device_id' is declared.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/at91-usart.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mfd/at91-usart.c b/drivers/mfd/at91-usart.c
index a4b9929c156f8..d20747f612c19 100644
--- 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 = {