Revert "gpu: ion: move msm-specific ioctls to custom_ioctl"

This reverts commit 317b30beeadb93036ff3adab02c22b7f570d5256.
Revert "gpu: ion: include msm-specific ion header"

This reverts commit 5ae0da8de01235f0d028253bc3d0dadfdaeb5d7b.
ion: bulk update from mako

Change-Id: I57035a880c7209387bcf2fe270545bfbc6f4abf2
ion: ioctl compat with old api

Change-Id: Iea40fac9caa783ede26281e090ec6cb82353d5bd
msm: 8974: Add function to reserve memory from device tree

Memory reservations for memory pools or using memblock remove
must happen early at bootup. Add a function at early boot to
walk the flattened device tree and extract memory reservation
information from appropriate bindings in device tree. To ensure
that the memory is only reserved when a driver is enabled,
drivers must put EXPORT_COMPAT(<compat string>) in the driver
as well as adding the binding to the device tree. More
documentation is available in
Documentation/devicetree/bindings/arm/msm/memory-reserve.txt

Change-Id: I28fa71d7a30cea9af5447acb5d2dde562fa0f6de
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/memory.c
gpu: ion: Add support for device tree.

Add device tree parsing to common msm ion code
to allow new targets to specify ION heap configuration
in device tree.

Document the device tree bindings for ION.

Change-Id: I40b7f4b1fbb3ca4ad1d6dc06a33b647f6af1d669
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
dt/flattree: Add stub defintions for flat device tree function

Several flattened device tree functions are currently accessed in a
file that is compiled regardless of whether device tree is enabled
or not. Add stubs for these functions if device tree is not selected.

Change-Id: I0bea3325692fac46d3e5ef457aa30e083f71cd6d
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>