Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 21:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Immutable branch between MFD, SPI and TTY due for the v4.20 merge window (v2)

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAluXnUsACgkQUa+KL4f8
 d2FluhAAi1hEPUXtLao5dcMSmljdk0DF+budhVLeLH/XWoPArFuX0J4x+ruIRtDI
 aXgWKhiHBqQ2plSDJNBMQvfMLjH1/C8g5TUfLgu+i4Jh2FYEeVzdAM3++WcnSHdb
 u1vEtmRVp7cl4DO2CkKL8vpK5TzA3uRj4qMHqeRAB3n501kxoUXIgIV4O3QtCdeT
 OKhMGFu8we42v485DIAa7bBEt7Po6Xqcn0Y+POrabOWQt3uHrlif8VRXvlrFYOhT
 sJOvb4B2KmDwAuQash+BE8TFTuJAXDUN1P5vnjiPaVH6qY1hnH+cF+OEq0scVvBz
 9RE7352uXTgkHAkDeRy+NKWBIwzL+nSCqXpcwPEy3JIRJAWta/Dlc2ZBrqsEPJFU
 OP01+anPAIvAMf/UDO0eCvLFO5iPqRv0RC8dH8Z1pM6sWPQAXX3kTtXTyG9FBr4A
 0fdTWFgeN02jtlLAbG3HG2n3/AJzuR96UuIA4sbEdlp5r/uueH/WshYGclbbWhoY
 v0SuGW7cR3LcI/J58mw+DoT++eIWtU2mRVs+MComI8wdPIgWpNJLzp9LQgM6ATUz
 JZfoov3XsJ90qkiqJpGipjzEbqwLDaj3N9TfsNtYI/lZfsHL1NgVpG8tx49uKLI4
 dqzZ5oEgjdmoAZ+LWEcOmXFhlZKHfQSWHJptomh6Tcl0V2dx4Yw=
 =269o
 -----END PGP SIGNATURE-----

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)
This commit is contained in:
Greg Kroah-Hartman 2018-09-11 16:02:06 +02:00
commit 30ecfff4de
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/mfd/atmel-usart.txt
View File

@ -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>;

4
MAINTAINERS
View File

@ -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
drivers/mfd/at91-usart.c
View File

@ -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 = {

14
drivers/spi/spi-at91-usart.c
View File

@ -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);