xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devicetree/next-console' into devicetree/next

Browse Source
This commit is contained in:
Grant Likely
2014-08-11 14:03:08 +01:00
parent 32147e9a8e ccdb8ed3b3
commit b775e642bf
17 changed files with 63 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/of.h
View File

@@ -113,6 +113,7 @@ static inline void of_node_put(struct device_node *node) { }
extern struct device_node *of_allnodes;
extern struct device_node *of_chosen;
extern struct device_node *of_aliases;
extern struct device_node *of_stdout;
extern raw_spinlock_t devtree_lock;
static inline bool of_have_populated_dt(void)
@@ -352,7 +353,7 @@ const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
*/
const char *of_prop_next_string(struct property *prop, const char *cur);
int of_device_is_stdout_path(struct device_node *dn);
bool of_console_check(struct device_node *dn, char *name, int index);
#else /* CONFIG_OF */
@@ -564,9 +565,9 @@ static inline int of_machine_is_compatible(const char *compat)
return 0;
}
static inline int of_device_is_stdout_path(struct device_node *dn)
static inline bool of_console_check(const struct device_node *dn, const char *name, int index)
{
return 0;
return false;
}
static inline const __be32 *of_prop_next_u32(struct property *prop,