From: Olof Johansson Date: Wed, 19 Apr 2017 13:49:18 +0000 (-0700) Subject: Merge tag 'aspeed-4.12-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.12-rc1~56^2~10 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5fadb51017032463ff548bb33649ad79e95fecdd;p=linux.git Merge tag 'aspeed-4.12-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/dt Aspeed devicetree updates for 4.12 Updates to the device tree to include upstreamed drivers: - SPI flash controller - Watchdog - ADC In addition we describe some of the clocks so that upstream kernels can boot on hardware. * tag 'aspeed-4.12-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: arm: dts: aspeed: Describe ADCs for AST2400/AST2500 ARM: dts: aspeed: romulus: Add UART1 ARM: dts: aspeed: Update watchdog compatible strings ARM: dts: aspeed: Add a fastread property ARM: dts: aspeed: Add SPI controller bindings to Romulus ARM: dts: aspeed: Make G4 clocks fixed ARM: dts: aspeed: Make G5 clocks fixed ARM: dts: aspeed: add SPI controller bindings Signed-off-by: Olof Johansson --- 5fadb51017032463ff548bb33649ad79e95fecdd