From: Olof Johansson <olof@lixom.net>
Date: Wed, 19 Apr 2017 13:33:26 +0000 (-0700)
Subject: Merge tag 'mvebu-dt64-4.12-2' of git://git.infradead.org/linux-mvebu into next/dt64
X-Git-Tag: v4.12-rc1~52^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d0815dfd91e7d877f9a23a4ef46aeec9851115db;p=linux.git

Merge tag 'mvebu-dt64-4.12-2' of git://git.infradead.org/linux-mvebu into next/dt64

mvebu dt64 for 4.12 (part 2)

- crypto engine description for the Armada 7k/8k SoCs and the boards
  using it
- SDHCI description for the Armada 37xx and 7k/8k SoCs and the boards
  using it

* tag 'mvebu-dt64-4.12-2' of git://git.infradead.org/linux-mvebu:
  arm64: marvell: dts: enable the crypto engine on the Armada 8040 DB
  arm64: marvell: dts: enable the crypto engine on the Armada 7040 DB
  arm64: marvell: dts: add crypto engine description for 7k/8k
  arm64: dts: marvell: add sdhci support for Armada 7K/8K
  arm64: dts: marvell: add eMMC support for Armada 37xx

Signed-off-by: Olof Johansson <olof@lixom.net>
---

d0815dfd91e7d877f9a23a4ef46aeec9851115db