diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 16:32:45 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 16:32:45 +0300 |
commit | b295477e0026b92cceba642b111a3efd569d3cc5 (patch) | |
tree | 8f424c4b83b7eaeaa33742effcad47d541f4d0e2 /arch/arm/mach-imx/pcm037.h | |
parent | a2c614a7db32b28e19c283b8764fabd786216d0f (diff) | |
parent | c4e3bf290c3089502ee33e25795075b86fe9a449 (diff) | |
download | linux-b295477e0026b92cceba642b111a3efd569d3cc5.tar.xz |
Merge tag 'mvebu-dt64-4.15-1' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt64 for 4.15 (part 1)" from Gregory CLEMENT:
On Armada 7K/8k:
- Improve network support at SoC and board level
- Enable watchdog
- Add UART muxing
- On 7040 DB: add CD SDIO and NAND support
- On 8040 DB: add PCIE more ports and SPI1
On Armada 37xx:
- Fix UART register size
- Add vmmc regulator for SD on 3720 DB
* tag 'mvebu-dt64-4.15-1' of git://git.infradead.org/linux-mvebu:
arm64: dts: marvell: 7040-db: Add the carrier detect pin for SD card on CP
arm64: dts: marvell: 7040-db: Document the gpio expander
arm64: dts: marvell: enable additional PCIe ports on Armada 8040 DB
arm64: dts: marvell: add NAND support on the 7040-DB board
arm64: dts: marvell: Enable Armada-8040-DB CPS SPI1
arm64: dts: marvell: 8040-db: enable the SFP ports
arm64: dts: marvell: 7040-db: enable the SFP port
arm64: dts: marvell: 7040-db: add comphy reference to Ethernet port
arm64: dts: marvell: mcbin: add comphy references to Ethernet ports
arm64: dts: marvell: 37xx: remove empty line
arm64: dts: marvell: cp110: add PPv2 port interrupts
arm64: dts: marvell: add comphy nodes on cp110 master and slave
arm64: dts: marvell: extend the cp110 syscon register area length
arm64: dts: marvell: enable AP806 watchdog
arm64: dts: marvell: Fix A37xx UART0 register size
arm64: dts: marvell: armada-3720-db: Add vmmc regulator for SD slot
arm64: dts: marvell: add UART muxing on Armada 7K/8K
Diffstat (limited to 'arch/arm/mach-imx/pcm037.h')
0 files changed, 0 insertions, 0 deletions