mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-27 22:56:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

syscon: add Linux-compatible syscon API

Browse Source 
The syscon implementation in U-Boot is different from that in Linux.
Thus, DT files imported from Linux do not work for U-Boot.

In U-Boot driver model, each node is bound to a dedicated driver
that is the most compatible to it.  This design gets along with the
concept of DT, and the syscon in Linux originally worked like that.

However, Linux commit bdb0066df96e ("mfd: syscon: Decouple syscon
interface from platform devices") changed the behavior because it is
useful to let a device bind to another driver, but still work as a
syscon provider.

That change had happened before U-Boot initially supported the syscon
driver by commit 6f98b7504f ("dm: Add support for generic system
controllers (syscon)").  So, the U-Boot's syscon works differently
from the beginning.  I'd say this is mis-implementation given that
DT is not oriented to a particular project, but Linux is the canon
of DT in practice.

The problem typically arises in the combination of "syscon" and
"simple-mfd" compatibles.

In Linux, they are orthogonal, i.e., the order between "syscon" and
"simple-mfd" does not matter at all.

Assume the following compatible.

   compatible = "foo,bar-syscon", "syscon", "simple-mfd";

In U-Boot, this device node is bound to the syscon driver
(driver/core/syscon-uclass.c) since the "syscon" is found to be the
most compatible.  Then, syscon_get_regmap() succeeds.

However,

   compatible = "foo,bar-syscon", "simple-mfd", "syscon";

does not work because this node is bound to the simple-bus driver
(drivers/core/simple-bus.c) in favor of "simple-mfd" compatible.
The compatible string "syscon" is just dismissed.

Moreover,

   compatible = "foo,bar-syscon", "syscon";

works like the first case because the syscon driver populates the
child devices.  This is wrong because populating children is the job
of "simple-mfd" (or "simple-bus").

This commit ports syscon_node_to_regmap() from Linux.  This API
does not require the given node to be bound to a driver in any way.

Reported-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2018-04-19 12:14:04 +09:00 committed by Tom Rini
parent d35812368a
commit e151a1c288
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/core/syscon-uclass.c
View File

@ -14,6 +14,15 @@
#include <dm/root.h>
#include <linux/err.h>
/*
* Caution:
* This API requires the given device has alerady been bound to syscon driver.
* For example,
* compatible = "syscon", "simple-mfd";
* works, but
* compatible = "simple-mfd", "syscon";
* does not. The behavior is different from Linux.
*/
struct regmap *syscon_get_regmap(struct udevice *dev)
{
struct syscon_uc_info *priv;
@ -108,3 +117,58 @@ U_BOOT_DRIVER(generic_syscon) = {
#endif
.of_match = generic_syscon_ids,
};
/*
* Linux-compatible syscon-to-regmap
* The syscon node can be bound to another driver, but still works
* as a syscon provider.
*/
static LIST_HEAD(syscon_list);
struct syscon {
ofnode node;
struct regmap *regmap;
struct list_head list;
};
static struct syscon *of_syscon_register(ofnode node)
{
struct syscon *syscon;
int ret;
if (!ofnode_device_is_compatible(node, "syscon"))
return ERR_PTR(-EINVAL);
syscon = malloc(sizeof(*syscon));
if (!syscon)
return ERR_PTR(-ENOMEM);
ret = regmap_init_mem(node, &syscon->regmap);
if (ret) {
free(syscon);
return ERR_PTR(ret);
}
list_add_tail(&syscon->list, &syscon_list);
return syscon;
}
struct regmap *syscon_node_to_regmap(ofnode node)
{
struct syscon *entry, *syscon = NULL;
list_for_each_entry(entry, &syscon_list, list)
if (ofnode_equal(entry->node, node)) {
syscon = entry;
break;
}
if (!syscon)
syscon = of_syscon_register(node);
if (IS_ERR(syscon))
return ERR_CAST(syscon);
return syscon->regmap;
}

8
include/syscon.h
View File

@ -7,6 +7,7 @@
#ifndef __SYSCON_H
#define __SYSCON_H
#include <dm/ofnode.h>
#include <fdtdec.h>
/**
@ -81,4 +82,11 @@ struct regmap *syscon_get_regmap_by_driver_data(ulong driver_data);
*/
void *syscon_get_first_range(ulong driver_data);
/**
* syscon_node_to_regmap - get regmap from syscon
*
* @node: Device node of syscon
*/
struct regmap *syscon_node_to_regmap(ofnode node);
#endif