diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 19:17:25 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 19:17:25 +0300 |
| commit | 8c11fcc212d763de6e6c068e7153a3b8b36b253d (patch) | |
| tree | b678f20198f98a44dc6b8a456a89085f89c38664 /drivers/media/rc/rc-main.c | |
| parent | c503f594d63c221db619c901d36d1139f9ce354f (diff) | |
| parent | 474c5885582c4a79c21bcf01ed98f98c935f1f4a (diff) | |
| download | linux-8c11fcc212d763de6e6c068e7153a3b8b36b253d.tar.xz | |
Merge tag 'mvebu-dt64-4.16-2' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt64 for 4.16 (part 2)" from Gregory CLEMENT:
The main change here are the series of commits doing the Armada 7K/8K
CP110 DT de-duplication, they include the de-duplication itself and
small fixes in the device tree files.
Besides them there are 2 other patches:
- One adding the crypto support for Armada 37xx SoCs
- An other adding Ethernet aliases on A7K/A8K base boards
* tag 'mvebu-dt64-4.16-2' of git://git.infradead.org/linux-mvebu:
arm64: dts: marvell: add Ethernet aliases
arm64: dts: marvell: replace cpm by cp0, cps by cp1
arm64: dts: marvell: de-duplicate CP110 description
arm64: dts: marvell: use aliases for SPI busses on Armada 7K/8K
arm64: dts: marvell: use mvebu-icu.h where possible
arm64: dts: marvell: fix compatible string list for Armada CP110 slave NAND
arm64: dts: marvell: fix typos in comment describing the NAND controller
arm64: dts: marvell: use lower case for unit address and reg property
arm64: dts: marvell: fix watchdog unit address in Armada AP806
arm64: dts: marvell: armada-37xx: add a crypto node
ARM64: dts: marvell: armada-cp110: Fix clock resources for various node
ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7
Diffstat (limited to 'drivers/media/rc/rc-main.c')
0 files changed, 0 insertions, 0 deletions