* linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees
@ 2014-11-26 4:44 Stephen Rothwell
2014-11-27 8:49 ` Lee Jones
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-11-26 4:44 UTC (permalink / raw)
To: Grant Likely, Rafael J. Wysocki, Mark Brown, Liam Girdwood, Lee Jones
Cc: linux-next, linux-kernel, Pantelis Antoniou, Romain Perier
[-- Attachment #1: Type: text/plain, Size: 3035 bytes --]
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
include/linux/of.h between commits b31384fa5de3 ("Driver core: Unified
device properties interface for platform firmware") from the pm tree
and a4b4e0461ec5 ("of: Add standard property for poweroff capability")
from the mfd and regulator trees and commit 7518b5890d8a ("of/overlay:
Introduce DT overlay support") from the devicetree tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/of.h
index facd94e45462,aa01cf5852f8..000000000000
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -23,7 -23,7 +23,8 @@@
#include <linux/spinlock.h>
#include <linux/topology.h>
#include <linux/notifier.h>
+#include <linux/property.h>
+ #include <linux/list.h>
#include <asm/byteorder.h>
#include <asm/errno.h>
@@@ -108,27 -111,18 +114,27 @@@ static inline struct device_node *of_no
static inline void of_node_put(struct device_node *node) { }
#endif /* !CONFIG_OF_DYNAMIC */
-#ifdef CONFIG_OF
-
/* Pointer for first entry in chain of all nodes. */
- extern struct device_node *of_allnodes;
+ extern struct device_node *of_root;
extern struct device_node *of_chosen;
extern struct device_node *of_aliases;
extern struct device_node *of_stdout;
extern raw_spinlock_t devtree_lock;
+#ifdef CONFIG_OF
+static inline bool is_of_node(struct fwnode_handle *fwnode)
+{
+ return fwnode && fwnode->type == FWNODE_OF;
+}
+
+static inline struct device_node *of_node(struct fwnode_handle *fwnode)
+{
+ return fwnode ? container_of(fwnode, struct device_node, fwnode) : NULL;
+}
+
static inline bool of_have_populated_dt(void)
{
- return of_allnodes != NULL;
+ return of_root != NULL;
}
static inline bool of_node_is_root(const struct device_node *node)
@@@ -956,14 -959,33 +992,44 @@@ static inline int of_reconfig_get_state
extern int of_resolve_phandles(struct device_node *tree);
/**
+ * of_system_has_poweroff_source - Tells if poweroff-source is found for device_node
+ * @np: Pointer to the given device_node
+ *
+ * return true if present false otherwise
+ */
+static inline bool of_system_has_poweroff_source(const struct device_node *np)
+{
+ return of_property_read_bool(np, "poweroff-source");
+}
+
++/**
+ * Overlay support
+ */
+
+ #ifdef CONFIG_OF_OVERLAY
+
+ /* ID based overlays; the API for external users */
+ int of_overlay_create(struct device_node *tree);
+ int of_overlay_destroy(int id);
+ int of_overlay_destroy_all(void);
+
+ #else
+
+ static inline int of_overlay_create(struct device_node *tree)
+ {
+ return -ENOTSUPP;
+ }
+
+ static inline int of_overlay_destroy(int id)
+ {
+ return -ENOTSUPP;
+ }
+
+ static inline int of_overlay_destroy_all(void)
+ {
+ return -ENOTSUPP;
+ }
+
+ #endif
+
#endif /* _LINUX_OF_H */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees
2014-11-26 4:44 linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees Stephen Rothwell
@ 2014-11-27 8:49 ` Lee Jones
0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2014-11-27 8:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Grant Likely, Rafael J. Wysocki, Mark Brown, Liam Girdwood,
linux-next, linux-kernel, Pantelis Antoniou, Romain Perier
> Today's linux-next merge of the devicetree tree got a conflict in
> include/linux/of.h between commits b31384fa5de3 ("Driver core: Unified
> device properties interface for platform firmware") from the pm tree
> and a4b4e0461ec5 ("of: Add standard property for poweroff capability")
> from the mfd and regulator trees and commit 7518b5890d8a ("of/overlay:
> Introduce DT overlay support") from the devicetree tree.
This patch actually originated from the Regulator tree. I pulled it in
to avoid conflicts between MFD and Regulator. I guess OF needs to do
the same to avoid a conflict when Linus pulls them in.
[...]
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-27 8:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-26 4:44 linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees Stephen Rothwell
2014-11-27 8:49 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).