};
 
        gpio0: gpio@e6050000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,gpio-rcar";
+               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
                reg = <0 0xe6050000 0 0x50>;
                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
        };
 
        gpio1: gpio@e6051000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,gpio-rcar";
+               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
                reg = <0 0xe6051000 0 0x50>;
                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
        };
 
        gpio2: gpio@e6052000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,gpio-rcar";
+               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
                reg = <0 0xe6052000 0 0x50>;
                interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
        };
 
        gpio3: gpio@e6053000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,gpio-rcar";
+               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
                reg = <0 0xe6053000 0 0x50>;
                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
        };
 
        gpio4: gpio@e6054000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,gpio-rcar";
+               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
                reg = <0 0xe6054000 0 0x50>;
                interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
        };
 
        gpio5: gpio@e6055000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,gpio-rcar";
+               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
                reg = <0 0xe6055000 0 0x50>;
                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
        };
 
        gpio6: gpio@e6055400 {
-               compatible = "renesas,gpio-r8a7793", "renesas,gpio-rcar";
+               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
                reg = <0 0xe6055400 0 0x50>;
                interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
        };
 
        gpio7: gpio@e6055800 {
-               compatible = "renesas,gpio-r8a7793", "renesas,gpio-rcar";
+               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
                reg = <0 0xe6055800 0 0x50>;
                interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;