[PATCH linux dev-5.10 v2 4/4] ARM: dts: aspeed: Rainier: Remove gpio hog for GPIOP7

[Joel Stanley]

On Wed, 15 Sept 2021 at 21:47, Eddie James <eajames at linux.ibm.com> wrote:
>
> Only the pass 1 Ingraham board (Rainier system) had a micro-controller
> wired to GPIOP7 on ball Y23. Pass 2 boards have this ball wired to the
> heartbeat LED, so remove the hog and add it to the pass 1 devicetrees.

We can obviously remove it from the device tree we have, which is for
the pass2, but we can't add it to pass1 as we don't have them in the
tree.

I recommend submitting them to the openbmc tree (but not mainline, as
they're pass1), and we can maintain them in there.

Cheers,

Joel

>
> Signed-off-by: Eddie James <eajames at linux.ibm.com>
> ---
>  arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts | 9 +++++++++
>  arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts    | 9 +++++++++
>  arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts       | 7 -------
>  3 files changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts
> index e35a3efd9d22..b7ec83848750 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts
> @@ -22,6 +22,15 @@ aliases {
>         };
>  };
>
> +&gpio0 {
> +       pin_mclr_vpp {
> +               gpio-hog;
> +               gpios = <ASPEED_GPIO(P, 7) GPIO_OPEN_DRAIN>;
> +               output-high;
> +               line-name = "mclr_vpp";
> +       };
> +};
> +
>  &i2c4 {
>         /delete-node/ pca9546 at 70;
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts
> index b3c923f1838b..d650dbebe5d2 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts
> @@ -22,6 +22,15 @@ aliases {
>         };
>  };
>
> +&gpio0 {
> +       pin_mclr_vpp {
> +               gpio-hog;
> +               gpios = <ASPEED_GPIO(P, 7) GPIO_OPEN_DRAIN>;
> +               output-high;
> +               line-name = "mclr_vpp";
> +       };
> +};
> +
>  &i2c4 {
>         /delete-node/ pca9546 at 70;
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> index 2b6bb20dfd82..9250d9465407 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> @@ -254,13 +254,6 @@ &gpio0 {
>         /*Y0-Y7*/       "","","","","","","","",
>         /*Z0-Z7*/       "","","","","","","","";
>
> -       pin_mclr_vpp {
> -               gpio-hog;
> -               gpios = <ASPEED_GPIO(P, 7) GPIO_OPEN_DRAIN>;
> -               output-high;
> -               line-name = "mclr_vpp";
> -       };
> -
>         i2c3_mux_oe_n {
>                 gpio-hog;
>                 gpios = <ASPEED_GPIO(G, 6) GPIO_ACTIVE_LOW>;
> --
> 2.27.0
>