diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-26 00:12:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-26 00:12:56 -0700 |
| commit | 1ca8c0a763418d7f15f5d1d13c3005b6d3a083db (patch) | |
| tree | 0072c1d2c7c9986fac133d2dcff096be9810e273 /MAINTAINERS | |
| parent | 92f06c384b4950d1fc9e7177dd722a45c28a07f9 (diff) | |
| parent | 4625210899095195600062ff8542f37a1c9f5dd4 (diff) | |
| download | blackbird-obmc-linux-1ca8c0a763418d7f15f5d1d13c3005b6d3a083db.tar.gz blackbird-obmc-linux-1ca8c0a763418d7f15f5d1d13c3005b6d3a083db.zip | |
Merge tag 'soc-fsl-for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into next/drivers
Various updates to soc/fsl for 4.19
Moves DPAA2 DPIO driver from staging to fsl/soc
Adds multiple-pin support to QE gpio driver
* tag 'soc-fsl-for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
soc: fsl: cleanup Kconfig menu
soc: fsl: dpio: Convert DPIO documentation to .rst
staging: fsl-mc: Remove remaining files
staging: fsl-mc: Move DPIO from staging to drivers/soc/fsl
staging: fsl-dpaa2: eth: move generic FD defines to DPIO
soc: fsl: qe: gpio: Add qe_gpio_set_multiple
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 07d1576fc766..24fbe6583b02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4418,7 +4418,7 @@ DPAA2 DATAPATH I/O (DPIO) DRIVER M: Roy Pledge <Roy.Pledge@nxp.com> L: linux-kernel@vger.kernel.org S: Maintained -F: drivers/staging/fsl-mc/bus/dpio +F: drivers/soc/fsl/dpio DPAA2 ETHERNET DRIVER M: Ioana Radulescu <ruxandra.radulescu@nxp.com> |
