diff mbox

[U-Boot,v2,04/12] rockchip: rk3288: pinctrl: support more pins

Message ID 1456694706-911-5-git-send-email-sjoerd.simons@collabora.co.uk
State Accepted
Commit 70f7a2cdac6a7f75f27848d689a13ca244b0792b
Delegated to: Simon Glass
Headers show

Commit Message

Sjoerd Simons Feb. 28, 2016, 9:24 p.m. UTC
The rgmii_pins node in rk3288.dtsi configures 15 pins. Increase the size
of the cell array to accomedate that, otherwise only the first 10 get
configured.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
---

Changes in v2: None

 drivers/pinctrl/rockchip/pinctrl_rk3288.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Glass March 1, 2016, 2:03 a.m. UTC | #1
On 28 February 2016 at 14:24, Sjoerd Simons
<sjoerd.simons@collabora.co.uk> wrote:
> The rgmii_pins node in rk3288.dtsi configures 15 pins. Increase the size
> of the cell array to accomedate that, otherwise only the first 10 get
> configured.
>
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> ---
>
> Changes in v2: None
>
>  drivers/pinctrl/rockchip/pinctrl_rk3288.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

>
> diff --git a/drivers/pinctrl/rockchip/pinctrl_rk3288.c b/drivers/pinctrl/rockchip/pinctrl_rk3288.c
> index 7c769bd..1fa1daa 100644
> --- a/drivers/pinctrl/rockchip/pinctrl_rk3288.c
> +++ b/drivers/pinctrl/rockchip/pinctrl_rk3288.c
> @@ -623,7 +623,7 @@ static int rk3288_pinctrl_set_state(struct udevice *dev, struct udevice *config)
>  {
>         const void *blob = gd->fdt_blob;
>         int pcfg_node, ret, flags, count, i;
> -       u32 cell[40], *ptr;
> +       u32 cell[60], *ptr;
>
>         debug("%s: %s %s\n", __func__, dev->name, config->name);
>         ret = fdtdec_get_int_array_count(blob, config->of_offset,

It's tempting to add

 if (ret == ARRAY_SIZE(cell))
   return -ENOSPC;

> --
> 2.7.0
>
Simon Glass March 13, 2016, 2:31 a.m. UTC | #2
On 29 February 2016 at 19:03, Simon Glass <sjg@chromium.org> wrote:
> On 28 February 2016 at 14:24, Sjoerd Simons
> <sjoerd.simons@collabora.co.uk> wrote:
>> The rgmii_pins node in rk3288.dtsi configures 15 pins. Increase the size
>> of the cell array to accomedate that, otherwise only the first 10 get
>> configured.
>>
>> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
>> ---
>>
>> Changes in v2: None
>>
>>  drivers/pinctrl/rockchip/pinctrl_rk3288.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
>>
>> diff --git a/drivers/pinctrl/rockchip/pinctrl_rk3288.c b/drivers/pinctrl/rockchip/pinctrl_rk3288.c
>> index 7c769bd..1fa1daa 100644
>> --- a/drivers/pinctrl/rockchip/pinctrl_rk3288.c
>> +++ b/drivers/pinctrl/rockchip/pinctrl_rk3288.c
>> @@ -623,7 +623,7 @@ static int rk3288_pinctrl_set_state(struct udevice *dev, struct udevice *config)
>>  {
>>         const void *blob = gd->fdt_blob;
>>         int pcfg_node, ret, flags, count, i;
>> -       u32 cell[40], *ptr;
>> +       u32 cell[60], *ptr;
>>
>>         debug("%s: %s %s\n", __func__, dev->name, config->name);
>>         ret = fdtdec_get_int_array_count(blob, config->of_offset,
>
> It's tempting to add
>
>  if (ret == ARRAY_SIZE(cell))
>    return -ENOSPC;
>
>> --
>> 2.7.0
>>

Applied to u-boot-rockchip/next, thanks!
diff mbox

Patch

diff --git a/drivers/pinctrl/rockchip/pinctrl_rk3288.c b/drivers/pinctrl/rockchip/pinctrl_rk3288.c
index 7c769bd..1fa1daa 100644
--- a/drivers/pinctrl/rockchip/pinctrl_rk3288.c
+++ b/drivers/pinctrl/rockchip/pinctrl_rk3288.c
@@ -623,7 +623,7 @@  static int rk3288_pinctrl_set_state(struct udevice *dev, struct udevice *config)
 {
 	const void *blob = gd->fdt_blob;
 	int pcfg_node, ret, flags, count, i;
-	u32 cell[40], *ptr;
+	u32 cell[60], *ptr;
 
 	debug("%s: %s %s\n", __func__, dev->name, config->name);
 	ret = fdtdec_get_int_array_count(blob, config->of_offset,