From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Jan 2016 19:13:28 +0000 (-0800)
Subject: Merge tag 'devicetree-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh... 
X-Git-Tag: v4.5-rc1~104
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=5339f9d4c2ceccab00b28d65bd5c2b2cd6a3de05

Merge tag 'devicetree-for-4.5' of git://git./linux/kernel/git/robh/linux

Pull DeviceTree updates from Rob Herring:

 - Rework and export the changeset API to make it available to users
   other than DT overlays

 - ARM secure devices binding

 - OCTEON USB binding

 - Clean-up of various SRAM binding docs

 - Various other binding doc updates

* tag 'devicetree-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (21 commits)
  drivers/of: Export OF changeset functions
  Fix documentation for adp1653 DT
  ARM: psci: Fix indentation in DT bindings
  of/platform: export of_default_bus_match_table
  of/unittest: Show broken behaviour in the platform bus
  of: fix declaration of of_io_request_and_map
  of/address: replace printk(KERN_ERR ...) with pr_err(...)
  of/irq: optimize device node matching loop in of_irq_init()
  dt-bindings: tda998x: Document the required 'port' node.
  net/macb: bindings doc: Merge cdns-emac to macb
  dt-bindings: Misc fix for the ATH79 DDR controllers
  dt-bindings: Misc fix for the ATH79 MISC interrupt controllers
  Documentation: dt: Add bindings for Secure-only devices
  dt-bindings: ARM: add arm,cortex-a72 compatible string
  ASoC: Atmel: ClassD: add GCK's parent clock in DT binding
  DT: add Olimex to vendor prefixes
  Documentation: fsl-quadspi: Add fsl,ls1021-qspi compatible string
  Documentation/devicetree: document OCTEON USB bindings
  usb: misc: usb3503: Describe better how to bind clock to the hub
  dt-bindings: Consolidate SRAM bindings from all vendors
  ...
---

5339f9d4c2ceccab00b28d65bd5c2b2cd6a3de05
diff --cc Documentation/devicetree/bindings/net/macb.txt
index 5c397ca14cfe,1361a6daf63f..d2e243b1ec0e
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@@ -2,9 -2,9 +2,10 @@@
  
  Required properties:
  - compatible: Should be "cdns,[<chip>-]{macb|gem}"
+   Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.
    Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs or the 10/100Mbit IP
    available on sama5d3 SoCs.
 +  Use "cdns,np4-macb" for NP4 SoC devices.
    Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
    Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
    the Cadence GEM, or the generic form: "cdns,gem".