diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-11 16:02:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-11 16:02:06 +0200 |
| commit | 30ecfff4de7cc222219f2cabcebfcd79604fc87f (patch) | |
| tree | e7298dc3df3228f8c06fd25c598e042148af5343 | |
| parent | 77792652d602867527f45739d5411bbb8d7010c8 (diff) | |
| parent | 65b80dfffeabd4eb253b93d07eadde4d89c18511 (diff) | |
Merge tag 'ib-mfd-spi-tty-v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into tty-next
Immutable branch between MFD, SPI and TTY due for the v4.20 merge window (v2)
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/atmel-usart.txt | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | drivers/mfd/at91-usart.c | 1 | ||||
| -rw-r--r-- | drivers/spi/spi-at91-usart.c | 14 |
4 files changed, 11 insertions, 10 deletions
diff --git a/Documentation/devicetree/bindings/mfd/atmel-usart.txt b/Documentation/devicetree/bindings/mfd/atmel-usart.txt index 0348fef0f497..7f0cd72f47d2 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>; diff --git a/MAINTAINERS b/MAINTAINERS index 2fc051e3a90e..bdf4225f4648 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/mfd/at91-usart.c b/drivers/mfd/at91-usart.c index a4b9929c156f..d20747f612c1 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 = { diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c index 4712bd470c89..a924657642fa 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); |