lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Pull device tree fixes from Grant Likely:
 "Device tree bug fixes and documentation updates for v3.10

  Nothing earth shattering here.  A build failure fix, and fix for
  releasing nodes and some documenation updates."

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
  Documentation/devicetree: make semantic of initrd-end more explicit
  of/base: release the node correctly in of_parse_phandle_with_args()
  of/documentation: move video device bindings to a common place
  <linux/of_platform.h>: fix compilation warnings with DT disabled
This commit is contained in:
Linus Torvalds
2013-05-18 10:46:50 -07:00
parent 3c6a279ffc 3132f62338
commit ff9129b06c
7 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Documentation/devicetree/bindings/drm/exynos/hdmi.txt → Documentation/devicetree/bindings/video/exynos_hdmi.txt
View File

0
Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt → Documentation/devicetree/bindings/video/exynos_hdmiddc.txt
View File

0
Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt → Documentation/devicetree/bindings/video/exynos_hdmiphy.txt
View File

0
Documentation/devicetree/bindings/drm/exynos/mixer.txt → Documentation/devicetree/bindings/video/exynos_mixer.txt
View File

8
Documentation/devicetree/usage-model.txt
View File

@@ -191,9 +191,11 @@ Linux it will look something like this:
}; };
The bootargs property contains the kernel arguments, and the initrd-* The bootargs property contains the kernel arguments, and the initrd-*
properties define the address and size of an initrd blob. The properties define the address and size of an initrd blob. Note that
chosen node may also optionally contain an arbitrary number of initrd-end is the first address after the initrd image, so this doesn't
additional properties for platform-specific configuration data. match the usual semantic of struct resource. The chosen node may also
optionally contain an arbitrary number of additional properties for
platform-specific configuration data.
During early boot, the architecture setup code calls of_scan_flat_dt() During early boot, the architecture setup code calls of_scan_flat_dt()
several times with different helper callbacks to parse device tree several times with different helper callbacks to parse device tree

4
drivers/of/base.c
View File

@@ -1208,11 +1208,11 @@ static int __of_parse_phandle_with_args(const struct device_node *np,
out_args->args_count = count; out_args->args_count = count;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
out_args->args[i] = be32_to_cpup(list++); out_args->args[i] = be32_to_cpup(list++);
} else {
of_node_put(node);
} }
/* Found it! return success */ /* Found it! return success */
if (node)
of_node_put(node);
return 0; return 0;
} }

5
include/linux/of_platform.h
View File

@@ -11,9 +11,10 @@
* *
*/ */
#ifdef CONFIG_OF_DEVICE
#include <linux/device.h> #include <linux/device.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#ifdef CONFIG_OF_DEVICE
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@@ -100,7 +101,7 @@ extern int of_platform_populate(struct device_node *root,
#if !defined(CONFIG_OF_ADDRESS) #if !defined(CONFIG_OF_ADDRESS)
struct of_dev_auxdata; struct of_dev_auxdata;
struct device; struct device_node;
static inline int of_platform_populate(struct device_node *root, static inline int of_platform_populate(struct device_node *root,
const struct of_device_id *matches, const struct of_device_id *matches,
const struct of_dev_auxdata *lookup, const struct of_dev_auxdata *lookup,