diff options
author | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
commit | d71be1990218957b9f05dbf13a72859a2abe06d7 (patch) | |
tree | 99858dc9988f7f7b4c0ab1d8d45738e3abdf38c8 /drivers/pinctrl/mscc/pinctrl-jr2.c | |
parent | c4fddedc48f336eabc4ce3f74940e6aa372de18c (diff) | |
parent | bc0b99bd8b19599f670f42401de655fa9b44cd94 (diff) | |
download | u-boot-d71be1990218957b9f05dbf13a72859a2abe06d7.tar.gz |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/pinctrl/mscc/pinctrl-jr2.c')
-rw-r--r-- | drivers/pinctrl/mscc/pinctrl-jr2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/mscc/pinctrl-jr2.c b/drivers/pinctrl/mscc/pinctrl-jr2.c index 72a9470854..cb340581cc 100644 --- a/drivers/pinctrl/mscc/pinctrl-jr2.c +++ b/drivers/pinctrl/mscc/pinctrl-jr2.c @@ -300,7 +300,7 @@ static int jr2_pinctrl_probe(struct udevice *dev) return ret; ret = device_bind(dev, &jr2_gpio_driver, "jr2-gpio", NULL, - dev_of_offset(dev), NULL); + dev_ofnode(dev), NULL); if (ret) return ret; @@ -318,6 +318,6 @@ U_BOOT_DRIVER(jr2_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(jr2_pinctrl_of_match), .probe = jr2_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct mscc_pinctrl), + .priv_auto = sizeof(struct mscc_pinctrl), .ops = &mscc_pinctrl_ops, }; |