Merge tag 'meson-for-4.5/dts' of https://github.com/carlocaione/linux-meson into next/dt

Browse source

Merge "Amlogic DT changes for 4.5" from Carlo Caione:

This pull request includes the Amlogic Meson8b DTS changes for v4.5

* tag 'meson-for-4.5/dts' of https://github.com/carlocaione/linux-meson:
  ARM: dts: meson8b: Add watchdog node
  Documentation: watchdog: Add new bindings for meson8b
  ARM: meson: Add status LED for Odroid-C1

...

This commit is contained in:

Arnd Bergmann 2016-01-08 11:43:57 +01:00

parent 03b9ee45bc e9c478a93c

commit 3c81e4e60a

4 changed files with 30 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/devicetree/bindings/watchdog/meson6-wdt.txt → Documentation/devicetree/bindings/watchdog/meson-wdt.txt

View file

11

arch/arm/boot/dts/meson8b-odroidc1.dts

View file

6

arch/arm/boot/dts/meson8b.dtsi

View file