arm64: dts: renesas: rzg2ul-smarc: Enable USB2.0 support

Enable USB2.0 Host/Device support on RZ/G2UL SMARC EVK by
adding usb{0,1} pincontrol entries to the soc-pinctrl dtsi
and deleting the nodes which disabled it.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20220429072400.23729-4-biju.das.jz@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts b/arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts
index 52ee164..2d740bd 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts
+++ b/arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts
@@ -14,54 +14,8 @@
        compatible = "renesas,smarc-evk", "renesas,r9a07g043u11", "renesas,r9a07g043";
 };
 
-&ehci0 {
-       /delete-property/ pinctrl-0;
-       /delete-property/ pinctrl-names;
-       status = "disabled";
-};
-
-&ehci1 {
-       /delete-property/ pinctrl-0;
-       /delete-property/ pinctrl-names;
-       status = "disabled";
-};
-
-&hsusb {
-       /delete-property/ pinctrl-0;
-       /delete-property/ pinctrl-names;
-       status = "disabled";
-};
-
-&ohci0 {
-       /delete-property/ pinctrl-0;
-       /delete-property/ pinctrl-names;
-       status = "disabled";
-};
-
-&ohci1 {
-       /delete-property/ pinctrl-0;
-       /delete-property/ pinctrl-names;
-       status = "disabled";
-};
-
-&phyrst {
-       status = "disabled";
-};
-
 &spi1 {
        /delete-property/ pinctrl-0;
        /delete-property/ pinctrl-names;
        status = "disabled";
 };
-
-&usb2_phy0 {
-       /delete-property/ pinctrl-0;
-       /delete-property/ pinctrl-names;
-       status = "disabled";
-};
-
-&usb2_phy1 {
-       /delete-property/ pinctrl-0;
-       /delete-property/ pinctrl-names;
-       status = "disabled";
-};

diff --git a/arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi b/arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi
index 201b701..bd8bc85 100644 (file)
--- a/arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi
+++ b/arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi
@@ -105,4 +105,15 @@
                         <RZG2L_PORT_PINMUX(3, 2, 2)>, /* TXD */
                         <RZG2L_PORT_PINMUX(3, 3, 2)>; /* RXD */
        };
+
+       usb0_pins: usb0 {
+               pinmux = <RZG2L_PORT_PINMUX(5, 0, 1)>, /* VBUS */
+                        <RZG2L_PORT_PINMUX(5, 2, 1)>, /* OVC */
+                        <RZG2L_PORT_PINMUX(5, 3, 1)>; /* OTG_ID */
+       };
+
+       usb1_pins: usb1 {
+               pinmux = <RZG2L_PORT_PINMUX(5, 4, 5)>, /* OVC */
+                        <RZG2L_PORT_PINMUX(6, 0, 1)>; /* VBUS */
+       };
 };