Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3482f2c5 authored by Grant Likely's avatar Grant Likely
Browse files

of: Create of_console_check() for selecting a console specified in /chosen 



The devicetree has a binding for specifying the console device in the
/chosen node, but the kernel doesn't use it consistently. This change
adds an API for testing if a device node is a console, and adds a
preferred console entry if it is.

At the same time this patch removes the of_device_is_stdout_path() API
since it is unused.

Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
Tested-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent a497c3ba

drivers/of/base.c

+13 −10
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
 *      as published by the Free Software Foundation; either version

 *      as published by the Free Software Foundation; either version

 *      2 of the License, or (at your option) any later version.

 *      2 of the License, or (at your option) any later version.

 */

 */

#include <linux/console.h>

#include <linux/ctype.h>

#include <linux/ctype.h>

#include <linux/cpu.h>

#include <linux/cpu.h>

#include <linux/module.h>

#include <linux/module.h>
@@ -2180,20 +2181,22 @@ const char *of_prop_next_string(struct property *prop, const char *cur) 
EXPORT_SYMBOL_GPL(of_prop_next_string);

EXPORT_SYMBOL_GPL(of_prop_next_string);





/**

/**

 * of_device_is_stdout_path - check if a device node matches the

 * of_console_check() - Test and setup console for DT setup

 *                            linux,stdout-path property

 * @dn - Pointer to device node

 * @name - Name to use for preferred console without index. ex. "ttyS"

 * @index - Index to use for preferred console.

 *

 *

 * Check if this device node matches the linux,stdout-path property

 * Check if the given device node matches the stdout-path property in the

 * in the chosen node. return true if yes, false otherwise.

 * /chosen node. If it does then register it as the preferred console and return

 * TRUE. Otherwise return FALSE.

 */

 */

int of_device_is_stdout_path(struct device_node *dn)

bool of_console_check(struct device_node *dn, char *name, int index)

{

{

	if (!of_stdout)

	if (!dn || dn != of_stdout || console_set_on_cmdline)

		return false;

		return false;



	return add_preferred_console(name, index, NULL);

	return of_stdout == dn;

}

}

EXPORT_SYMBOL_GPL(of_device_is_stdout_path);

EXPORT_SYMBOL_GPL(of_console_check);





/**

/**

 *	of_find_next_cache_node - Find a node's subsidiary cache

 *	of_find_next_cache_node - Find a node's subsidiary cache

include/linux/of.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -352,7 +352,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);

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 */

#else /* CONFIG_OF */
@@ -564,9 +564,9 @@ static inline int of_machine_is_compatible(const char *compat) 
	return 0;

	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,

static inline const __be32 *of_prop_next_u32(struct property *prop,