arm64: dts: renesas: beacon-renesom: Fix gpio expander reference

The board used to originally introduce the Beacon Embedded RZ/G2[M/N/H]
boards had a GPIO expander with address 20, but this was changed when
the final board went to production.

The production boards changed both the part itself and the address.
With the incorrect address, the LCD cannot come up.  If the LCD fails,
the rcar-du driver fails to come up, and that also breaks HDMI.

Pre-release board were not shipped to the general public, so it should
be safe to push this as a fix.  Anyone with a production board would
have video fail due to this GPIO expander change.

Fixes: a1d8a344f1ca ("arm64: dts: renesas: Introduce r8a774a1-beacon-rzg2m-kit")
Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20230114225647.227972-1-aford173@gmail.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi b/arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi
index d3ec8c45d5af667e8ee2b2945c79c2a49a0dc042..3f8b6d7b21240522ab446cd3ce6181036eb24c8c 100644 (file)
--- a/arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi
+++ b/arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi
@@ -437,20 +437,6 @@
                };
        };
 
-       /* 0 - lcd_reset */
-       /* 1 - lcd_pwr */
-       /* 2 - lcd_select */
-       /* 3 - backlight-enable */
-       /* 4 - Touch_shdwn */
-       /* 5 - LCD_H_pol */
-       /* 6 - lcd_V_pol */
-       gpio_exp1: gpio@20 {
-               compatible = "onnn,pca9654";
-               reg = <0x20>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
-
        touchscreen@26 {
                compatible = "ilitek,ili2117";
                reg = <0x26>;
@@ -482,6 +468,16 @@
                        };
                };
        };
+
+       gpio_exp1: gpio@70 {
+               compatible = "nxp,pca9538";
+               reg = <0x70>;
+               gpio-controller;
+               #gpio-cells = <2>;
+               gpio-line-names = "lcd_reset", "lcd_pwr", "lcd_select",
+                                 "backlight-enable", "Touch_shdwn",
+                                 "LCD_H_pol", "lcd_V_pol";
+       };
 };
 
 &lvds0 {