diff mbox series

[4/5] ARM: dts: sun8i: nanopi-duo2: Fix GPIO regulator state array

Message ID 20191219091539.948530-4-maxime@cerno.tech (mailing list archive)
State Mainlined
Commit 7309386df5500230abe066d338761106a93ae7af
Headers show
Series [1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order | expand

Commit Message

Maxime Ripard Dec. 19, 2019, 9:15 a.m. UTC
Even though it translates to the same thing down to the binary level, we
should have an array of 2 number cells to describe each voltage state,
which in turns create a validation warning.

Let's fix this.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Chen-Yu Tsai Dec. 19, 2019, 3:19 p.m. UTC | #1
On Thu, Dec 19, 2019 at 5:15 PM Maxime Ripard <maxime@cerno.tech> wrote:
>
> Even though it translates to the same thing down to the binary level, we
> should have an array of 2 number cells to describe each voltage state,
> which in turns create a validation warning.
>
> Let's fix this.
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Acked-by: Chen-Yu Tsai <wens@csie.org>

But,

> ---
>  arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> index c73f59900975..6b149271ef13 100644
> --- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> @@ -60,8 +60,7 @@
>                 enable-gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
>                 gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
>                 gpios-states = <0x1>;
> -               states = <1100000 0x0
> -                         1300000 0x1>;
> +               states = <1100000 0>, <1300000 1>;

I would keep the table like layout.

>         };
>
>         reg_vcc_dram: vcc-dram {
> --
> 2.23.0
>
Maxime Ripard Dec. 20, 2019, 8:01 a.m. UTC | #2
Hi,

On Thu, Dec 19, 2019 at 11:19:37PM +0800, Chen-Yu Tsai wrote:
> On Thu, Dec 19, 2019 at 5:15 PM Maxime Ripard <maxime@cerno.tech> wrote:
> >
> > Even though it translates to the same thing down to the binary level, we
> > should have an array of 2 number cells to describe each voltage state,
> > which in turns create a validation warning.
> >
> > Let's fix this.
> >
> > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
>
> But,
>
> > ---
> >  arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> > index c73f59900975..6b149271ef13 100644
> > --- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> > +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> > @@ -60,8 +60,7 @@
> >                 enable-gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
> >                 gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
> >                 gpios-states = <0x1>;
> > -               states = <1100000 0x0
> > -                         1300000 0x1>;
> > +               states = <1100000 0>, <1300000 1>;
>
> I would keep the table like layout.

The one on a single line is the one we have on all the other boards
with regulator-gpio, so if we want to fix it we should fix all of
them.

I've applied the 5 patches for now

Maxime
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
index c73f59900975..6b149271ef13 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
@@ -60,8 +60,7 @@ 
 		enable-gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
 		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
 		gpios-states = <0x1>;
-		states = <1100000 0x0
-			  1300000 0x1>;
+		states = <1100000 0>, <1300000 1>;
 	};
 
 	reg_vcc_dram: vcc-dram {