leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: move dm_scan_fdt_node() out of pinctrl uclass

Browse Source 
Commit c5acf4a2b3 ("pinctrl: Add the concept of peripheral IDs")
added some additional change that was not mentioned in the git-log.

That commit added dm_scan_fdt_node() in the pinctrl uclass binding.
It should be handled by the simple-bus driver or the low-level
driver, not by the pinctrl framework.

I guess Simon's motivation was to bind GPIO banks located under the
Rockchip pinctrl device.  It is true some chips have sub-devices
under their pinctrl devices, but it is basically SoC-specific matter.

This commit partly reverts commit c5acf4a2b3 to keep the only
pinctrl-generic features in the uclass.  The dm_scan_fdt_node()
should be called from the rk3288_pinctrl driver.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada 2015-09-06 01:44:50 +09:00 committed by Simon Glass
parent 1fb8d79339
commit 8a5f6129d1
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/pinctrl/pinctrl-uclass.c
View File

@ -11,7 +11,6 @@
#include <dm/device.h> #include <dm/device.h>
#include <dm/lists.h> #include <dm/lists.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dm/root.h>
#include <dm/uclass.h> #include <dm/uclass.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -160,8 +159,7 @@ static int pinctrl_select_state_full(struct udevice *dev, const char *statename)
static int pinconfig_post_bind(struct udevice *dev) static int pinconfig_post_bind(struct udevice *dev)
{ {
/* Scan the bus for devices */ return 0;
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
} }
#endif #endif
@ -249,10 +247,15 @@ static int pinctrl_post_bind(struct udevice *dev)
} }
/* /*
* The pinctrl driver child nodes should be bound so that peripheral * If set_state callback is set, we assume this pinctrl driver is the
* devices can easily search in parent devices during later DT-parsing. * full implementation. In this case, its child nodes should be bound
* so that peripheral devices can easily search in parent devices
* during later DT-parsing.
*/ */
return pinconfig_post_bind(dev); if (ops->set_state)
return pinconfig_post_bind(dev);
return 0;
} }
UCLASS_DRIVER(pinctrl) = { UCLASS_DRIVER(pinctrl) = {

8
drivers/pinctrl/rockchip/pinctrl_rk3288.c
View File

@ -17,6 +17,7 @@
#include <asm/arch/periph.h> #include <asm/arch/periph.h>
#include <asm/arch/pmu_rk3288.h> #include <asm/arch/pmu_rk3288.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -415,6 +416,12 @@ static struct pinctrl_ops rk3288_pinctrl_ops = {
.get_periph_id = rk3288_pinctrl_get_periph_id, .get_periph_id = rk3288_pinctrl_get_periph_id,
}; };
static int rk3288_pinctrl_bind(struct udevice *dev)
{
/* scan child GPIO banks */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
}
static int rk3288_pinctrl_probe(struct udevice *dev) static int rk3288_pinctrl_probe(struct udevice *dev)
{ {
struct rk3288_pinctrl_priv *priv = dev_get_priv(dev); struct rk3288_pinctrl_priv *priv = dev_get_priv(dev);
@ -437,5 +444,6 @@ U_BOOT_DRIVER(pinctrl_rk3288) = {
.of_match = rk3288_pinctrl_ids, .of_match = rk3288_pinctrl_ids,
.priv_auto_alloc_size = sizeof(struct rk3288_pinctrl_priv), .priv_auto_alloc_size = sizeof(struct rk3288_pinctrl_priv),
.ops = &rk3288_pinctrl_ops, .ops = &rk3288_pinctrl_ops,
.bind = rk3288_pinctrl_bind,
.probe = rk3288_pinctrl_probe, .probe = rk3288_pinctrl_probe,
}; };