Re: [PATCH 03/11] arm64: dts: renesas: hihope-common: Separate out Rev.2.0 specific into hihope-common-rev2.dtsi file

[Geert Uytterhoeven]

Hi Prabhakar,

On Sun, Jun 7, 2020 at 8:41 PM Lad Prabhakar
<prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx> wrote:
> Separate out Rev.2.0 specific hardware changes into
> hihope-common-rev2.dtsi file so that hihope-common.dtsi can be used
> by all the variants for RZ/G2M[N] boards.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
> Reviewed-by: Marian-Cristian Rotariu <marian-cristian.rotariu.rb@xxxxxxxxxxxxxx>

> --- /dev/null
> +++ b/arch/arm64/boot/dts/renesas/hihope-common-rev2.dtsi

Perhaps just hihope-rev2.dtsi, i.e. without the "common-"?

> @@ -0,0 +1,101 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Device Tree Source for the HiHope RZ/G2[MN] main board Rev.2.0 common
> + * parts
> + *
> + * Copyright (C) 2020 Renesas Electronics Corp.
> + */
> +
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> +       leds {
> +               compatible = "gpio-leds";
> +
> +               bt_active_led {
> +                       label = "blue:bt";
> +                       gpios = <&gpio7  0 GPIO_ACTIVE_HIGH>;
> +                       linux,default-trigger = "hci0-power";
> +                       default-state = "off";
> +               };
> +
> +               led0 {
> +                       gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;
> +               };
> +
> +               led1 {
> +                       gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;
> +               };
> +
> +               led2 {
> +                       gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;
> +               };
> +
> +               led3 {
> +                       gpios = <&gpio0  0 GPIO_ACTIVE_HIGH>;
> +               };

led1, led2, and led3 are present on both, so I'd keep them in
hihope-common.dtsi.

> +
> +               wlan_active_led {
> +                       label = "yellow:wlan";
> +                       gpios = <&gpio7  1 GPIO_ACTIVE_HIGH>;
> +                       linux,default-trigger = "phy0tx";
> +                       default-state = "off";
> +               };
> +       };
> +
> +       wlan_en_reg: regulator-wlan_en {
> +               compatible = "regulator-fixed";
> +               regulator-name = "wlan-en-regulator";
> +               regulator-min-microvolt = <1800000>;
> +               regulator-max-microvolt = <1800000>;
> +               startup-delay-us = <70000>;
> +
> +               gpio = <&gpio_expander 1 GPIO_ACTIVE_HIGH>;
> +               enable-active-high;
> +       };

Same for the WLAN regulator, especially as it is referenced from
hihope-common.dtsi.
As the GPIO  line differs between the two variants, you just need
to add the gpio property in the revision-specific file.

> +};
> +
> +&hscif0 {
> +       bluetooth {
> +               compatible = "ti,wl1837-st";
> +               enable-gpios = <&gpio_expander 2 GPIO_ACTIVE_HIGH>;
> +       };
> +};

As node is small, and the GPIO line differs from the two variants,
I think duplicating it in both revision-specific files is fine, though.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds