From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Grant Likely <grant.likely@secretlab•ca>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>,
Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>,
Lee Jones <lee.jones@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Pantelis Antoniou <pantelis.antoniou@konsulko•com>,
Romain Perier <romain.perier@gmail•com>
Subject: linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees
Date: Wed, 26 Nov 2014 15:44:06 +1100 [thread overview]
Message-ID: <20141126154406.434ab873@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-11-26 4:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 4:44 Stephen Rothwell [this message]
2014-11-27 8:49 ` linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141126154406.434ab873@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=grant.likely@secretlab$(echo .)ca \
--cc=lee.jones@linaro$(echo .)org \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pantelis.antoniou@konsulko$(echo .)com \
--cc=rjw@rjwysocki$(echo .)net \
--cc=romain.perier@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox