From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Aug 2014 15:53:39 +0000 (-0600)
Subject: Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
X-Git-Tag: v3.17-rc1~26
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=ae36e95cf81c98b111b84317adeb358aaffa80e2;p=cascardo%2Flinux.git

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

Pull device tree updates from Grant Likely:
 "The branch contains the following device tree changes the v3.17 merge
  window:

  Group changes to the device tree.  In preparation for adding device
  tree overlay support, OF_DYNAMIC is reworked so that a set of device
  tree changes can be prepared and applied to the tree all at once.
  OF_RECONFIG notifiers see the most significant change here so that
  users always get a consistent view of the tree.  Notifiers generation
  is moved from before a change to after it, and notifiers for a group
  of changes are emitted after the entire block of changes have been
  applied

  Automatic console selection from DT.  Console drivers can now use
  of_console_check() to see if the device node is specified as a console
  device.  If so then it gets added as a preferred console.  UART
  devices get this support automatically when uart_add_one_port() is
  called.

  DT unit tests no longer depend on pre-loaded data in the device tree.
  Data is loaded dynamically at the start of unit tests, and then
  unloaded again when the tests have completed.

  Also contains a few bugfixes for reserved regions and early memory
  setup"

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: (21 commits)
  of: Fixing OF Selftest build error
  drivers: of: add automated assignment of reserved regions to client devices
  of: Use proper types for checking memory overflow
  of: typo fix in __of_prop_dup()
  Adding selftest testdata dynamically into live tree
  of: Add todo tasklist for Devicetree
  of: Transactional DT support.
  of: Reorder device tree changes and notifiers
  of: Move dynamic node fixups out of powerpc and into common code
  of: Make sure attached nodes don't carry along extra children
  of: Make devicetree sysfs update functions consistent.
  of: Create unlocked versions of node and property add/remove functions
  OF: Utility helper functions for dynamic nodes
  of: Move CONFIG_OF_DYNAMIC code into a separate file
  of: rename of_aliases_mutex to just of_mutex
  of/platform: Fix of_platform_device_destroy iteration of devices
  of: Migrate of_find_node_by_name() users to for_each_node_by_name()
  tty: Update hypervisor tty drivers to use core stdout parsing code.
  arm/versatile: Add the uart as the stdout device.
  of: Enable console on serial ports specified by /chosen/stdout-path
  ...
---

ae36e95cf81c98b111b84317adeb358aaffa80e2
diff --cc arch/powerpc/platforms/powermac/feature.c
index 1413e72bc2e1,39e1d163c427..4882bfd90e27
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@@ -2823,10 -2819,9 +2819,9 @@@ set_initial_features(void
  				macio_chips[0].flags |= MACIO_FLAG_FW_SUPPORTED;
  				g5_fw_enable(np, 0, 1);
  			}
- 			np = of_find_node_by_name(np, "firewire");
  		}
  	}
 -#else /* CONFIG_POWER4 */
 +#else /* CONFIG_PPC64 */
  
  	if (macio_chips[0].type == macio_keylargo ||
  	    macio_chips[0].type == macio_pangea ||