mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 14:13:01 -04:00
Merge branch 'devicetree/next-console' into devicetree/next
This commit is contained in:
commit
b775e642bf
17 changed files with 64 additions and 119 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue