Commit 31a3fcab authored by Linus Torvalds's avatar Linus Torvalds

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

Pull device tree fixes from Grant Likely:
 "Drivercore bugfixes for v3.15

  This branch contains bug fixes important to get into v3.15.  There is
  a fix for modifying properties seen during early boot, a fix for an
  incorrect prototype when CONFIG_OF=n, and a couple of corrections to
  device tree memory nodes on a few platforms"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
  mips: dts: Fix missing device_type="memory" property in memory nodes
  arm: dts: Fix missing device_type="memory" for ste-ccu8540
  of: fix CONFIG_OF=n prototype of of_node_full_name()
  of: make of_update_property() usable earlier in the boot process
parents 60b5f90d dfc44f80
...@@ -18,6 +18,7 @@ / { ...@@ -18,6 +18,7 @@ / {
compatible = "st-ericsson,ccu8540", "st-ericsson,u8540"; compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
memory@0 { memory@0 {
device_type = "memory";
reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>; reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
}; };
......
...@@ -8,6 +8,7 @@ chosen { ...@@ -8,6 +8,7 @@ chosen {
}; };
memory@0 { memory@0 {
device_type = "memory";
reg = <0x0 0x2000000>; reg = <0x0 0x2000000>;
}; };
......
...@@ -7,6 +7,7 @@ / { ...@@ -7,6 +7,7 @@ / {
model = "Ralink MT7620A evaluation board"; model = "Ralink MT7620A evaluation board";
memory@0 { memory@0 {
device_type = "memory";
reg = <0x0 0x2000000>; reg = <0x0 0x2000000>;
}; };
......
...@@ -7,6 +7,7 @@ / { ...@@ -7,6 +7,7 @@ / {
model = "Ralink RT2880 evaluation board"; model = "Ralink RT2880 evaluation board";
memory@0 { memory@0 {
device_type = "memory";
reg = <0x8000000 0x2000000>; reg = <0x8000000 0x2000000>;
}; };
......
...@@ -7,6 +7,7 @@ / { ...@@ -7,6 +7,7 @@ / {
model = "Ralink RT3052 evaluation board"; model = "Ralink RT3052 evaluation board";
memory@0 { memory@0 {
device_type = "memory";
reg = <0x0 0x2000000>; reg = <0x0 0x2000000>;
}; };
......
...@@ -7,6 +7,7 @@ / { ...@@ -7,6 +7,7 @@ / {
model = "Ralink RT3883 evaluation board"; model = "Ralink RT3883 evaluation board";
memory@0 { memory@0 {
device_type = "memory";
reg = <0x0 0x2000000>; reg = <0x0 0x2000000>;
}; };
......
...@@ -1831,6 +1831,10 @@ int of_update_property(struct device_node *np, struct property *newprop) ...@@ -1831,6 +1831,10 @@ int of_update_property(struct device_node *np, struct property *newprop)
if (!found) if (!found)
return -ENODEV; return -ENODEV;
/* At early boot, bail out and defer setup to of_init() */
if (!of_kset)
return found ? 0 : -ENODEV;
/* Update the sysfs attribute */ /* Update the sysfs attribute */
sysfs_remove_bin_file(&np->kobj, &oldprop->attr); sysfs_remove_bin_file(&np->kobj, &oldprop->attr);
__of_add_property_sysfs(np, newprop); __of_add_property_sysfs(np, newprop);
......
...@@ -349,7 +349,7 @@ int of_device_is_stdout_path(struct device_node *dn); ...@@ -349,7 +349,7 @@ int of_device_is_stdout_path(struct device_node *dn);
#else /* CONFIG_OF */ #else /* CONFIG_OF */
static inline const char* of_node_full_name(struct device_node *np) static inline const char* of_node_full_name(const struct device_node *np)
{ {
return "<no-node>"; return "<no-node>";
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment