ARM: rmobile: Sync Gen2 DTS with Linux v4.17
authorMarek Vasut <marek.vasut+renesas@gmail.com>
Wed, 6 Jun 2018 17:58:17 +0000 (19:58 +0200)
committerMarek Vasut <marek.vasut+renesas@gmail.com>
Thu, 14 Jun 2018 20:35:21 +0000 (22:35 +0200)
Sync the DTs with Linux v4.17.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
arch/arm/dts/r8a7790-lager.dts
arch/arm/dts/r8a7790.dtsi
arch/arm/dts/r8a7791-koelsch.dts
arch/arm/dts/r8a7791-porter.dts
arch/arm/dts/r8a7791.dtsi
arch/arm/dts/r8a7792.dtsi
arch/arm/dts/r8a7793-gose.dts
arch/arm/dts/r8a7793.dtsi
arch/arm/dts/r8a7794-alt.dts
arch/arm/dts/r8a7794-silk.dts
arch/arm/dts/r8a7794.dtsi

index c97d59a5322d7cdd485c144fc17a3fd78e5a2564..dcda98c6ae00782dc2f3a0ed09a748f2c29871c3 100644 (file)
                serial0 = &scif0;
                serial1 = &scifa1;
                i2c8 = &gpioi2c1;
+               i2c9 = &gpioi2c2;
                i2c10 = &i2cexio0;
                i2c11 = &i2cexio1;
+               i2c12 = &i2chdmi;
+               i2c13 = &i2cpwr;
        };
 
        chosen {
                };
        };
 
+       cec_clock: cec-clock {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <12000000>;
+       };
+
        hdmi-out {
                compatible = "hdmi-connector";
                type = "a";
                #size-cells = <0>;
                compatible = "i2c-gpio";
                status = "disabled";
-               gpios = <&gpio1 17 GPIO_ACTIVE_HIGH /* sda */
-                        &gpio1 16 GPIO_ACTIVE_HIGH /* scl */
-                       >;
+               scl-gpios = <&gpio1 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio1 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               i2c-gpio,delay-us = <5>;
+       };
+
+       gpioi2c2: i2c-9 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "i2c-gpio";
+               status = "disabled";
+               scl-gpios = <&gpio5 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio5 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                i2c-gpio,delay-us = <5>;
        };
 
                #address-cells = <1>;
                #size-cells = <0>;
        };
+
+        /*
+         * IIC2 and I2C2 may be switched using pinmux.
+         * A fallback to GPIO is also provided.
+         */
+       i2chdmi: i2c-12 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>;
+               i2c-bus-name = "i2c-hdmi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ak4643: codec@12 {
+                       compatible = "asahi-kasei,ak4643";
+                       #sound-dai-cells = <0>;
+                       reg = <0x12>;
+               };
+
+               composite-in@20 {
+                       compatible = "adi,adv7180";
+                       reg = <0x20>;
+                       remote = <&vin1>;
+
+                       port {
+                               adv7180: endpoint {
+                                       bus-width = <8>;
+                                       remote-endpoint = <&vin1ep0>;
+                               };
+                       };
+               };
+
+               hdmi@39 {
+                       compatible = "adi,adv7511w";
+                       reg = <0x39>;
+                       interrupt-parent = <&gpio1>;
+                       interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
+                       clocks = <&cec_clock>;
+                       clock-names = "cec";
+
+                       adi,input-depth = <8>;
+                       adi,input-colorspace = "rgb";
+                       adi,input-clock = "1x";
+                       adi,input-style = <1>;
+                       adi,input-justification = "evenly";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       adv7511_in: endpoint {
+                                               remote-endpoint = <&lvds0_out>;
+                                       };
+                               };
+
+                               port@1 {
+                                       reg = <1>;
+                                       adv7511_out: endpoint {
+                                               remote-endpoint = <&hdmi_con_out>;
+                                       };
+                               };
+                       };
+               };
+
+               hdmi-in@4c {
+                       compatible = "adi,adv7612";
+                       reg = <0x4c>;
+                       interrupt-parent = <&gpio1>;
+                       interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
+                       default-input = <0>;
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       adv7612_in: endpoint {
+                                               remote-endpoint = <&hdmi_con_in>;
+                                       };
+                               };
+
+                               port@2 {
+                                       reg = <2>;
+                                       adv7612_out: endpoint {
+                                               remote-endpoint = <&vin0ep2>;
+                                       };
+                               };
+                       };
+               };
+       };
+
+       /*
+        * IIC3 and I2C3 may be switched using pinmux.
+        * IIC3/I2C3 does not appear to support fallback to GPIO.
+        */
+       i2cpwr: i2c-13 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&iic3>, <&i2c3>;
+               i2c-bus-name = "i2c-pwr";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pmic@58 {
+                       compatible = "dlg,da9063";
+                       reg = <0x58>;
+                       interrupt-parent = <&irqc0>;
+                       interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+                       interrupt-controller;
+
+                       rtc {
+                               compatible = "dlg,da9063-rtc";
+                       };
+
+                       wdt {
+                               compatible = "dlg,da9063-watchdog";
+                       };
+               };
+
+               vdd_dvfs: regulator@68 {
+                       compatible = "dlg,da9210";
+                       reg = <0x68>;
+                       interrupt-parent = <&irqc0>;
+                       interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+                       regulator-boot-on;
+                       regulator-always-on;
+               };
+       };
 };
 
 &du {
        status = "okay";
 
        clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 722>,
-                <&cpg CPG_MOD 726>, <&cpg CPG_MOD 725>,
                 <&x13_clk>, <&x2_clk>;
-       clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1",
-                     "dclkin.0", "dclkin.1";
+       clock-names = "du.0", "du.1", "du.2", "dclkin.0", "dclkin.1";
 
        ports {
                port@0 {
                                remote-endpoint = <&adv7123_in>;
                        };
                };
+       };
+};
+
+&lvds0 {
+       status = "okay";
+
+       ports {
                port@1 {
                        endpoint {
                                remote-endpoint = <&adv7511_in>;
                        };
                };
-               port@2 {
+       };
+};
+
+&lvds1 {
+       status = "okay";
+
+       ports {
+               port@1 {
                        lvds_connector: endpoint {
                        };
                };
                function = "iic1";
        };
 
+       i2c2_pins: i2c2 {
+               groups = "i2c2";
+               function = "i2c2";
+       };
+
        iic2_pins: iic2 {
                groups = "iic2";
                function = "iic2";
        };
 
+       i2c3_pins: i2c3 {
+               groups = "i2c3";
+               function = "i2c3";
+       };
+
        iic3_pins: iic3 {
                groups = "iic3";
                function = "iic3";
        pinctrl-names = "i2c-exio1";
 };
 
-&iic2  {
-       status = "okay";
-       pinctrl-0 = <&iic2_pins>;
-       pinctrl-names = "default";
+&i2c2  {
+       pinctrl-0 = <&i2c2_pins>;
+       pinctrl-names = "i2c-hdmi";
 
        clock-frequency = <100000>;
+};
 
-       ak4643: codec@12 {
-               compatible = "asahi-kasei,ak4643";
-               #sound-dai-cells = <0>;
-               reg = <0x12>;
-       };
-
-       composite-in@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-               remote = <&vin1>;
-
-               port {
-                       adv7180: endpoint {
-                               bus-width = <8>;
-                               remote-endpoint = <&vin1ep0>;
-                       };
-               };
-       };
-
-       hdmi@39 {
-               compatible = "adi,adv7511w";
-               reg = <0x39>;
-               interrupt-parent = <&gpio1>;
-               interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
-
-               adi,input-depth = <8>;
-               adi,input-colorspace = "rgb";
-               adi,input-clock = "1x";
-               adi,input-style = <1>;
-               adi,input-justification = "evenly";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               adv7511_in: endpoint {
-                                       remote-endpoint = <&du_out_lvds0>;
-                               };
-                       };
-
-                       port@1 {
-                               reg = <1>;
-                               adv7511_out: endpoint {
-                                       remote-endpoint = <&hdmi_con_out>;
-                               };
-                       };
-               };
-       };
-
-       hdmi-in@4c {
-               compatible = "adi,adv7612";
-               reg = <0x4c>;
-               interrupt-parent = <&gpio1>;
-               interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
-               default-input = <0>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+&iic2  {
+       pinctrl-0 = <&iic2_pins>;
+       pinctrl-names = "i2c-hdmi";
 
-                       port@0 {
-                               reg = <0>;
-                               adv7612_in: endpoint {
-                                       remote-endpoint = <&hdmi_con_in>;
-                               };
-                       };
+       clock-frequency = <100000>;
+};
 
-                       port@2 {
-                               reg = <2>;
-                               adv7612_out: endpoint {
-                                       remote-endpoint = <&vin0ep2>;
-                               };
-                       };
-               };
-       };
+&i2c3  {
+       pinctrl-0 = <&i2c3_pins>;
+       pinctrl-names = "i2c-pwr";
 };
 
-&iic3 {
-       pinctrl-names = "default";
+&iic3  {
        pinctrl-0 = <&iic3_pins>;
-       status = "okay";
-
-       pmic@58 {
-               compatible = "dlg,da9063";
-               reg = <0x58>;
-               interrupt-parent = <&irqc0>;
-               interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-               interrupt-controller;
-
-               rtc {
-                       compatible = "dlg,da9063-rtc";
-               };
-
-               wdt {
-                       compatible = "dlg,da9063-watchdog";
-               };
-       };
-
-       vdd_dvfs: regulator@68 {
-               compatible = "dlg,da9210";
-               reg = <0x68>;
-               interrupt-parent = <&irqc0>;
-               interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-
-               regulator-min-microvolt = <1000000>;
-               regulator-max-microvolt = <1000000>;
-               regulator-boot-on;
-               regulator-always-on;
-       };
+       pinctrl-names = "i2c-pwr";
 };
 
 &pci0 {
index b4e9e6d3d9e8e1d49e0acd332d14d8ca9257a5c0..ed09e56c362bffaf7482d12548d2631fa790ead1 100644 (file)
@@ -14,7 +14,6 @@
 
 / {
        compatible = "renesas,r8a7790";
-       interrupt-parent = <&gic>;
        #address-cells = <2>;
        #size-cells = <2>;
 
                vin3 = &vin3;
        };
 
+       /*
+        * The external audio clocks are configured as 0 Hz fixed frequency
+        * clocks by default.
+        * Boards that provide audio clocks should override them.
+        */
+       audio_clk_a: audio_clk_a {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+       audio_clk_b: audio_clk_b {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+       audio_clk_c: audio_clk_c {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+
+       /* External CAN clock */
+       can_clk: can {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
                };
        };
 
-       thermal-zones {
-               cpu_thermal: cpu-thermal {
-                       polling-delay-passive   = <0>;
-                       polling-delay           = <0>;
-
-                       thermal-sensors = <&thermal>;
-
-                       trips {
-                               cpu-crit {
-                                       temperature     = <115000>;
-                                       hysteresis      = <0>;
-                                       type            = "critical";
-                               };
-                       };
-                       cooling-maps {
-                       };
-               };
-       };
-
-       apmu@e6151000 {
-               compatible = "renesas,r8a7790-apmu", "renesas,apmu";
-               reg = <0 0xe6151000 0 0x188>;
-               cpus = <&cpu4 &cpu5 &cpu6 &cpu7>;
+       /* External root clock */
+       extal_clk: extal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
        };
 
-       apmu@e6152000 {
-               compatible = "renesas,r8a7790-apmu", "renesas,apmu";
-               reg = <0 0xe6152000 0 0x188>;
-               cpus = <&cpu0 &cpu1 &cpu2 &cpu3>;
+       /* External PCIe clock - can be overridden by the board */
+       pcie_bus_clk: pcie_bus {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
        };
 
-       gic: interrupt-controller@f1001000 {
-               compatible = "arm,gic-400";
-               #interrupt-cells = <3>;
-               #address-cells = <0>;
-               interrupt-controller;
-               reg = <0 0xf1001000 0 0x1000>,
-                       <0 0xf1002000 0 0x2000>,
-                       <0 0xf1004000 0 0x2000>,
-                       <0 0xf1006000 0 0x2000>;
-               interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
-               clocks = <&cpg CPG_MOD 408>;
-               clock-names = "clk";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 408>;
+       /* External SCIF clock */
+       scif_clk: scif {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
        };
 
-       gpio0: gpio@e6050000 {
-               compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6050000 0 0x50>;
-               interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 0 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 912>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 912>;
-       };
+       soc {
+               compatible = "simple-bus";
+               interrupt-parent = <&gic>;
 
-       gpio1: gpio@e6051000 {
-               compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6051000 0 0x50>;
-               interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 32 30>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 911>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 911>;
-       };
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               gpio0: gpio@e6050000 {
+                       compatible = "renesas,gpio-r8a7790",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6050000 0 0x50>;
+                       interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 0 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 912>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 912>;
+               };
 
-       gpio2: gpio@e6052000 {
-               compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6052000 0 0x50>;
-               interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 64 30>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 910>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 910>;
-       };
+               gpio1: gpio@e6051000 {
+                       compatible = "renesas,gpio-r8a7790",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6051000 0 0x50>;
+                       interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 32 30>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 911>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 911>;
+               };
 
-       gpio3: gpio@e6053000 {
-               compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6053000 0 0x50>;
-               interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 96 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 909>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 909>;
-       };
+               gpio2: gpio@e6052000 {
+                       compatible = "renesas,gpio-r8a7790",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6052000 0 0x50>;
+                       interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 64 30>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 910>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 910>;
+               };
 
-       gpio4: gpio@e6054000 {
-               compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6054000 0 0x50>;
-               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 128 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 908>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 908>;
-       };
+               gpio3: gpio@e6053000 {
+                       compatible = "renesas,gpio-r8a7790",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6053000 0 0x50>;
+                       interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 96 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 909>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 909>;
+               };
 
-       gpio5: gpio@e6055000 {
-               compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6055000 0 0x50>;
-               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 160 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 907>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 907>;
-       };
+               gpio4: gpio@e6054000 {
+                       compatible = "renesas,gpio-r8a7790",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6054000 0 0x50>;
+                       interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 128 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 908>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 908>;
+               };
 
-       thermal: thermal@e61f0000 {
-               compatible =    "renesas,thermal-r8a7790",
-                               "renesas,rcar-gen2-thermal",
-                               "renesas,rcar-thermal";
-               reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
-               interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 522>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 522>;
-               #thermal-sensor-cells = <0>;
-       };
+               gpio5: gpio@e6055000 {
+                       compatible = "renesas,gpio-r8a7790",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6055000 0 0x50>;
+                       interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 160 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 907>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 907>;
+               };
 
-       timer {
-               compatible = "arm,armv7-timer";
-               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
-       };
+               pfc: pin-controller@e6060000 {
+                       compatible = "renesas,pfc-r8a7790";
+                       reg = <0 0xe6060000 0 0x250>;
+               };
 
-       cmt0: timer@ffca0000 {
-               compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";
-               reg = <0 0xffca0000 0 0x1004>;
-               interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 124>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 124>;
+               cpg: clock-controller@e6150000 {
+                       compatible = "renesas,r8a7790-cpg-mssr";
+                       reg = <0 0xe6150000 0 0x1000>;
+                       clocks = <&extal_clk>, <&usb_extal_clk>;
+                       clock-names = "extal", "usb_extal";
+                       #clock-cells = <2>;
+                       #power-domain-cells = <0>;
+                       #reset-cells = <1>;
+               };
 
-               renesas,channels-mask = <0x60>;
+               apmu@e6151000 {
+                       compatible = "renesas,r8a7790-apmu", "renesas,apmu";
+                       reg = <0 0xe6151000 0 0x188>;
+                       cpus = <&cpu4 &cpu5 &cpu6 &cpu7>;
+               };
 
-               status = "disabled";
-       };
+               apmu@e6152000 {
+                       compatible = "renesas,r8a7790-apmu", "renesas,apmu";
+                       reg = <0 0xe6152000 0 0x188>;
+                       cpus = <&cpu0 &cpu1 &cpu2 &cpu3>;
+               };
 
-       cmt1: timer@e6130000 {
-               compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";
-               reg = <0 0xe6130000 0 0x1004>;
-               interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 329>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 329>;
-
-               renesas,channels-mask = <0xff>;
-
-               status = "disabled";
-       };
+               rst: reset-controller@e6160000 {
+                       compatible = "renesas,r8a7790-rst";
+                       reg = <0 0xe6160000 0 0x0100>;
+               };
 
-       irqc0: interrupt-controller@e61c0000 {
-               compatible = "renesas,irqc-r8a7790", "renesas,irqc";
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               reg = <0 0xe61c0000 0 0x200>;
-               interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 407>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 407>;
-       };
+               sysc: system-controller@e6180000 {
+                       compatible = "renesas,r8a7790-sysc";
+                       reg = <0 0xe6180000 0 0x0200>;
+                       #power-domain-cells = <1>;
+               };
 
-       dmac0: dma-controller@e6700000 {
-               compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
-               reg = <0 0xe6700000 0 0x20000>;
-               interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12", "ch13", "ch14";
-               clocks = <&cpg CPG_MOD 219>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 219>;
-               #dma-cells = <1>;
-               dma-channels = <15>;
-       };
+               irqc0: interrupt-controller@e61c0000 {
+                       compatible = "renesas,irqc-r8a7790", "renesas,irqc";
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       reg = <0 0xe61c0000 0 0x200>;
+                       interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 407>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 407>;
+               };
 
-       dmac1: dma-controller@e6720000 {
-               compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
-               reg = <0 0xe6720000 0 0x20000>;
-               interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12", "ch13", "ch14";
-               clocks = <&cpg CPG_MOD 218>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 218>;
-               #dma-cells = <1>;
-               dma-channels = <15>;
-       };
+               thermal: thermal@e61f0000 {
+                       compatible = "renesas,thermal-r8a7790",
+                                    "renesas,rcar-gen2-thermal",
+                                    "renesas,rcar-thermal";
+                       reg = <0 0xe61f0000 0 0x10>, <0 0xe61f0100 0 0x38>;
+                       interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 522>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 522>;
+                       #thermal-sensor-cells = <0>;
+               };
 
-       audma0: dma-controller@ec700000 {
-               compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
-               reg = <0 0xec700000 0 0x10000>;
-               interrupts =    <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12";
-               clocks = <&cpg CPG_MOD 502>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 502>;
-               #dma-cells = <1>;
-               dma-channels = <13>;
-       };
+               ipmmu_sy0: mmu@e6280000 {
+                       compatible = "renesas,ipmmu-r8a7790",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6280000 0 0x1000>;
+                       interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       audma1: dma-controller@ec720000 {
-               compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
-               reg = <0 0xec720000 0 0x10000>;
-               interrupts =    <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12";
-               clocks = <&cpg CPG_MOD 501>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 501>;
-               #dma-cells = <1>;
-               dma-channels = <13>;
-       };
+               ipmmu_sy1: mmu@e6290000 {
+                       compatible = "renesas,ipmmu-r8a7790",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6290000 0 0x1000>;
+                       interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       usb_dmac0: dma-controller@e65a0000 {
-               compatible = "renesas,r8a7790-usb-dmac", "renesas,usb-dmac";
-               reg = <0 0xe65a0000 0 0x100>;
-               interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "ch0", "ch1";
-               clocks = <&cpg CPG_MOD 330>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 330>;
-               #dma-cells = <1>;
-               dma-channels = <2>;
-       };
+               ipmmu_ds: mmu@e6740000 {
+                       compatible = "renesas,ipmmu-r8a7790",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6740000 0 0x1000>;
+                       interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       usb_dmac1: dma-controller@e65b0000 {
-               compatible = "renesas,r8a7790-usb-dmac", "renesas,usb-dmac";
-               reg = <0 0xe65b0000 0 0x100>;
-               interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "ch0", "ch1";
-               clocks = <&cpg CPG_MOD 331>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 331>;
-               #dma-cells = <1>;
-               dma-channels = <2>;
-       };
+               ipmmu_mp: mmu@ec680000 {
+                       compatible = "renesas,ipmmu-r8a7790",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xec680000 0 0x1000>;
+                       interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c0: i2c@e6508000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6508000 0 0x40>;
-               interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 931>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 931>;
-               i2c-scl-internal-delay-ns = <110>;
-               status = "disabled";
-       };
+               ipmmu_mx: mmu@fe951000 {
+                       compatible = "renesas,ipmmu-r8a7790",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xfe951000 0 0x1000>;
+                       interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c1: i2c@e6518000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6518000 0 0x40>;
-               interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 930>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 930>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               ipmmu_rt: mmu@ffc80000 {
+                       compatible = "renesas,ipmmu-r8a7790",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xffc80000 0 0x1000>;
+                       interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c2: i2c@e6530000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6530000 0 0x40>;
-               interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 929>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 929>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               icram0: sram@e63a0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63a0000 0 0x12000>;
+               };
 
-       i2c3: i2c@e6540000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6540000 0 0x40>;
-               interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 928>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 928>;
-               i2c-scl-internal-delay-ns = <110>;
-               status = "disabled";
-       };
+               icram1: sram@e63c0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63c0000 0 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0 0xe63c0000 0x1000>;
 
-       iic0: i2c@e6500000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe6500000 0 0x425>;
-               interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 318>;
-               dmas = <&dmac0 0x61>, <&dmac0 0x62>,
-                      <&dmac1 0x61>, <&dmac1 0x62>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 318>;
-               status = "disabled";
-       };
+                       smp-sram@0 {
+                               compatible = "renesas,smp-sram";
+                               reg = <0 0x10>;
+                       };
+               };
 
-       iic1: i2c@e6510000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe6510000 0 0x425>;
-               interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 323>;
-               dmas = <&dmac0 0x65>, <&dmac0 0x66>,
-                      <&dmac1 0x65>, <&dmac1 0x66>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 323>;
-               status = "disabled";
-       };
+               i2c0: i2c@e6508000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7790",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6508000 0 0x40>;
+                       interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 931>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 931>;
+                       i2c-scl-internal-delay-ns = <110>;
+                       status = "disabled";
+               };
 
-       iic2: i2c@e6520000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe6520000 0 0x425>;
-               interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 300>;
-               dmas = <&dmac0 0x69>, <&dmac0 0x6a>,
-                      <&dmac1 0x69>, <&dmac1 0x6a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 300>;
-               status = "disabled";
-       };
+               i2c1: i2c@e6518000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7790",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6518000 0 0x40>;
+                       interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 930>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 930>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       iic3: i2c@e60b0000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe60b0000 0 0x425>;
-               interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 926>;
-               dmas = <&dmac0 0x77>, <&dmac0 0x78>,
-                      <&dmac1 0x77>, <&dmac1 0x78>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 926>;
-               status = "disabled";
-       };
+               i2c2: i2c@e6530000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7790",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6530000 0 0x40>;
+                       interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 929>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 929>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       mmcif0: mmc@ee200000 {
-               compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif";
-               reg = <0 0xee200000 0 0x80>;
-               interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 315>;
-               dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                      <&dmac1 0xd1>, <&dmac1 0xd2>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 315>;
-               reg-io-width = <4>;
-               status = "disabled";
-               max-frequency = <97500000>;
-       };
+               i2c3: i2c@e6540000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7790",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6540000 0 0x40>;
+                       interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 928>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 928>;
+                       i2c-scl-internal-delay-ns = <110>;
+                       status = "disabled";
+               };
 
-       mmcif1: mmc@ee220000 {
-               compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif";
-               reg = <0 0xee220000 0 0x80>;
-               interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 305>;
-               dmas = <&dmac0 0xe1>, <&dmac0 0xe2>,
-                      <&dmac1 0xe1>, <&dmac1 0xe2>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 305>;
-               reg-io-width = <4>;
-               status = "disabled";
-               max-frequency = <97500000>;
-       };
+               iic0: i2c@e6500000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7790",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe6500000 0 0x425>;
+                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 318>;
+                       dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+                              <&dmac1 0x61>, <&dmac1 0x62>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 318>;
+                       status = "disabled";
+               };
 
-       pfc: pin-controller@e6060000 {
-               compatible = "renesas,pfc-r8a7790";
-               reg = <0 0xe6060000 0 0x250>;
-       };
+               iic1: i2c@e6510000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7790",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe6510000 0 0x425>;
+                       interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 323>;
+                       dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+                              <&dmac1 0x65>, <&dmac1 0x66>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 323>;
+                       status = "disabled";
+               };
 
-       sdhi0: sd@ee100000 {
-               compatible = "renesas,sdhi-r8a7790";
-               reg = <0 0xee100000 0 0x328>;
-               interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 314>;
-               dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                      <&dmac1 0xcd>, <&dmac1 0xce>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <195000000>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 314>;
-               status = "disabled";
-       };
+               iic2: i2c@e6520000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7790",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe6520000 0 0x425>;
+                       interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 300>;
+                       dmas = <&dmac0 0x69>, <&dmac0 0x6a>,
+                              <&dmac1 0x69>, <&dmac1 0x6a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 300>;
+                       status = "disabled";
+               };
 
-       sdhi1: sd@ee120000 {
-               compatible = "renesas,sdhi-r8a7790";
-               reg = <0 0xee120000 0 0x328>;
-               interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 313>;
-               dmas = <&dmac0 0xc9>, <&dmac0 0xca>,
-                      <&dmac1 0xc9>, <&dmac1 0xca>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <195000000>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 313>;
-               status = "disabled";
-       };
+               iic3: i2c@e60b0000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7790",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe60b0000 0 0x425>;
+                       interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 926>;
+                       dmas = <&dmac0 0x77>, <&dmac0 0x78>,
+                              <&dmac1 0x77>, <&dmac1 0x78>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 926>;
+                       status = "disabled";
+               };
 
-       sdhi2: sd@ee140000 {
-               compatible = "renesas,sdhi-r8a7790";
-               reg = <0 0xee140000 0 0x100>;
-               interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 312>;
-               dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                      <&dmac1 0xc1>, <&dmac1 0xc2>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <97500000>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 312>;
-               status = "disabled";
-       };
+               hsusb: usb@e6590000 {
+                       compatible = "renesas,usbhs-r8a7790",
+                                    "renesas,rcar-gen2-usbhs";
+                       reg = <0 0xe6590000 0 0x100>;
+                       interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 704>;
+                       dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
+                              <&usb_dmac1 0>, <&usb_dmac1 1>;
+                       dma-names = "ch0", "ch1", "ch2", "ch3";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 704>;
+                       renesas,buswait = <4>;
+                       phys = <&usb0 1>;
+                       phy-names = "usb";
+                       status = "disabled";
+               };
 
-       sdhi3: sd@ee160000 {
-               compatible = "renesas,sdhi-r8a7790";
-               reg = <0 0xee160000 0 0x100>;
-               interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 311>;
-               dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                      <&dmac1 0xd3>, <&dmac1 0xd4>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <97500000>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 311>;
-               status = "disabled";
-       };
+               usbphy: usb-phy@e6590100 {
+                       compatible = "renesas,usb-phy-r8a7790",
+                                    "renesas,rcar-gen2-usb-phy";
+                       reg = <0 0xe6590100 0 0x100>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       clocks = <&cpg CPG_MOD 704>;
+                       clock-names = "usbhs";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 704>;
+                       status = "disabled";
 
-       scifa0: serial@e6c40000 {
-               compatible = "renesas,scifa-r8a7790",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c40000 0 64>;
-               interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 204>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x21>, <&dmac0 0x22>,
-                      <&dmac1 0x21>, <&dmac1 0x22>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 204>;
-               status = "disabled";
-       };
+                       usb0: usb-channel@0 {
+                               reg = <0>;
+                               #phy-cells = <1>;
+                       };
+                       usb2: usb-channel@2 {
+                               reg = <2>;
+                               #phy-cells = <1>;
+                       };
+               };
 
-       scifa1: serial@e6c50000 {
-               compatible = "renesas,scifa-r8a7790",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c50000 0 64>;
-               interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 203>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x25>, <&dmac0 0x26>,
-                      <&dmac1 0x25>, <&dmac1 0x26>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 203>;
-               status = "disabled";
-       };
+               usb_dmac0: dma-controller@e65a0000 {
+                       compatible = "renesas,r8a7790-usb-dmac",
+                                    "renesas,usb-dmac";
+                       reg = <0 0xe65a0000 0 0x100>;
+                       interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "ch0", "ch1";
+                       clocks = <&cpg CPG_MOD 330>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 330>;
+                       #dma-cells = <1>;
+                       dma-channels = <2>;
+               };
 
-       scifa2: serial@e6c60000 {
-               compatible = "renesas,scifa-r8a7790",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c60000 0 64>;
-               interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 202>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x27>, <&dmac0 0x28>,
-                      <&dmac1 0x27>, <&dmac1 0x28>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 202>;
-               status = "disabled";
-       };
+               usb_dmac1: dma-controller@e65b0000 {
+                       compatible = "renesas,r8a7790-usb-dmac",
+                                    "renesas,usb-dmac";
+                       reg = <0 0xe65b0000 0 0x100>;
+                       interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "ch0", "ch1";
+                       clocks = <&cpg CPG_MOD 331>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 331>;
+                       #dma-cells = <1>;
+                       dma-channels = <2>;
+               };
 
-       scifb0: serial@e6c20000 {
-               compatible = "renesas,scifb-r8a7790",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c20000 0 0x100>;
-               interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 206>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
-                      <&dmac1 0x3d>, <&dmac1 0x3e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 206>;
-               status = "disabled";
-       };
+               dmac0: dma-controller@e6700000 {
+                       compatible = "renesas,dmac-r8a7790",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe6700000 0 0x20000>;
+                       interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12", "ch13", "ch14";
+                       clocks = <&cpg CPG_MOD 219>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 219>;
+                       #dma-cells = <1>;
+                       dma-channels = <15>;
+               };
 
-       scifb1: serial@e6c30000 {
-               compatible = "renesas,scifb-r8a7790",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c30000 0 0x100>;
-               interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 207>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
-                      <&dmac1 0x19>, <&dmac1 0x1a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 207>;
-               status = "disabled";
-       };
+               dmac1: dma-controller@e6720000 {
+                       compatible = "renesas,dmac-r8a7790",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe6720000 0 0x20000>;
+                       interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12", "ch13", "ch14";
+                       clocks = <&cpg CPG_MOD 218>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 218>;
+                       #dma-cells = <1>;
+                       dma-channels = <15>;
+               };
 
-       scifb2: serial@e6ce0000 {
-               compatible = "renesas,scifb-r8a7790",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6ce0000 0 0x100>;
-               interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 216>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
-                      <&dmac1 0x1d>, <&dmac1 0x1e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 216>;
-               status = "disabled";
-       };
+               avb: ethernet@e6800000 {
+                       compatible = "renesas,etheravb-r8a7790",
+                                    "renesas,etheravb-rcar-gen2";
+                       reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                       interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 812>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 812>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       scif0: serial@e6e60000 {
-               compatible = "renesas,scif-r8a7790", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e60000 0 64>;
-               interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
-                      <&dmac1 0x29>, <&dmac1 0x2a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 721>;
-               status = "disabled";
-       };
+               qspi: spi@e6b10000 {
+                       compatible = "renesas,qspi-r8a7790", "renesas,qspi";
+                       reg = <0 0xe6b10000 0 0x2c>;
+                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 917>;
+                       dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                              <&dmac1 0x17>, <&dmac1 0x18>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 917>;
+                       num-cs = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       scif1: serial@e6e68000 {
-               compatible = "renesas,scif-r8a7790", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e68000 0 64>;
-               interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
-                      <&dmac1 0x2d>, <&dmac1 0x2e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 720>;
-               status = "disabled";
-       };
+               scifa0: serial@e6c40000 {
+                       compatible = "renesas,scifa-r8a7790",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c40000 0 64>;
+                       interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 204>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x21>, <&dmac0 0x22>,
+                              <&dmac1 0x21>, <&dmac1 0x22>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 204>;
+                       status = "disabled";
+               };
 
-       scif2: serial@e6e56000 {
-               compatible = "renesas,scif-r8a7790", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e56000 0 64>;
-               interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 310>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
-                      <&dmac1 0x2b>, <&dmac1 0x2c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 310>;
-               status = "disabled";
-       };
+               scifa1: serial@e6c50000 {
+                       compatible = "renesas,scifa-r8a7790",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c50000 0 64>;
+                       interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 203>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x25>, <&dmac0 0x26>,
+                              <&dmac1 0x25>, <&dmac1 0x26>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 203>;
+                       status = "disabled";
+               };
 
-       hscif0: serial@e62c0000 {
-               compatible = "renesas,hscif-r8a7790",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62c0000 0 96>;
-               interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
-                      <&dmac1 0x39>, <&dmac1 0x3a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 717>;
-               status = "disabled";
-       };
+               scifa2: serial@e6c60000 {
+                       compatible = "renesas,scifa-r8a7790",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c60000 0 64>;
+                       interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 202>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x27>, <&dmac0 0x28>,
+                              <&dmac1 0x27>, <&dmac1 0x28>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 202>;
+                       status = "disabled";
+               };
 
-       hscif1: serial@e62c8000 {
-               compatible = "renesas,hscif-r8a7790",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62c8000 0 96>;
-               interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
-                      <&dmac1 0x4d>, <&dmac1 0x4e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 716>;
-               status = "disabled";
-       };
+               scifb0: serial@e6c20000 {
+                       compatible = "renesas,scifb-r8a7790",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6c20000 0 0x100>;
+                       interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 206>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
+                              <&dmac1 0x3d>, <&dmac1 0x3e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 206>;
+                       status = "disabled";
+               };
 
-       icram0: sram@e63a0000 {
-               compatible = "mmio-sram";
-               reg = <0 0xe63a0000 0 0x12000>;
-       };
+               scifb1: serial@e6c30000 {
+                       compatible = "renesas,scifb-r8a7790",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6c30000 0 0x100>;
+                       interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 207>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
+                              <&dmac1 0x19>, <&dmac1 0x1a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 207>;
+                       status = "disabled";
+               };
 
-       icram1: sram@e63c0000 {
-               compatible = "mmio-sram";
-               reg = <0 0xe63c0000 0 0x1000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges = <0 0 0xe63c0000 0x1000>;
+               scifb2: serial@e6ce0000 {
+                       compatible = "renesas,scifb-r8a7790",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6ce0000 0 0x100>;
+                       interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 216>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
+                              <&dmac1 0x1d>, <&dmac1 0x1e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 216>;
+                       status = "disabled";
+               };
 
-               smp-sram@0 {
-                       compatible = "renesas,smp-sram";
-                       reg = <0 0x10>;
+               scif0: serial@e6e60000 {
+                       compatible = "renesas,scif-r8a7790",
+                                    "renesas,rcar-gen2-scif",
+                                    "renesas,scif";
+                       reg = <0 0xe6e60000 0 64>;
+                       interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 721>,
+                                <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
+                              <&dmac1 0x29>, <&dmac1 0x2a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 721>;
+                       status = "disabled";
                };
-       };
 
-       ether: ethernet@ee700000 {
-               compatible = "renesas,ether-r8a7790";
-               reg = <0 0xee700000 0 0x400>;
-               interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 813>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 813>;
-               phy-mode = "rmii";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               scif1: serial@e6e68000 {
+                       compatible = "renesas,scif-r8a7790",
+                                    "renesas,rcar-gen2-scif",
+                                    "renesas,scif";
+                       reg = <0 0xe6e68000 0 64>;
+                       interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 720>,
+                                <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
+                              <&dmac1 0x2d>, <&dmac1 0x2e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 720>;
+                       status = "disabled";
+               };
 
-       avb: ethernet@e6800000 {
-               compatible = "renesas,etheravb-r8a7790",
-                            "renesas,etheravb-rcar-gen2";
-               reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-               interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 812>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 812>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               scif2: serial@e6e56000 {
+                       compatible = "renesas,scif-r8a7790",
+                                    "renesas,rcar-gen2-scif",
+                                    "renesas,scif";
+                       reg = <0 0xe6e56000 0 64>;
+                       interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 310>,
+                                <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
+                              <&dmac1 0x2b>, <&dmac1 0x2c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 310>;
+                       status = "disabled";
+               };
 
-       sata0: sata@ee300000 {
-               compatible = "renesas,sata-r8a7790", "renesas,rcar-gen2-sata";
-               reg = <0 0xee300000 0 0x2000>;
-               interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 815>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 815>;
-               status = "disabled";
-       };
+               hscif0: serial@e62c0000 {
+                       compatible = "renesas,hscif-r8a7790",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62c0000 0 96>;
+                       interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 717>,
+                                <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
+                              <&dmac1 0x39>, <&dmac1 0x3a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 717>;
+                       status = "disabled";
+               };
 
-       sata1: sata@ee500000 {
-               compatible = "renesas,sata-r8a7790", "renesas,rcar-gen2-sata";
-               reg = <0 0xee500000 0 0x2000>;
-               interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 814>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 814>;
-               status = "disabled";
-       };
+               hscif1: serial@e62c8000 {
+                       compatible = "renesas,hscif-r8a7790",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62c8000 0 96>;
+                       interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 716>,
+                                <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
+                              <&dmac1 0x4d>, <&dmac1 0x4e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 716>;
+                       status = "disabled";
+               };
 
-       hsusb: usb@e6590000 {
-               compatible = "renesas,usbhs-r8a7790", "renesas,rcar-gen2-usbhs";
-               reg = <0 0xe6590000 0 0x100>;
-               interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 704>;
-               dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
-                      <&usb_dmac1 0>, <&usb_dmac1 1>;
-               dma-names = "ch0", "ch1", "ch2", "ch3";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 704>;
-               renesas,buswait = <4>;
-               phys = <&usb0 1>;
-               phy-names = "usb";
-               status = "disabled";
-       };
+               msiof0: spi@e6e20000 {
+                       compatible = "renesas,msiof-r8a7790",
+                                    "renesas,rcar-gen2-msiof";
+                       reg = <0 0xe6e20000 0 0x0064>;
+                       interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 0>;
+                       dmas = <&dmac0 0x51>, <&dmac0 0x52>,
+                              <&dmac1 0x51>, <&dmac1 0x52>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 0>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       usbphy: usb-phy@e6590100 {
-               compatible = "renesas,usb-phy-r8a7790",
-                            "renesas,rcar-gen2-usb-phy";
-               reg = <0 0xe6590100 0 0x100>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               clocks = <&cpg CPG_MOD 704>;
-               clock-names = "usbhs";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 704>;
-               status = "disabled";
+               msiof1: spi@e6e10000 {
+                       compatible = "renesas,msiof-r8a7790",
+                                    "renesas,rcar-gen2-msiof";
+                       reg = <0 0xe6e10000 0 0x0064>;
+                       interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 208>;
+                       dmas = <&dmac0 0x55>, <&dmac0 0x56>,
+                              <&dmac1 0x55>, <&dmac1 0x56>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 208>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-               usb0: usb-channel@0 {
-                       reg = <0>;
-                       #phy-cells = <1>;
+               msiof2: spi@e6e00000 {
+                       compatible = "renesas,msiof-r8a7790",
+                                    "renesas,rcar-gen2-msiof";
+                       reg = <0 0xe6e00000 0 0x0064>;
+                       interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 205>;
+                       dmas = <&dmac0 0x41>, <&dmac0 0x42>,
+                              <&dmac1 0x41>, <&dmac1 0x42>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 205>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
                };
-               usb2: usb-channel@2 {
-                       reg = <2>;
-                       #phy-cells = <1>;
+
+               msiof3: spi@e6c90000 {
+                       compatible = "renesas,msiof-r8a7790",
+                                    "renesas,rcar-gen2-msiof";
+                       reg = <0 0xe6c90000 0 0x0064>;
+                       interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 215>;
+                       dmas = <&dmac0 0x45>, <&dmac0 0x46>,
+                              <&dmac1 0x45>, <&dmac1 0x46>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 215>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
                };
-       };
 
-       vin0: video@e6ef0000 {
-               compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef0000 0 0x1000>;
-               interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 811>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 811>;
-               status = "disabled";
-       };
+               can0: can@e6e80000 {
+                       compatible = "renesas,can-r8a7790",
+                                    "renesas,rcar-gen2-can";
+                       reg = <0 0xe6e80000 0 0x1000>;
+                       interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 916>,
+                                <&cpg CPG_CORE R8A7790_CLK_RCAN>, <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 916>;
+                       status = "disabled";
+               };
 
-       vin1: video@e6ef1000 {
-               compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef1000 0 0x1000>;
-               interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 810>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 810>;
-               status = "disabled";
-       };
+               can1: can@e6e88000 {
+                       compatible = "renesas,can-r8a7790",
+                                    "renesas,rcar-gen2-can";
+                       reg = <0 0xe6e88000 0 0x1000>;
+                       interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 915>,
+                                <&cpg CPG_CORE R8A7790_CLK_RCAN>, <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 915>;
+                       status = "disabled";
+               };
 
-       vin2: video@e6ef2000 {
-               compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef2000 0 0x1000>;
-               interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 809>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 809>;
-               status = "disabled";
-       };
+               vin0: video@e6ef0000 {
+                       compatible = "renesas,vin-r8a7790",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef0000 0 0x1000>;
+                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 811>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 811>;
+                       status = "disabled";
+               };
 
-       vin3: video@e6ef3000 {
-               compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef3000 0 0x1000>;
-               interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 808>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 808>;
-               status = "disabled";
-       };
+               vin1: video@e6ef1000 {
+                       compatible = "renesas,vin-r8a7790",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef1000 0 0x1000>;
+                       interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 810>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 810>;
+                       status = "disabled";
+               };
 
-       vsp@fe920000 {
-               compatible = "renesas,vsp1";
-               reg = <0 0xfe920000 0 0x8000>;
-               interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 130>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 130>;
-       };
+               vin2: video@e6ef2000 {
+                       compatible = "renesas,vin-r8a7790",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef2000 0 0x1000>;
+                       interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 809>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 809>;
+                       status = "disabled";
+               };
 
-       vsp@fe928000 {
-               compatible = "renesas,vsp1";
-               reg = <0 0xfe928000 0 0x8000>;
-               interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 131>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 131>;
-       };
+               vin3: video@e6ef3000 {
+                       compatible = "renesas,vin-r8a7790",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef3000 0 0x1000>;
+                       interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 808>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 808>;
+                       status = "disabled";
+               };
 
-       vsp@fe930000 {
-               compatible = "renesas,vsp1";
-               reg = <0 0xfe930000 0 0x8000>;
-               interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 128>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 128>;
-       };
+               rcar_sound: sound@ec500000 {
+                       /*
+                        * #sound-dai-cells is required
+                        *
+                        * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
+                        * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
+                        */
+                       compatible = "renesas,rcar_sound-r8a7790",
+                                    "renesas,rcar_sound-gen2";
+                       reg = <0 0xec500000 0 0x1000>, /* SCU */
+                             <0 0xec5a0000 0 0x100>,  /* ADG */
+                             <0 0xec540000 0 0x1000>, /* SSIU */
+                             <0 0xec541000 0 0x280>,  /* SSI */
+                             <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
+                       reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+
+                       clocks = <&cpg CPG_MOD 1005>,
+                                <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
+                                <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
+                                <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
+                                <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
+                                <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
+                                <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
+                                <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
+                                <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
+                                <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
+                                <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
+                                <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
+                                <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
+                                <&cpg CPG_CORE R8A7790_CLK_M2>;
+                       clock-names = "ssi-all",
+                                     "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                     "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                     "ssi.1", "ssi.0",
+                                     "src.9", "src.8", "src.7", "src.6",
+                                     "src.5", "src.4", "src.3", "src.2",
+                                     "src.1", "src.0",
+                                     "ctu.0", "ctu.1",
+                                     "mix.0", "mix.1",
+                                     "dvc.0", "dvc.1",
+                                     "clk_a", "clk_b", "clk_c", "clk_i";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 1005>,
+                                <&cpg 1006>, <&cpg 1007>,
+                                <&cpg 1008>, <&cpg 1009>,
+                                <&cpg 1010>, <&cpg 1011>,
+                                <&cpg 1012>, <&cpg 1013>,
+                                <&cpg 1014>, <&cpg 1015>;
+                       reset-names = "ssi-all",
+                                     "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                     "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                     "ssi.1", "ssi.0";
+
+                       status = "disabled";
+
+                       rcar_sound,dvc {
+                               dvc0: dvc-0 {
+                                       dmas = <&audma1 0xbc>;
+                                       dma-names = "tx";
+                               };
+                               dvc1: dvc-1 {
+                                       dmas = <&audma1 0xbe>;
+                                       dma-names = "tx";
+                               };
+                       };
 
-       vsp@fe938000 {
-               compatible = "renesas,vsp1";
-               reg = <0 0xfe938000 0 0x8000>;
-               interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 127>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 127>;
-       };
+                       rcar_sound,mix {
+                               mix0: mix-0 { };
+                               mix1: mix-1 { };
+                       };
 
-       du: display@feb00000 {
-               compatible = "renesas,du-r8a7790";
-               reg = <0 0xfeb00000 0 0x70000>,
-                     <0 0xfeb90000 0 0x1c>,
-                     <0 0xfeb94000 0 0x1c>;
-               reg-names = "du", "lvds.0", "lvds.1";
-               interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
-                        <&cpg CPG_MOD 722>, <&cpg CPG_MOD 726>,
-                        <&cpg CPG_MOD 725>;
-               clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1";
-               status = "disabled";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+                       rcar_sound,ctu {
+                               ctu00: ctu-0 { };
+                               ctu01: ctu-1 { };
+                               ctu02: ctu-2 { };
+                               ctu03: ctu-3 { };
+                               ctu10: ctu-4 { };
+                               ctu11: ctu-5 { };
+                               ctu12: ctu-6 { };
+                               ctu13: ctu-7 { };
+                       };
 
-                       port@0 {
-                               reg = <0>;
-                               du_out_rgb: endpoint {
+                       rcar_sound,src {
+                               src0: src-0 {
+                                       interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x85>, <&audma1 0x9a>;
+                                       dma-names = "rx", "tx";
                                };
-                       };
-                       port@1 {
-                               reg = <1>;
-                               du_out_lvds0: endpoint {
+                               src1: src-1 {
+                                       interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x87>, <&audma1 0x9c>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src2: src-2 {
+                                       interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x89>, <&audma1 0x9e>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src3: src-3 {
+                                       interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8b>, <&audma1 0xa0>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src4: src-4 {
+                                       interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8d>, <&audma1 0xb0>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src5: src-5 {
+                                       interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8f>, <&audma1 0xb2>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src6: src-6 {
+                                       interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x91>, <&audma1 0xb4>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src7: src-7 {
+                                       interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x93>, <&audma1 0xb6>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src8: src-8 {
+                                       interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x95>, <&audma1 0xb8>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src9: src-9 {
+                                       interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x97>, <&audma1 0xba>;
+                                       dma-names = "rx", "tx";
                                };
                        };
-                       port@2 {
-                               reg = <2>;
-                               du_out_lvds1: endpoint {
+
+                       rcar_sound,ssi {
+                               ssi0: ssi-0 {
+                                       interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x01>, <&audma1 0x02>,
+                                              <&audma0 0x15>, <&audma1 0x16>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi1: ssi-1 {
+                                        interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x03>, <&audma1 0x04>,
+                                              <&audma0 0x49>, <&audma1 0x4a>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi2: ssi-2 {
+                                       interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x05>, <&audma1 0x06>,
+                                              <&audma0 0x63>, <&audma1 0x64>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi3: ssi-3 {
+                                       interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x07>, <&audma1 0x08>,
+                                              <&audma0 0x6f>, <&audma1 0x70>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi4: ssi-4 {
+                                       interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x09>, <&audma1 0x0a>,
+                                              <&audma0 0x71>, <&audma1 0x72>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi5: ssi-5 {
+                                       interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0b>, <&audma1 0x0c>,
+                                              <&audma0 0x73>, <&audma1 0x74>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi6: ssi-6 {
+                                       interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0d>, <&audma1 0x0e>,
+                                              <&audma0 0x75>, <&audma1 0x76>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi7: ssi-7 {
+                                       interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0f>, <&audma1 0x10>,
+                                              <&audma0 0x79>, <&audma1 0x7a>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi8: ssi-8 {
+                                       interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x11>, <&audma1 0x12>,
+                                              <&audma0 0x7b>, <&audma1 0x7c>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi9: ssi-9 {
+                                       interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x13>, <&audma1 0x14>,
+                                              <&audma0 0x7d>, <&audma1 0x7e>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
                                };
                        };
                };
-       };
 
-       can0: can@e6e80000 {
-               compatible = "renesas,can-r8a7790", "renesas,rcar-gen2-can";
-               reg = <0 0xe6e80000 0 0x1000>;
-               interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7790_CLK_RCAN>,
-                        <&can_clk>;
-               clock-names = "clkp1", "clkp2", "can_clk";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 916>;
-               status = "disabled";
-       };
-
-       can1: can@e6e88000 {
-               compatible = "renesas,can-r8a7790", "renesas,rcar-gen2-can";
-               reg = <0 0xe6e88000 0 0x1000>;
-               interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7790_CLK_RCAN>,
-                        <&can_clk>;
-               clock-names = "clkp1", "clkp2", "can_clk";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 915>;
-               status = "disabled";
-       };
+               audma0: dma-controller@ec700000 {
+                       compatible = "renesas,dmac-r8a7790",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xec700000 0 0x10000>;
+                       interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12";
+                       clocks = <&cpg CPG_MOD 502>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 502>;
+                       #dma-cells = <1>;
+                       dma-channels = <13>;
+               };
 
-       jpu: jpeg-codec@fe980000 {
-               compatible = "renesas,jpu-r8a7790", "renesas,rcar-gen2-jpu";
-               reg = <0 0xfe980000 0 0x10300>;
-               interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 106>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 106>;
-       };
+               audma1: dma-controller@ec720000 {
+                       compatible = "renesas,dmac-r8a7790",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xec720000 0 0x10000>;
+                       interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12";
+                       clocks = <&cpg CPG_MOD 501>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 501>;
+                       #dma-cells = <1>;
+                       dma-channels = <13>;
+               };
 
-       /* External root clock */
-       extal_clk: extal {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+               xhci: usb@ee000000 {
+                       compatible = "renesas,xhci-r8a7790",
+                                    "renesas,rcar-gen2-xhci";
+                       reg = <0 0xee000000 0 0xc00>;
+                       interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 328>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 328>;
+                       phys = <&usb2 1>;
+                       phy-names = "usb";
+                       status = "disabled";
+               };
 
-       /* External PCIe clock - can be overridden by the board */
-       pcie_bus_clk: pcie_bus {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
+               pci0: pci@ee090000 {
+                       compatible = "renesas,pci-r8a7790",
+                                    "renesas,pci-rcar-gen2";
+                       device_type = "pci";
+                       reg = <0 0xee090000 0 0xc00>,
+                             <0 0xee080000 0 0x1100>;
+                       interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 703>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
+                       status = "disabled";
+
+                       bus-range = <0 0>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                       interrupt-map-mask = <0xff00 0 0 0x7>;
+                       interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                        0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                        0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+
+                       usb@1,0 {
+                               reg = <0x800 0 0 0 0>;
+                               phys = <&usb0 0>;
+                               phy-names = "usb";
+                       };
 
-       /*
-        * The external audio clocks are configured as 0 Hz fixed frequency
-        * clocks by default.
-        * Boards that provide audio clocks should override them.
-        */
-       audio_clk_a: audio_clk_a {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
-       audio_clk_b: audio_clk_b {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
-       audio_clk_c: audio_clk_c {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
+                       usb@2,0 {
+                               reg = <0x1000 0 0 0 0>;
+                               phys = <&usb0 0>;
+                               phy-names = "usb";
+                       };
+               };
 
-       /* External SCIF clock */
-       scif_clk: scif {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+               pci1: pci@ee0b0000 {
+                       compatible = "renesas,pci-r8a7790",
+                                    "renesas,pci-rcar-gen2";
+                       device_type = "pci";
+                       reg = <0 0xee0b0000 0 0xc00>,
+                             <0 0xee0a0000 0 0x1100>;
+                       interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 703>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
+                       status = "disabled";
+
+                       bus-range = <1 1>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       ranges = <0x02000000 0 0xee0a0000 0 0xee0a0000 0 0x00010000>;
+                       interrupt-map-mask = <0xff00 0 0 0x7>;
+                       interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
+                                        0x0800 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
+                                        0x1000 0 0 2 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+               };
 
-       /* External USB clock - can be overridden by the board */
-       usb_extal_clk: usb_extal {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <48000000>;
-       };
+               pci2: pci@ee0d0000 {
+                       compatible = "renesas,pci-r8a7790",
+                                    "renesas,pci-rcar-gen2";
+                       device_type = "pci";
+                       clocks = <&cpg CPG_MOD 703>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
+                       reg = <0 0xee0d0000 0 0xc00>,
+                             <0 0xee0c0000 0 0x1100>;
+                       interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+
+                       bus-range = <2 2>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                       interrupt-map-mask = <0xff00 0 0 0x7>;
+                       interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                        0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                        0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+
+                       usb@1,0 {
+                               reg = <0x20800 0 0 0 0>;
+                               phys = <&usb2 0>;
+                               phy-names = "usb";
+                       };
 
-       /* External CAN clock */
-       can_clk: can {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+                       usb@2,0 {
+                               reg = <0x21000 0 0 0 0>;
+                               phys = <&usb2 0>;
+                               phy-names = "usb";
+                       };
+               };
 
-       cpg: clock-controller@e6150000 {
-               compatible = "renesas,r8a7790-cpg-mssr";
-               reg = <0 0xe6150000 0 0x1000>;
-               clocks = <&extal_clk>, <&usb_extal_clk>;
-               clock-names = "extal", "usb_extal";
-               #clock-cells = <2>;
-               #power-domain-cells = <0>;
-               #reset-cells = <1>;
-       };
+               sdhi0: sd@ee100000 {
+                       compatible = "renesas,sdhi-r8a7790",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee100000 0 0x328>;
+                       interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 314>;
+                       dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                              <&dmac1 0xcd>, <&dmac1 0xce>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <195000000>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 314>;
+                       status = "disabled";
+               };
 
-       prr: chipid@ff000044 {
-               compatible = "renesas,prr";
-               reg = <0 0xff000044 0 4>;
-       };
+               sdhi1: sd@ee120000 {
+                       compatible = "renesas,sdhi-r8a7790",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee120000 0 0x328>;
+                       interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 313>;
+                       dmas = <&dmac0 0xc9>, <&dmac0 0xca>,
+                              <&dmac1 0xc9>, <&dmac1 0xca>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <195000000>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 313>;
+                       status = "disabled";
+               };
 
-       rst: reset-controller@e6160000 {
-               compatible = "renesas,r8a7790-rst";
-               reg = <0 0xe6160000 0 0x0100>;
-       };
+               sdhi2: sd@ee140000 {
+                       compatible = "renesas,sdhi-r8a7790",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee140000 0 0x100>;
+                       interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 312>;
+                       dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                              <&dmac1 0xc1>, <&dmac1 0xc2>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <97500000>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 312>;
+                       status = "disabled";
+               };
 
-       sysc: system-controller@e6180000 {
-               compatible = "renesas,r8a7790-sysc";
-               reg = <0 0xe6180000 0 0x0200>;
-               #power-domain-cells = <1>;
-       };
+               sdhi3: sd@ee160000 {
+                       compatible = "renesas,sdhi-r8a7790",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee160000 0 0x100>;
+                       interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 311>;
+                       dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                              <&dmac1 0xd3>, <&dmac1 0xd4>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <97500000>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 311>;
+                       status = "disabled";
+               };
 
-       qspi: spi@e6b10000 {
-               compatible = "renesas,qspi-r8a7790", "renesas,qspi";
-               reg = <0 0xe6b10000 0 0x2c>;
-               interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 917>;
-               dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                      <&dmac1 0x17>, <&dmac1 0x18>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 917>;
-               num-cs = <1>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               mmcif0: mmc@ee200000 {
+                       compatible = "renesas,mmcif-r8a7790",
+                                    "renesas,sh-mmcif";
+                       reg = <0 0xee200000 0 0x80>;
+                       interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 315>;
+                       dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                              <&dmac1 0xd1>, <&dmac1 0xd2>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 315>;
+                       reg-io-width = <4>;
+                       status = "disabled";
+                       max-frequency = <97500000>;
+               };
 
-       msiof0: spi@e6e20000 {
-               compatible = "renesas,msiof-r8a7790",
-                            "renesas,rcar-gen2-msiof";
-               reg = <0 0xe6e20000 0 0x0064>;
-               interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 0>;
-               dmas = <&dmac0 0x51>, <&dmac0 0x52>,
-                      <&dmac1 0x51>, <&dmac1 0x52>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               mmcif1: mmc@ee220000 {
+                       compatible = "renesas,mmcif-r8a7790",
+                                    "renesas,sh-mmcif";
+                       reg = <0 0xee220000 0 0x80>;
+                       interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 305>;
+                       dmas = <&dmac0 0xe1>, <&dmac0 0xe2>,
+                              <&dmac1 0xe1>, <&dmac1 0xe2>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 305>;
+                       reg-io-width = <4>;
+                       status = "disabled";
+                       max-frequency = <97500000>;
+               };
 
-       msiof1: spi@e6e10000 {
-               compatible = "renesas,msiof-r8a7790",
-                            "renesas,rcar-gen2-msiof";
-               reg = <0 0xe6e10000 0 0x0064>;
-               interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 208>;
-               dmas = <&dmac0 0x55>, <&dmac0 0x56>,
-                      <&dmac1 0x55>, <&dmac1 0x56>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 208>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               sata0: sata@ee300000 {
+                       compatible = "renesas,sata-r8a7790",
+                                    "renesas,rcar-gen2-sata";
+                       reg = <0 0xee300000 0 0x2000>;
+                       interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 815>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 815>;
+                       status = "disabled";
+               };
 
-       msiof2: spi@e6e00000 {
-               compatible = "renesas,msiof-r8a7790",
-                            "renesas,rcar-gen2-msiof";
-               reg = <0 0xe6e00000 0 0x0064>;
-               interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 205>;
-               dmas = <&dmac0 0x41>, <&dmac0 0x42>,
-                      <&dmac1 0x41>, <&dmac1 0x42>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 205>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               sata1: sata@ee500000 {
+                       compatible = "renesas,sata-r8a7790",
+                                    "renesas,rcar-gen2-sata";
+                       reg = <0 0xee500000 0 0x2000>;
+                       interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 814>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 814>;
+                       status = "disabled";
+               };
 
-       msiof3: spi@e6c90000 {
-               compatible = "renesas,msiof-r8a7790",
-                            "renesas,rcar-gen2-msiof";
-               reg = <0 0xe6c90000 0 0x0064>;
-               interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 215>;
-               dmas = <&dmac0 0x45>, <&dmac0 0x46>,
-                      <&dmac1 0x45>, <&dmac1 0x46>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 215>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               ether: ethernet@ee700000 {
+                       compatible = "renesas,ether-r8a7790",
+                                    "renesas,rcar-gen2-ether";
+                       reg = <0 0xee700000 0 0x400>;
+                       interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 813>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 813>;
+                       phy-mode = "rmii";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       xhci: usb@ee000000 {
-               compatible = "renesas,xhci-r8a7790", "renesas,rcar-gen2-xhci";
-               reg = <0 0xee000000 0 0xc00>;
-               interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 328>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 328>;
-               phys = <&usb2 1>;
-               phy-names = "usb";
-               status = "disabled";
-       };
+               gic: interrupt-controller@f1001000 {
+                       compatible = "arm,gic-400";
+                       #interrupt-cells = <3>;
+                       #address-cells = <0>;
+                       interrupt-controller;
+                       reg = <0 0xf1001000 0 0x1000>, <0 0xf1002000 0 0x2000>,
+                             <0 0xf1004000 0 0x2000>, <0 0xf1006000 0 0x2000>;
+                       interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+                       clocks = <&cpg CPG_MOD 408>;
+                       clock-names = "clk";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 408>;
+               };
 
-       pci0: pci@ee090000 {
-               compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
-               device_type = "pci";
-               reg = <0 0xee090000 0 0xc00>,
-                     <0 0xee080000 0 0x1100>;
-               interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 703>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 703>;
-               status = "disabled";
-
-               bus-range = <0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               #interrupt-cells = <1>;
-               ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
-               interrupt-map-mask = <0xff00 0 0 0x7>;
-               interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-
-               usb@1,0 {
-                       reg = <0x800 0 0 0 0>;
-                       phys = <&usb0 0>;
-                       phy-names = "usb";
+               pciec: pcie@fe000000 {
+                       compatible = "renesas,pcie-r8a7790",
+                                    "renesas,pcie-rcar-gen2";
+                       reg = <0 0xfe000000 0 0x80000>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       bus-range = <0x00 0xff>;
+                       device_type = "pci";
+                       ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+                                 0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+                                 0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+                                 0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+                       /* Map all possible DDR as inbound ranges */
+                       dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+                                     0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
+                       interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0>;
+                       interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
+                       clock-names = "pcie", "pcie_bus";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 319>;
+                       status = "disabled";
                };
 
-               usb@2,0 {
-                       reg = <0x1000 0 0 0 0>;
-                       phys = <&usb0 0>;
-                       phy-names = "usb";
+               vsp@fe920000 {
+                       compatible = "renesas,vsp1";
+                       reg = <0 0xfe920000 0 0x8000>;
+                       interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 130>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 130>;
                };
-       };
 
-       pci1: pci@ee0b0000 {
-               compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
-               device_type = "pci";
-               reg = <0 0xee0b0000 0 0xc00>,
-                     <0 0xee0a0000 0 0x1100>;
-               interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 703>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 703>;
-               status = "disabled";
-
-               bus-range = <1 1>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               #interrupt-cells = <1>;
-               ranges = <0x02000000 0 0xee0a0000 0 0xee0a0000 0 0x00010000>;
-               interrupt-map-mask = <0xff00 0 0 0x7>;
-               interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
-                                0x0800 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
-                                0x1000 0 0 2 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-       };
+               vsp@fe928000 {
+                       compatible = "renesas,vsp1";
+                       reg = <0 0xfe928000 0 0x8000>;
+                       interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 131>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 131>;
+               };
 
-       pci2: pci@ee0d0000 {
-               compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
-               device_type = "pci";
-               clocks = <&cpg CPG_MOD 703>;
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 703>;
-               reg = <0 0xee0d0000 0 0xc00>,
-                     <0 0xee0c0000 0 0x1100>;
-               interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-               status = "disabled";
-
-               bus-range = <2 2>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               #interrupt-cells = <1>;
-               ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
-               interrupt-map-mask = <0xff00 0 0 0x7>;
-               interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-
-               usb@1,0 {
-                       reg = <0x20800 0 0 0 0>;
-                       phys = <&usb2 0>;
-                       phy-names = "usb";
+               vsp@fe930000 {
+                       compatible = "renesas,vsp1";
+                       reg = <0 0xfe930000 0 0x8000>;
+                       interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 128>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 128>;
                };
 
-               usb@2,0 {
-                       reg = <0x21000 0 0 0 0>;
-                       phys = <&usb2 0>;
-                       phy-names = "usb";
+               vsp@fe938000 {
+                       compatible = "renesas,vsp1";
+                       reg = <0 0xfe938000 0 0x8000>;
+                       interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 127>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 127>;
                };
-       };
 
-       pciec: pcie@fe000000 {
-               compatible = "renesas,pcie-r8a7790", "renesas,pcie-rcar-gen2";
-               reg = <0 0xfe000000 0 0x80000>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               bus-range = <0x00 0xff>;
-               device_type = "pci";
-               ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
-                         0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
-                         0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
-                         0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
-               /* Map all possible DDR as inbound ranges */
-               dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
-                             0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
-               interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-               #interrupt-cells = <1>;
-               interrupt-map-mask = <0 0 0 0>;
-               interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
-               clock-names = "pcie", "pcie_bus";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 319>;
-               status = "disabled";
-       };
+               jpu: jpeg-codec@fe980000 {
+                       compatible = "renesas,jpu-r8a7790",
+                                    "renesas,rcar-gen2-jpu";
+                       reg = <0 0xfe980000 0 0x10300>;
+                       interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 106>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 106>;
+               };
 
-       rcar_sound: sound@ec500000 {
-               /*
-                * #sound-dai-cells is required
-                *
-                * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
-                * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
-                */
-               compatible =  "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2";
-               reg =   <0 0xec500000 0 0x1000>, /* SCU */
-                       <0 0xec5a0000 0 0x100>,  /* ADG */
-                       <0 0xec540000 0 0x1000>, /* SSIU */
-                       <0 0xec541000 0 0x280>,  /* SSI */
-                       <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
-               reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
-
-               clocks = <&cpg CPG_MOD 1005>,
-                        <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-                        <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
-                        <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
-                        <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
-                        <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
-                        <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
-                        <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
-                        <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
-                        <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
-                        <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
-                        <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                        <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                        <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
-                        <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
-                        <&cpg CPG_CORE R8A7790_CLK_M2>;
-               clock-names = "ssi-all",
-                               "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                               "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
-                               "src.9", "src.8", "src.7", "src.6", "src.5",
-                               "src.4", "src.3", "src.2", "src.1", "src.0",
-                               "ctu.0", "ctu.1",
-                               "mix.0", "mix.1",
-                               "dvc.0", "dvc.1",
-                               "clk_a", "clk_b", "clk_c", "clk_i";
-               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-               resets = <&cpg 1005>,
-                        <&cpg 1006>, <&cpg 1007>, <&cpg 1008>, <&cpg 1009>,
-                        <&cpg 1010>, <&cpg 1011>, <&cpg 1012>, <&cpg 1013>,
-                        <&cpg 1014>, <&cpg 1015>;
-               reset-names = "ssi-all",
-                             "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                             "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0";
-
-               status = "disabled";
-
-               rcar_sound,dvc {
-                       dvc0: dvc-0 {
-                               dmas = <&audma1 0xbc>;
-                               dma-names = "tx";
-                       };
-                       dvc1: dvc-1 {
-                               dmas = <&audma1 0xbe>;
-                               dma-names = "tx";
+               du: display@feb00000 {
+                       compatible = "renesas,du-r8a7790";
+                       reg = <0 0xfeb00000 0 0x70000>;
+                       interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
+                                <&cpg CPG_MOD 722>;
+                       clock-names = "du.0", "du.1", "du.2";
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       du_out_rgb: endpoint {
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       du_out_lvds0: endpoint {
+                                               remote-endpoint = <&lvds0_in>;
+                                       };
+                               };
+                               port@2 {
+                                       reg = <2>;
+                                       du_out_lvds1: endpoint {
+                                               remote-endpoint = <&lvds1_in>;
+                                       };
+                               };
                        };
                };
 
-               rcar_sound,mix {
-                       mix0: mix-0 { };
-                       mix1: mix-1 { };
+               lvds0: lvds@feb90000 {
+                       compatible = "renesas,r8a7790-lvds";
+                       reg = <0 0xfeb90000 0 0x1c>;
+                       clocks = <&cpg CPG_MOD 726>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 726>;
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       lvds0_in: endpoint {
+                                               remote-endpoint = <&du_out_lvds0>;
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       lvds0_out: endpoint {
+                                       };
+                               };
+                       };
                };
 
-               rcar_sound,ctu {
-                       ctu00: ctu-0 { };
-                       ctu01: ctu-1 { };
-                       ctu02: ctu-2 { };
-                       ctu03: ctu-3 { };
-                       ctu10: ctu-4 { };
-                       ctu11: ctu-5 { };
-                       ctu12: ctu-6 { };
-                       ctu13: ctu-7 { };
+               lvds1: lvds@feb94000 {
+                       compatible = "renesas,r8a7790-lvds";
+                       reg = <0 0xfeb94000 0 0x1c>;
+                       clocks = <&cpg CPG_MOD 725>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 725>;
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       lvds1_in: endpoint {
+                                               remote-endpoint = <&du_out_lvds1>;
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       lvds1_out: endpoint {
+                                       };
+                               };
+                       };
                };
 
-               rcar_sound,src {
-                       src0: src-0 {
-                               interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x85>, <&audma1 0x9a>;
-                               dma-names = "rx", "tx";
-                       };
-                       src1: src-1 {
-                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x87>, <&audma1 0x9c>;
-                               dma-names = "rx", "tx";
-                       };
-                       src2: src-2 {
-                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x89>, <&audma1 0x9e>;
-                               dma-names = "rx", "tx";
-                       };
-                       src3: src-3 {
-                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8b>, <&audma1 0xa0>;
-                               dma-names = "rx", "tx";
-                       };
-                       src4: src-4 {
-                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8d>, <&audma1 0xb0>;
-                               dma-names = "rx", "tx";
-                       };
-                       src5: src-5 {
-                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8f>, <&audma1 0xb2>;
-                               dma-names = "rx", "tx";
-                       };
-                       src6: src-6 {
-                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x91>, <&audma1 0xb4>;
-                               dma-names = "rx", "tx";
-                       };
-                       src7: src-7 {
-                               interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x93>, <&audma1 0xb6>;
-                               dma-names = "rx", "tx";
-                       };
-                       src8: src-8 {
-                               interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x95>, <&audma1 0xb8>;
-                               dma-names = "rx", "tx";
-                       };
-                       src9: src-9 {
-                               interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x97>, <&audma1 0xba>;
-                               dma-names = "rx", "tx";
-                       };
+               prr: chipid@ff000044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xff000044 0 4>;
                };
 
-               rcar_sound,ssi {
-                       ssi0: ssi-0 {
-                               interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi1: ssi-1 {
-                                interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi2: ssi-2 {
-                               interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi3: ssi-3 {
-                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi4: ssi-4 {
-                               interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi5: ssi-5 {
-                               interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi6: ssi-6 {
-                               interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi7: ssi-7 {
-                               interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi8: ssi-8 {
-                               interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi9: ssi-9 {
-                               interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
+               cmt0: timer@ffca0000 {
+                       compatible = "renesas,r8a7790-cmt0",
+                                    "renesas,rcar-gen2-cmt0";
+                       reg = <0 0xffca0000 0 0x1004>;
+                       interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 124>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 124>;
+
+                       status = "disabled";
                };
-       };
 
-       ipmmu_sy0: mmu@e6280000 {
-               compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6280000 0 0x1000>;
-               interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
+               cmt1: timer@e6130000 {
+                       compatible = "renesas,r8a7790-cmt1",
+                                    "renesas,rcar-gen2-cmt1";
+                       reg = <0 0xe6130000 0 0x1004>;
+                       interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 329>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 329>;
+
+                       status = "disabled";
+               };
        };
 
-       ipmmu_sy1: mmu@e6290000 {
-               compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6290000 0 0x1000>;
-               interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+       thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
 
-       ipmmu_ds: mmu@e6740000 {
-               compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6740000 0 0x1000>;
-               interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+                       thermal-sensors = <&thermal>;
 
-       ipmmu_mp: mmu@ec680000 {
-               compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-               reg = <0 0xec680000 0 0x1000>;
-               interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
+                       trips {
+                               cpu-crit {
+                                       temperature = <95000>;
+                                       hysteresis = <0>;
+                                       type = "critical";
+                               };
+                       };
+                       cooling-maps {
+                       };
+               };
        };
 
-       ipmmu_mx: mmu@fe951000 {
-               compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-               reg = <0 0xfe951000 0 0x1000>;
-               interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
+       timer {
+               compatible = "arm,armv7-timer";
+               interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
        };
 
-       ipmmu_rt: mmu@ffc80000 {
-               compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-               reg = <0 0xffc80000 0 0x1000>;
-               interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
+       /* External USB clock - can be overridden by the board */
+       usb_extal_clk: usb_extal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <48000000>;
        };
 };
index 85966fcc1eb0c6e65969d0446afaf5902bfa229c..be96bfd4f36057c5f0ab19fa0fb398134bf0c274 100644 (file)
                serial0 = &scif0;
                serial1 = &scif1;
                i2c9 = &gpioi2c1;
+               i2c10 = &gpioi2c2;
+               i2c11 = &gpioi2c4;
                i2c12 = &i2cexio1;
+               i2c13 = &i2chdmi;
+               i2c14 = &i2cexio4;
        };
 
        chosen {
                };
        };
 
+       cec_clock: cec-clock {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <12000000>;
+       };
+
        hdmi-out {
                compatible = "hdmi-connector";
                type = "a";
                #size-cells = <0>;
                compatible = "i2c-gpio";
                status = "disabled";
-               gpios = <&gpio7 16 GPIO_ACTIVE_HIGH /* sda */
-                        &gpio7 15 GPIO_ACTIVE_HIGH /* scl */
-                       >;
+               scl-gpios = <&gpio7 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio7 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               i2c-gpio,delay-us = <5>;
+       };
+
+       gpioi2c2: i2c-10 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "i2c-gpio";
+               status = "disabled";
+               scl-gpios = <&gpio2 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio2 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               i2c-gpio,delay-us = <5>;
+       };
+
+       gpioi2c4: i2c-11 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "i2c-gpio";
+               status = "disabled";
+               scl-gpios = <&gpio7 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio7 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                i2c-gpio,delay-us = <5>;
        };
 
                #address-cells = <1>;
                #size-cells = <0>;
        };
+
+       /*
+        * A fallback to GPIO is provided for I2C2.
+        */
+       i2chdmi: i2c-13 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&i2c2>, <&gpioi2c2>;
+               i2c-bus-name = "i2c-hdmi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ak4643: codec@12 {
+                       compatible = "asahi-kasei,ak4643";
+                       #sound-dai-cells = <0>;
+                       reg = <0x12>;
+               };
+
+               composite-in@20 {
+                       compatible = "adi,adv7180";
+                       reg = <0x20>;
+                       remote = <&vin1>;
+
+                       port {
+                               adv7180: endpoint {
+                                       bus-width = <8>;
+                                       remote-endpoint = <&vin1ep>;
+                               };
+                       };
+               };
+
+               hdmi@39 {
+                       compatible = "adi,adv7511w";
+                       reg = <0x39>;
+                       interrupt-parent = <&gpio3>;
+                       interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+                       clocks = <&cec_clock>;
+                       clock-names = "cec";
+
+                       adi,input-depth = <8>;
+                       adi,input-colorspace = "rgb";
+                       adi,input-clock = "1x";
+                       adi,input-style = <1>;
+                       adi,input-justification = "evenly";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       adv7511_in: endpoint {
+                                               remote-endpoint = <&du_out_rgb>;
+                                       };
+                               };
+
+                               port@1 {
+                                       reg = <1>;
+                                       adv7511_out: endpoint {
+                                               remote-endpoint = <&hdmi_con_out>;
+                                       };
+                               };
+                       };
+               };
+
+               hdmi-in@4c {
+                       compatible = "adi,adv7612";
+                       reg = <0x4c>;
+                       interrupt-parent = <&gpio4>;
+                       interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+                       default-input = <0>;
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       adv7612_in: endpoint {
+                                               remote-endpoint = <&hdmi_con_in>;
+                                       };
+                               };
+
+                               port@2 {
+                                       reg = <2>;
+                                       adv7612_out: endpoint {
+                                               remote-endpoint = <&vin0ep2>;
+                                       };
+                               };
+                       };
+               };
+
+               eeprom@50 {
+                       compatible = "renesas,r1ex24002", "atmel,24c02";
+                       reg = <0x50>;
+                       pagesize = <16>;
+               };
+       };
+
+       /*
+        * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
+        * A fallback to GPIO is provided.
+        */
+       i2cexio4: i2c-14 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&i2c4>, <&gpioi2c4>;
+               i2c-bus-name = "i2c-exio4";
+               #address-cells = <1>;
+               #size-cells = <0>;
+       };
 };
 
 &du {
        pinctrl-names = "default";
        status = "okay";
 
-       clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 726>,
+       clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
                 <&x13_clk>, <&x2_clk>;
-       clock-names = "du.0", "du.1", "lvds.0",
-                     "dclkin.0", "dclkin.1";
+       clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
 
        ports {
                port@0 {
                                remote-endpoint = <&adv7511_in>;
                        };
                };
+       };
+};
+
+&lvds0 {
+       status = "okay";
+
+       ports {
                port@1 {
                        lvds_connector: endpoint {
                        };
                function = "i2c2";
        };
 
+       i2c4_pins: i2c4 {
+               groups = "i2c4_c";
+               function = "i2c4";
+       };
+
        du_pins: du {
                groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
                function = "du";
 
 &i2c2 {
        pinctrl-0 = <&i2c2_pins>;
-       pinctrl-names = "default";
+       pinctrl-names = "i2c-hdmi";
 
-       status = "okay";
        clock-frequency = <100000>;
+};
 
-       ak4643: codec@12 {
-               compatible = "asahi-kasei,ak4643";
-               #sound-dai-cells = <0>;
-               reg = <0x12>;
-       };
-
-       composite-in@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-               remote = <&vin1>;
-
-               port {
-                       adv7180: endpoint {
-                               bus-width = <8>;
-                               remote-endpoint = <&vin1ep>;
-                       };
-               };
-       };
-
-       cec_clock: cec-clock {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <12000000>;
-       };
-
-       hdmi@39 {
-               compatible = "adi,adv7511w";
-               reg = <0x39>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
-               clocks = <&cec_clock>;
-               clock-names = "cec";
-
-               adi,input-depth = <8>;
-               adi,input-colorspace = "rgb";
-               adi,input-clock = "1x";
-               adi,input-style = <1>;
-               adi,input-justification = "evenly";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               adv7511_in: endpoint {
-                                       remote-endpoint = <&du_out_rgb>;
-                               };
-                       };
-
-                       port@1 {
-                               reg = <1>;
-                               adv7511_out: endpoint {
-                                       remote-endpoint = <&hdmi_con_out>;
-                               };
-                       };
-               };
-       };
-
-       hdmi-in@4c {
-               compatible = "adi,adv7612";
-               reg = <0x4c>;
-               interrupt-parent = <&gpio4>;
-               interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-               default-input = <0>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               adv7612_in: endpoint {
-                                       remote-endpoint = <&hdmi_con_in>;
-                               };
-                       };
-
-                       port@2 {
-                               reg = <2>;
-                               adv7612_out: endpoint {
-                                       remote-endpoint = <&vin0ep2>;
-                               };
-                       };
-               };
-       };
-
-       eeprom@50 {
-               compatible = "renesas,24c02", "atmel,24c02";
-               reg = <0x50>;
-               pagesize = <16>;
-       };
+&i2c4 {
+       pinctrl-0 = <&i2c4_pins>;
+       pinctrl-names = "i2c-exio4";
 };
 
 &i2c6 {
index b870b1853730714a96adb9de60685d32ada659d3..f2d5723fbdc3cdd910b36bd241283039cab74cb0 100644 (file)
@@ -26,6 +26,8 @@
 
        aliases {
                serial0 = &scif0;
+               i2c9 = &gpioi2c2;
+               i2c10 = &i2chdmi;
        };
 
        chosen {
                        clocks = <&x14_clk>;
                };
        };
+
+       gpioi2c2: i2c-9 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "i2c-gpio";
+               status = "disabled";
+               scl-gpios = <&gpio2 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio2 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               i2c-gpio,delay-us = <5>;
+       };
+
+       /*
+        * A fallback to GPIO is provided for I2C2.
+        */
+       i2chdmi: i2c-10 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&i2c2>, <&gpioi2c2>;
+               i2c-bus-name = "i2c-hdmi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ak4642: codec@12 {
+                       compatible = "asahi-kasei,ak4642";
+                       #sound-dai-cells = <0>;
+                       reg = <0x12>;
+               };
+
+               composite-in@20 {
+                       compatible = "adi,adv7180";
+                       reg = <0x20>;
+                       remote = <&vin0>;
+
+                       port {
+                               adv7180: endpoint {
+                                       bus-width = <8>;
+                                       remote-endpoint = <&vin0ep>;
+                               };
+                       };
+               };
+
+               hdmi@39 {
+                       compatible = "adi,adv7511w";
+                       reg = <0x39>;
+                       interrupt-parent = <&gpio3>;
+                       interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+
+                       adi,input-depth = <8>;
+                       adi,input-colorspace = "rgb";
+                       adi,input-clock = "1x";
+                       adi,input-style = <1>;
+                       adi,input-justification = "evenly";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       adv7511_in: endpoint {
+                                               remote-endpoint = <&du_out_rgb>;
+                                       };
+                               };
+
+                               port@1 {
+                                       reg = <1>;
+                                       adv7511_out: endpoint {
+                                               remote-endpoint = <&hdmi_con>;
+                                       };
+                               };
+                       };
+               };
+       };
 };
 
 &extal_clk {
 
 &i2c2 {
        pinctrl-0 = <&i2c2_pins>;
-       pinctrl-names = "default";
+       pinctrl-names = "i2c-hdmi";
 
-       status = "okay";
-       clock-frequency = <400000>;
-
-       ak4642: codec@12 {
-               compatible = "asahi-kasei,ak4642";
-               #sound-dai-cells = <0>;
-               reg = <0x12>;
-       };
-
-       composite-in@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-               remote = <&vin0>;
-
-               port {
-                       adv7180: endpoint {
-                               bus-width = <8>;
-                               remote-endpoint = <&vin0ep>;
-                       };
-               };
-       };
-
-       hdmi@39 {
-               compatible = "adi,adv7511w";
-               reg = <0x39>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
-
-               adi,input-depth = <8>;
-               adi,input-colorspace = "rgb";
-               adi,input-clock = "1x";
-               adi,input-style = <1>;
-               adi,input-justification = "evenly";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               adv7511_in: endpoint {
-                                       remote-endpoint = <&du_out_rgb>;
-                               };
-                       };
-
-                       port@1 {
-                               reg = <1>;
-                               adv7511_out: endpoint {
-                                       remote-endpoint = <&hdmi_con>;
-                               };
-                       };
-               };
-       };
-};
-
-&i2c6 {
-       status = "okay";
        clock-frequency = <400000>;
 };
 
        pinctrl-names = "default";
        status = "okay";
 
-       clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 726>,
+       clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
                 <&x3_clk>, <&x16_clk>;
-       clock-names = "du.0", "du.1", "lvds.0",
-                     "dclkin.0", "dclkin.1";
+       clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
 
        ports {
-               port@1 {
+               port@0 {
                        endpoint {
                                remote-endpoint = <&adv7511_in>;
                        };
        };
 };
 
+&lvds0 {
+       status = "okay";
+
+       ports {
+               port@1 {
+                       lvds_connector: endpoint {
+                       };
+               };
+       };
+};
+
 &rcar_sound {
        pinctrl-0 = <&ssi_pins &audio_clk_pins>;
        pinctrl-names = "default";
index dd21fde19367ee44c7526f0c9cacacc006b2560a..d728738ba8682e5005595b9dba9c72193687b544 100644 (file)
@@ -14,7 +14,6 @@
 
 / {
        compatible = "renesas,r8a7791";
-       interrupt-parent = <&gic>;
        #address-cells = <2>;
        #size-cells = <2>;
 
                vin2 = &vin2;
        };
 
+       /*
+        * The external audio clocks are configured as 0 Hz fixed frequency
+        * clocks by default.
+        * Boards that provide audio clocks should override them.
+        */
+       audio_clk_a: audio_clk_a {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+       audio_clk_b: audio_clk_b {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+       audio_clk_c: audio_clk_c {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+
+       /* External CAN clock */
+       can_clk: can {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
                };
        };
 
-       thermal-zones {
-               cpu_thermal: cpu-thermal {
-                       polling-delay-passive   = <0>;
-                       polling-delay           = <0>;
-
-                       thermal-sensors = <&thermal>;
-
-                       trips {
-                               cpu-crit {
-                                       temperature     = <115000>;
-                                       hysteresis      = <0>;
-                                       type            = "critical";
-                               };
-                       };
-                       cooling-maps {
-                       };
-               };
-       };
-
-       apmu@e6152000 {
-               compatible = "renesas,r8a7791-apmu", "renesas,apmu";
-               reg = <0 0xe6152000 0 0x188>;
-               cpus = <&cpu0 &cpu1>;
-       };
-
-       gic: interrupt-controller@f1001000 {
-               compatible = "arm,gic-400";
-               #interrupt-cells = <3>;
-               #address-cells = <0>;
-               interrupt-controller;
-               reg = <0 0xf1001000 0 0x1000>,
-                       <0 0xf1002000 0 0x2000>,
-                       <0 0xf1004000 0 0x2000>,
-                       <0 0xf1006000 0 0x2000>;
-               interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
-               clocks = <&cpg CPG_MOD 408>;
-               clock-names = "clk";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 408>;
-       };
-
-       gpio0: gpio@e6050000 {
-               compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6050000 0 0x50>;
-               interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 0 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 912>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 912>;
-       };
-
-       gpio1: gpio@e6051000 {
-               compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6051000 0 0x50>;
-               interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 32 26>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 911>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 911>;
-       };
-
-       gpio2: gpio@e6052000 {
-               compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6052000 0 0x50>;
-               interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 64 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 910>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 910>;
-       };
-
-       gpio3: gpio@e6053000 {
-               compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6053000 0 0x50>;
-               interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 96 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 909>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 909>;
-       };
-
-       gpio4: gpio@e6054000 {
-               compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6054000 0 0x50>;
-               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 128 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 908>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 908>;
+       /* External root clock */
+       extal_clk: extal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
        };
 
-       gpio5: gpio@e6055000 {
-               compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6055000 0 0x50>;
-               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 160 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 907>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 907>;
+       /* External PCIe clock - can be overridden by the board */
+       pcie_bus_clk: pcie_bus {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
        };
 
-       gpio6: gpio@e6055400 {
-               compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6055400 0 0x50>;
-               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 192 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 905>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 905>;
+       /* External SCIF clock */
+       scif_clk: scif {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
        };
 
-       gpio7: gpio@e6055800 {
-               compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6055800 0 0x50>;
-               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 224 26>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 904>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 904>;
-       };
+       soc {
+               compatible = "simple-bus";
+               interrupt-parent = <&gic>;
 
-       thermal: thermal@e61f0000 {
-               compatible =    "renesas,thermal-r8a7791",
-                               "renesas,rcar-gen2-thermal",
-                               "renesas,rcar-thermal";
-               reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
-               interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 522>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 522>;
-               #thermal-sensor-cells = <0>;
-       };
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               gpio0: gpio@e6050000 {
+                       compatible = "renesas,gpio-r8a7791",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6050000 0 0x50>;
+                       interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 0 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 912>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 912>;
+               };
 
-       timer {
-               compatible = "arm,armv7-timer";
-               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
-       };
+               gpio1: gpio@e6051000 {
+                       compatible = "renesas,gpio-r8a7791",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6051000 0 0x50>;
+                       interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 32 26>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 911>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 911>;
+               };
 
-       cmt0: timer@ffca0000 {
-               compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2";
-               reg = <0 0xffca0000 0 0x1004>;
-               interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 124>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 124>;
+               gpio2: gpio@e6052000 {
+                       compatible = "renesas,gpio-r8a7791",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6052000 0 0x50>;
+                       interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 64 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 910>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 910>;
+               };
 
-               renesas,channels-mask = <0x60>;
+               gpio3: gpio@e6053000 {
+                       compatible = "renesas,gpio-r8a7791",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6053000 0 0x50>;
+                       interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 96 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 909>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 909>;
+               };
 
-               status = "disabled";
-       };
+               gpio4: gpio@e6054000 {
+                       compatible = "renesas,gpio-r8a7791",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6054000 0 0x50>;
+                       interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 128 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 908>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 908>;
+               };
 
-       cmt1: timer@e6130000 {
-               compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2";
-               reg = <0 0xe6130000 0 0x1004>;
-               interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 329>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 329>;
-
-               renesas,channels-mask = <0xff>;
-
-               status = "disabled";
-       };
+               gpio5: gpio@e6055000 {
+                       compatible = "renesas,gpio-r8a7791",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6055000 0 0x50>;
+                       interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 160 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 907>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 907>;
+               };
 
-       irqc0: interrupt-controller@e61c0000 {
-               compatible = "renesas,irqc-r8a7791", "renesas,irqc";
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               reg = <0 0xe61c0000 0 0x200>;
-               interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 407>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 407>;
-       };
+               gpio6: gpio@e6055400 {
+                       compatible = "renesas,gpio-r8a7791",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6055400 0 0x50>;
+                       interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 192 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 905>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 905>;
+               };
 
-       dmac0: dma-controller@e6700000 {
-               compatible = "renesas,dmac-r8a7791", "renesas,rcar-dmac";
-               reg = <0 0xe6700000 0 0x20000>;
-               interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12", "ch13", "ch14";
-               clocks = <&cpg CPG_MOD 219>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 219>;
-               #dma-cells = <1>;
-               dma-channels = <15>;
-       };
+               gpio7: gpio@e6055800 {
+                       compatible = "renesas,gpio-r8a7791",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6055800 0 0x50>;
+                       interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 224 26>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 904>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 904>;
+               };
 
-       dmac1: dma-controller@e6720000 {
-               compatible = "renesas,dmac-r8a7791", "renesas,rcar-dmac";
-               reg = <0 0xe6720000 0 0x20000>;
-               interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12", "ch13", "ch14";
-               clocks = <&cpg CPG_MOD 218>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 218>;
-               #dma-cells = <1>;
-               dma-channels = <15>;
-       };
+               pfc: pin-controller@e6060000 {
+                       compatible = "renesas,pfc-r8a7791";
+                       reg = <0 0xe6060000 0 0x250>;
+               };
 
-       audma0: dma-controller@ec700000 {
-               compatible = "renesas,dmac-r8a7791", "renesas,rcar-dmac";
-               reg = <0 0xec700000 0 0x10000>;
-               interrupts =    <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12";
-               clocks = <&cpg CPG_MOD 502>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 502>;
-               #dma-cells = <1>;
-               dma-channels = <13>;
-       };
+               cpg: clock-controller@e6150000 {
+                       compatible = "renesas,r8a7791-cpg-mssr";
+                       reg = <0 0xe6150000 0 0x1000>;
+                       clocks = <&extal_clk>, <&usb_extal_clk>;
+                       clock-names = "extal", "usb_extal";
+                       #clock-cells = <2>;
+                       #power-domain-cells = <0>;
+                       #reset-cells = <1>;
+               };
 
-       audma1: dma-controller@ec720000 {
-               compatible = "renesas,dmac-r8a7791", "renesas,rcar-dmac";
-               reg = <0 0xec720000 0 0x10000>;
-               interrupts =    <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12";
-               clocks = <&cpg CPG_MOD 501>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 501>;
-               #dma-cells = <1>;
-               dma-channels = <13>;
-       };
+               apmu@e6152000 {
+                       compatible = "renesas,r8a7791-apmu", "renesas,apmu";
+                       reg = <0 0xe6152000 0 0x188>;
+                       cpus = <&cpu0 &cpu1>;
+               };
 
-       usb_dmac0: dma-controller@e65a0000 {
-               compatible = "renesas,r8a7791-usb-dmac", "renesas,usb-dmac";
-               reg = <0 0xe65a0000 0 0x100>;
-               interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "ch0", "ch1";
-               clocks = <&cpg CPG_MOD 330>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 330>;
-               #dma-cells = <1>;
-               dma-channels = <2>;
-       };
+               rst: reset-controller@e6160000 {
+                       compatible = "renesas,r8a7791-rst";
+                       reg = <0 0xe6160000 0 0x0100>;
+               };
 
-       usb_dmac1: dma-controller@e65b0000 {
-               compatible = "renesas,r8a7791-usb-dmac", "renesas,usb-dmac";
-               reg = <0 0xe65b0000 0 0x100>;
-               interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "ch0", "ch1";
-               clocks = <&cpg CPG_MOD 331>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 331>;
-               #dma-cells = <1>;
-               dma-channels = <2>;
-       };
+               sysc: system-controller@e6180000 {
+                       compatible = "renesas,r8a7791-sysc";
+                       reg = <0 0xe6180000 0 0x0200>;
+                       #power-domain-cells = <1>;
+               };
 
-       /* The memory map in the User's Manual maps the cores to bus numbers */
-       i2c0: i2c@e6508000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6508000 0 0x40>;
-               interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 931>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 931>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               irqc0: interrupt-controller@e61c0000 {
+                       compatible = "renesas,irqc-r8a7791", "renesas,irqc";
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       reg = <0 0xe61c0000 0 0x200>;
+                       interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 407>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 407>;
+               };
 
-       i2c1: i2c@e6518000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6518000 0 0x40>;
-               interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 930>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 930>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               thermal: thermal@e61f0000 {
+                       compatible = "renesas,thermal-r8a7791",
+                                    "renesas,rcar-gen2-thermal",
+                                    "renesas,rcar-thermal";
+                       reg = <0 0xe61f0000 0 0x10>, <0 0xe61f0100 0 0x38>;
+                       interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 522>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 522>;
+                       #thermal-sensor-cells = <0>;
+               };
 
-       i2c2: i2c@e6530000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6530000 0 0x40>;
-               interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 929>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 929>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               ipmmu_sy0: mmu@e6280000 {
+                       compatible = "renesas,ipmmu-r8a7791",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6280000 0 0x1000>;
+                       interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c3: i2c@e6540000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6540000 0 0x40>;
-               interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 928>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 928>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               ipmmu_sy1: mmu@e6290000 {
+                       compatible = "renesas,ipmmu-r8a7791",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6290000 0 0x1000>;
+                       interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c4: i2c@e6520000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6520000 0 0x40>;
-               interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 927>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 927>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               ipmmu_ds: mmu@e6740000 {
+                       compatible = "renesas,ipmmu-r8a7791",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6740000 0 0x1000>;
+                       interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c5: i2c@e6528000 {
-               /* doesn't need pinmux */
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6528000 0 0x40>;
-               interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 925>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 925>;
-               i2c-scl-internal-delay-ns = <110>;
-               status = "disabled";
-       };
+               ipmmu_mp: mmu@ec680000 {
+                       compatible = "renesas,ipmmu-r8a7791",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xec680000 0 0x1000>;
+                       interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c6: i2c@e60b0000 {
-               /* doesn't need pinmux */
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7791", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe60b0000 0 0x425>;
-               interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 926>;
-               dmas = <&dmac0 0x77>, <&dmac0 0x78>,
-                      <&dmac1 0x77>, <&dmac1 0x78>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 926>;
-               status = "disabled";
-       };
+               ipmmu_mx: mmu@fe951000 {
+                       compatible = "renesas,ipmmu-r8a7791",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xfe951000 0 0x1000>;
+                       interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c7: i2c@e6500000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7791", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe6500000 0 0x425>;
-               interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 318>;
-               dmas = <&dmac0 0x61>, <&dmac0 0x62>,
-                      <&dmac1 0x61>, <&dmac1 0x62>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 318>;
-               status = "disabled";
-       };
+               ipmmu_rt: mmu@ffc80000 {
+                       compatible = "renesas,ipmmu-r8a7791",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xffc80000 0 0x1000>;
+                       interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c8: i2c@e6510000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7791", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe6510000 0 0x425>;
-               interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 323>;
-               dmas = <&dmac0 0x65>, <&dmac0 0x66>,
-                      <&dmac1 0x65>, <&dmac1 0x66>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 323>;
-               status = "disabled";
-       };
+               ipmmu_gp: mmu@e62a0000 {
+                       compatible = "renesas,ipmmu-r8a7791",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe62a0000 0 0x1000>;
+                       interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       pfc: pin-controller@e6060000 {
-               compatible = "renesas,pfc-r8a7791";
-               reg = <0 0xe6060000 0 0x250>;
-       };
+               icram0: sram@e63a0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63a0000 0 0x12000>;
+               };
 
-       mmcif0: mmc@ee200000 {
-               compatible = "renesas,mmcif-r8a7791", "renesas,sh-mmcif";
-               reg = <0 0xee200000 0 0x80>;
-               interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 315>;
-               dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                      <&dmac1 0xd1>, <&dmac1 0xd2>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 315>;
-               reg-io-width = <4>;
-               status = "disabled";
-               max-frequency = <97500000>;
-       };
+               icram1: sram@e63c0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63c0000 0 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0 0xe63c0000 0x1000>;
 
-       sdhi0: sd@ee100000 {
-               compatible = "renesas,sdhi-r8a7791";
-               reg = <0 0xee100000 0 0x328>;
-               interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 314>;
-               dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                      <&dmac1 0xcd>, <&dmac1 0xce>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <195000000>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 314>;
-               status = "disabled";
-       };
+                       smp-sram@0 {
+                               compatible = "renesas,smp-sram";
+                               reg = <0 0x10>;
+                       };
+               };
 
-       sdhi1: sd@ee140000 {
-               compatible = "renesas,sdhi-r8a7791";
-               reg = <0 0xee140000 0 0x100>;
-               interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 312>;
-               dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                      <&dmac1 0xc1>, <&dmac1 0xc2>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <97500000>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 312>;
-               status = "disabled";
-       };
+               /* The memory map in the User's Manual maps the cores to
+                * bus numbers
+                */
+               i2c0: i2c@e6508000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7791",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6508000 0 0x40>;
+                       interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 931>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 931>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       sdhi2: sd@ee160000 {
-               compatible = "renesas,sdhi-r8a7791";
-               reg = <0 0xee160000 0 0x100>;
-               interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 311>;
-               dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                      <&dmac1 0xd3>, <&dmac1 0xd4>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <97500000>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 311>;
-               status = "disabled";
-       };
+               i2c1: i2c@e6518000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7791",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6518000 0 0x40>;
+                       interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 930>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 930>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       scifa0: serial@e6c40000 {
-               compatible = "renesas,scifa-r8a7791",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c40000 0 64>;
-               interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 204>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x21>, <&dmac0 0x22>,
-                      <&dmac1 0x21>, <&dmac1 0x22>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 204>;
-               status = "disabled";
-       };
+               i2c2: i2c@e6530000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7791",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6530000 0 0x40>;
+                       interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 929>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 929>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       scifa1: serial@e6c50000 {
-               compatible = "renesas,scifa-r8a7791",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c50000 0 64>;
-               interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 203>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x25>, <&dmac0 0x26>,
-                      <&dmac1 0x25>, <&dmac1 0x26>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 203>;
-               status = "disabled";
-       };
+               i2c3: i2c@e6540000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7791",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6540000 0 0x40>;
+                       interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 928>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 928>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       scifa2: serial@e6c60000 {
-               compatible = "renesas,scifa-r8a7791",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c60000 0 64>;
-               interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 202>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x27>, <&dmac0 0x28>,
-                      <&dmac1 0x27>, <&dmac1 0x28>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 202>;
-               status = "disabled";
-       };
+               i2c4: i2c@e6520000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7791",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6520000 0 0x40>;
+                       interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 927>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 927>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       scifa3: serial@e6c70000 {
-               compatible = "renesas,scifa-r8a7791",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c70000 0 64>;
-               interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 1106>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
-                      <&dmac1 0x1b>, <&dmac1 0x1c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 1106>;
-               status = "disabled";
-       };
+               i2c5: i2c@e6528000 {
+                       /* doesn't need pinmux */
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7791",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6528000 0 0x40>;
+                       interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 925>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 925>;
+                       i2c-scl-internal-delay-ns = <110>;
+                       status = "disabled";
+               };
 
-       scifa4: serial@e6c78000 {
-               compatible = "renesas,scifa-r8a7791",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c78000 0 64>;
-               interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 1107>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
-                      <&dmac1 0x1f>, <&dmac1 0x20>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 1107>;
-               status = "disabled";
-       };
+               i2c6: i2c@e60b0000 {
+                       /* doesn't need pinmux */
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7791",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe60b0000 0 0x425>;
+                       interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 926>;
+                       dmas = <&dmac0 0x77>, <&dmac0 0x78>,
+                              <&dmac1 0x77>, <&dmac1 0x78>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 926>;
+                       status = "disabled";
+               };
 
-       scifa5: serial@e6c80000 {
-               compatible = "renesas,scifa-r8a7791",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c80000 0 64>;
-               interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 1108>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x23>, <&dmac0 0x24>,
-                      <&dmac1 0x23>, <&dmac1 0x24>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 1108>;
-               status = "disabled";
-       };
+               i2c7: i2c@e6500000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7791",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe6500000 0 0x425>;
+                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 318>;
+                       dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+                              <&dmac1 0x61>, <&dmac1 0x62>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 318>;
+                       status = "disabled";
+               };
 
-       scifb0: serial@e6c20000 {
-               compatible = "renesas,scifb-r8a7791",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c20000 0 0x100>;
-               interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 206>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
-                      <&dmac1 0x3d>, <&dmac1 0x3e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 206>;
-               status = "disabled";
-       };
+               i2c8: i2c@e6510000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7791",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe6510000 0 0x425>;
+                       interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 323>;
+                       dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+                              <&dmac1 0x65>, <&dmac1 0x66>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 323>;
+                       status = "disabled";
+               };
 
-       scifb1: serial@e6c30000 {
-               compatible = "renesas,scifb-r8a7791",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c30000 0 0x100>;
-               interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 207>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
-                      <&dmac1 0x19>, <&dmac1 0x1a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 207>;
-               status = "disabled";
-       };
+               hsusb: usb@e6590000 {
+                       compatible = "renesas,usbhs-r8a7791",
+                                    "renesas,rcar-gen2-usbhs";
+                       reg = <0 0xe6590000 0 0x100>;
+                       interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 704>;
+                       dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
+                              <&usb_dmac1 0>, <&usb_dmac1 1>;
+                       dma-names = "ch0", "ch1", "ch2", "ch3";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 704>;
+                       renesas,buswait = <4>;
+                       phys = <&usb0 1>;
+                       phy-names = "usb";
+                       status = "disabled";
+               };
 
-       scifb2: serial@e6ce0000 {
-               compatible = "renesas,scifb-r8a7791",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6ce0000 0 0x100>;
-               interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 216>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
-                      <&dmac1 0x1d>, <&dmac1 0x1e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 216>;
-               status = "disabled";
-       };
+               usbphy: usb-phy@e6590100 {
+                       compatible = "renesas,usb-phy-r8a7791",
+                                    "renesas,rcar-gen2-usb-phy";
+                       reg = <0 0xe6590100 0 0x100>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       clocks = <&cpg CPG_MOD 704>;
+                       clock-names = "usbhs";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 704>;
+                       status = "disabled";
 
-       scif0: serial@e6e60000 {
-               compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e60000 0 64>;
-               interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
-                      <&dmac1 0x29>, <&dmac1 0x2a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 721>;
-               status = "disabled";
-       };
+                       usb0: usb-channel@0 {
+                               reg = <0>;
+                               #phy-cells = <1>;
+                       };
+                       usb2: usb-channel@2 {
+                               reg = <2>;
+                               #phy-cells = <1>;
+                       };
+               };
 
-       scif1: serial@e6e68000 {
-               compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e68000 0 64>;
-               interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
-                      <&dmac1 0x2d>, <&dmac1 0x2e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 720>;
-               status = "disabled";
-       };
+               usb_dmac0: dma-controller@e65a0000 {
+                       compatible = "renesas,r8a7791-usb-dmac",
+                                    "renesas,usb-dmac";
+                       reg = <0 0xe65a0000 0 0x100>;
+                       interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "ch0", "ch1";
+                       clocks = <&cpg CPG_MOD 330>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 330>;
+                       #dma-cells = <1>;
+                       dma-channels = <2>;
+               };
 
-       adc: adc@e6e54000 {
-               compatible = "renesas,r8a7791-gyroadc", "renesas,rcar-gyroadc";
-               reg = <0 0xe6e54000 0 64>;
-               clocks = <&cpg CPG_MOD 901>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 901>;
-               status = "disabled";
-       };
+               usb_dmac1: dma-controller@e65b0000 {
+                       compatible = "renesas,r8a7791-usb-dmac",
+                                    "renesas,usb-dmac";
+                       reg = <0 0xe65b0000 0 0x100>;
+                       interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "ch0", "ch1";
+                       clocks = <&cpg CPG_MOD 331>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 331>;
+                       #dma-cells = <1>;
+                       dma-channels = <2>;
+               };
 
-       scif2: serial@e6e58000 {
-               compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e58000 0 64>;
-               interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
-                      <&dmac1 0x2b>, <&dmac1 0x2c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 719>;
-               status = "disabled";
-       };
+               dmac0: dma-controller@e6700000 {
+                       compatible = "renesas,dmac-r8a7791",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe6700000 0 0x20000>;
+                       interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12", "ch13", "ch14";
+                       clocks = <&cpg CPG_MOD 219>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 219>;
+                       #dma-cells = <1>;
+                       dma-channels = <15>;
+               };
 
-       scif3: serial@e6ea8000 {
-               compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6ea8000 0 64>;
-               interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
-                      <&dmac1 0x2f>, <&dmac1 0x30>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 718>;
-               status = "disabled";
-       };
+               dmac1: dma-controller@e6720000 {
+                       compatible = "renesas,dmac-r8a7791",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe6720000 0 0x20000>;
+                       interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12", "ch13", "ch14";
+                       clocks = <&cpg CPG_MOD 218>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 218>;
+                       #dma-cells = <1>;
+                       dma-channels = <15>;
+               };
 
-       scif4: serial@e6ee0000 {
-               compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6ee0000 0 64>;
-               interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
-                      <&dmac1 0xfb>, <&dmac1 0xfc>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 715>;
-               status = "disabled";
-       };
+               avb: ethernet@e6800000 {
+                       compatible = "renesas,etheravb-r8a7791",
+                                    "renesas,etheravb-rcar-gen2";
+                       reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                       interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 812>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 812>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       scif5: serial@e6ee8000 {
-               compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6ee8000 0 64>;
-               interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
-                      <&dmac1 0xfd>, <&dmac1 0xfe>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 714>;
-               status = "disabled";
-       };
+               qspi: spi@e6b10000 {
+                       compatible = "renesas,qspi-r8a7791", "renesas,qspi";
+                       reg = <0 0xe6b10000 0 0x2c>;
+                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 917>;
+                       dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                              <&dmac1 0x17>, <&dmac1 0x18>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 917>;
+                       num-cs = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       hscif0: serial@e62c0000 {
-               compatible = "renesas,hscif-r8a7791",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62c0000 0 96>;
-               interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
-                      <&dmac1 0x39>, <&dmac1 0x3a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 717>;
-               status = "disabled";
-       };
+               scifa0: serial@e6c40000 {
+                       compatible = "renesas,scifa-r8a7791",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c40000 0 64>;
+                       interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 204>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x21>, <&dmac0 0x22>,
+                              <&dmac1 0x21>, <&dmac1 0x22>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 204>;
+                       status = "disabled";
+               };
 
-       hscif1: serial@e62c8000 {
-               compatible = "renesas,hscif-r8a7791",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62c8000 0 96>;
-               interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
-                      <&dmac1 0x4d>, <&dmac1 0x4e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 716>;
-               status = "disabled";
-       };
+               scifa1: serial@e6c50000 {
+                       compatible = "renesas,scifa-r8a7791",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c50000 0 64>;
+                       interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 203>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x25>, <&dmac0 0x26>,
+                              <&dmac1 0x25>, <&dmac1 0x26>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 203>;
+                       status = "disabled";
+               };
 
-       hscif2: serial@e62d0000 {
-               compatible = "renesas,hscif-r8a7791",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62d0000 0 96>;
-               interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
-                      <&dmac1 0x3b>, <&dmac1 0x3c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 713>;
-               status = "disabled";
-       };
+               scifa2: serial@e6c60000 {
+                       compatible = "renesas,scifa-r8a7791",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c60000 0 64>;
+                       interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 202>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x27>, <&dmac0 0x28>,
+                              <&dmac1 0x27>, <&dmac1 0x28>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 202>;
+                       status = "disabled";
+               };
 
-       icram0: sram@e63a0000 {
-               compatible = "mmio-sram";
-               reg = <0 0xe63a0000 0 0x12000>;
-       };
+               scifa3: serial@e6c70000 {
+                       compatible = "renesas,scifa-r8a7791",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c70000 0 64>;
+                       interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 1106>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
+                              <&dmac1 0x1b>, <&dmac1 0x1c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 1106>;
+                       status = "disabled";
+               };
 
-       icram1: sram@e63c0000 {
-               compatible = "mmio-sram";
-               reg = <0 0xe63c0000 0 0x1000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges = <0 0 0xe63c0000 0x1000>;
+               scifa4: serial@e6c78000 {
+                       compatible = "renesas,scifa-r8a7791",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c78000 0 64>;
+                       interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 1107>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
+                              <&dmac1 0x1f>, <&dmac1 0x20>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 1107>;
+                       status = "disabled";
+               };
 
-               smp-sram@0 {
-                       compatible = "renesas,smp-sram";
-                       reg = <0 0x10>;
+               scifa5: serial@e6c80000 {
+                       compatible = "renesas,scifa-r8a7791",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c80000 0 64>;
+                       interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 1108>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x23>, <&dmac0 0x24>,
+                              <&dmac1 0x23>, <&dmac1 0x24>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 1108>;
+                       status = "disabled";
                };
-       };
 
-       ether: ethernet@ee700000 {
-               compatible = "renesas,ether-r8a7791";
-               reg = <0 0xee700000 0 0x400>;
-               interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 813>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 813>;
-               phy-mode = "rmii";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               scifb0: serial@e6c20000 {
+                       compatible = "renesas,scifb-r8a7791",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6c20000 0 0x100>;
+                       interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 206>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
+                              <&dmac1 0x3d>, <&dmac1 0x3e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 206>;
+                       status = "disabled";
+               };
 
-       avb: ethernet@e6800000 {
-               compatible = "renesas,etheravb-r8a7791",
-                            "renesas,etheravb-rcar-gen2";
-               reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-               interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 812>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 812>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               scifb1: serial@e6c30000 {
+                       compatible = "renesas,scifb-r8a7791",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6c30000 0 0x100>;
+                       interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 207>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
+                              <&dmac1 0x19>, <&dmac1 0x1a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 207>;
+                       status = "disabled";
+               };
 
-       sata0: sata@ee300000 {
-               compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata";
-               reg = <0 0xee300000 0 0x2000>;
-               interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 815>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 815>;
-               status = "disabled";
-       };
+               scifb2: serial@e6ce0000 {
+                       compatible = "renesas,scifb-r8a7791",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6ce0000 0 0x100>;
+                       interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 216>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
+                              <&dmac1 0x1d>, <&dmac1 0x1e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 216>;
+                       status = "disabled";
+               };
 
-       sata1: sata@ee500000 {
-               compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata";
-               reg = <0 0xee500000 0 0x2000>;
-               interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 814>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 814>;
-               status = "disabled";
-       };
+               scif0: serial@e6e60000 {
+                       compatible = "renesas,scif-r8a7791",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6e60000 0 64>;
+                       interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
+                              <&dmac1 0x29>, <&dmac1 0x2a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 721>;
+                       status = "disabled";
+               };
 
-       hsusb: usb@e6590000 {
-               compatible = "renesas,usbhs-r8a7791", "renesas,rcar-gen2-usbhs";
-               reg = <0 0xe6590000 0 0x100>;
-               interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 704>;
-               dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
-                      <&usb_dmac1 0>, <&usb_dmac1 1>;
-               dma-names = "ch0", "ch1", "ch2", "ch3";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 704>;
-               renesas,buswait = <4>;
-               phys = <&usb0 1>;
-               phy-names = "usb";
-               status = "disabled";
-       };
+               scif1: serial@e6e68000 {
+                       compatible = "renesas,scif-r8a7791",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6e68000 0 64>;
+                       interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
+                              <&dmac1 0x2d>, <&dmac1 0x2e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 720>;
+                       status = "disabled";
+               };
 
-       usbphy: usb-phy@e6590100 {
-               compatible = "renesas,usb-phy-r8a7791",
-                            "renesas,rcar-gen2-usb-phy";
-               reg = <0 0xe6590100 0 0x100>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               clocks = <&cpg CPG_MOD 704>;
-               clock-names = "usbhs";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 704>;
-               status = "disabled";
+               scif2: serial@e6e58000 {
+                       compatible = "renesas,scif-r8a7791",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6e58000 0 64>;
+                       interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
+                              <&dmac1 0x2b>, <&dmac1 0x2c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 719>;
+                       status = "disabled";
+               };
 
-               usb0: usb-channel@0 {
-                       reg = <0>;
-                       #phy-cells = <1>;
+               scif3: serial@e6ea8000 {
+                       compatible = "renesas,scif-r8a7791",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6ea8000 0 64>;
+                       interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
+                              <&dmac1 0x2f>, <&dmac1 0x30>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 718>;
+                       status = "disabled";
                };
-               usb2: usb-channel@2 {
-                       reg = <2>;
-                       #phy-cells = <1>;
+
+               scif4: serial@e6ee0000 {
+                       compatible = "renesas,scif-r8a7791",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6ee0000 0 64>;
+                       interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
+                              <&dmac1 0xfb>, <&dmac1 0xfc>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 715>;
+                       status = "disabled";
                };
-       };
 
-       vin0: video@e6ef0000 {
-               compatible = "renesas,vin-r8a7791", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef0000 0 0x1000>;
-               interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 811>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 811>;
-               status = "disabled";
-       };
+               scif5: serial@e6ee8000 {
+                       compatible = "renesas,scif-r8a7791",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6ee8000 0 64>;
+                       interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
+                              <&dmac1 0xfd>, <&dmac1 0xfe>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 714>;
+                       status = "disabled";
+               };
 
-       vin1: video@e6ef1000 {
-               compatible = "renesas,vin-r8a7791", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef1000 0 0x1000>;
-               interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 810>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 810>;
-               status = "disabled";
-       };
+               hscif0: serial@e62c0000 {
+                       compatible = "renesas,hscif-r8a7791",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62c0000 0 96>;
+                       interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
+                              <&dmac1 0x39>, <&dmac1 0x3a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 717>;
+                       status = "disabled";
+               };
 
-       vin2: video@e6ef2000 {
-               compatible = "renesas,vin-r8a7791", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef2000 0 0x1000>;
-               interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 809>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 809>;
-               status = "disabled";
-       };
+               hscif1: serial@e62c8000 {
+                       compatible = "renesas,hscif-r8a7791",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62c8000 0 96>;
+                       interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
+                              <&dmac1 0x4d>, <&dmac1 0x4e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 716>;
+                       status = "disabled";
+               };
 
-       vsp@fe928000 {
-               compatible = "renesas,vsp1";
-               reg = <0 0xfe928000 0 0x8000>;
-               interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 131>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 131>;
-       };
+               hscif2: serial@e62d0000 {
+                       compatible = "renesas,hscif-r8a7791",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62d0000 0 96>;
+                       interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
+                              <&dmac1 0x3b>, <&dmac1 0x3c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 713>;
+                       status = "disabled";
+               };
 
-       vsp@fe930000 {
-               compatible = "renesas,vsp1";
-               reg = <0 0xfe930000 0 0x8000>;
-               interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 128>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 128>;
-       };
+               msiof0: spi@e6e20000 {
+                       compatible = "renesas,msiof-r8a7791",
+                                    "renesas,rcar-gen2-msiof";
+                       reg = <0 0xe6e20000 0 0x0064>;
+                       interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 000>;
+                       dmas = <&dmac0 0x51>, <&dmac0 0x52>,
+                              <&dmac1 0x51>, <&dmac1 0x52>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 0>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       vsp@fe938000 {
-               compatible = "renesas,vsp1";
-               reg = <0 0xfe938000 0 0x8000>;
-               interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 127>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 127>;
-       };
+               msiof1: spi@e6e10000 {
+                       compatible = "renesas,msiof-r8a7791",
+                                    "renesas,rcar-gen2-msiof";
+                       reg = <0 0xe6e10000 0 0x0064>;
+                       interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 208>;
+                       dmas = <&dmac0 0x55>, <&dmac0 0x56>,
+                              <&dmac1 0x55>, <&dmac1 0x56>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 208>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       du: display@feb00000 {
-               compatible = "renesas,du-r8a7791";
-               reg = <0 0xfeb00000 0 0x40000>,
-                     <0 0xfeb90000 0 0x1c>;
-               reg-names = "du", "lvds.0";
-               interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 724>,
-                        <&cpg CPG_MOD 723>,
-                        <&cpg CPG_MOD 726>;
-               clock-names = "du.0", "du.1", "lvds.0";
-               status = "disabled";
-
-               ports {
+               msiof2: spi@e6e00000 {
+                       compatible = "renesas,msiof-r8a7791",
+                                    "renesas,rcar-gen2-msiof";
+                       reg = <0 0xe6e00000 0 0x0064>;
+                       interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 205>;
+                       dmas = <&dmac0 0x41>, <&dmac0 0x42>,
+                              <&dmac1 0x41>, <&dmac1 0x42>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 205>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       status = "disabled";
+               };
 
-                       port@0 {
-                               reg = <0>;
-                               du_out_rgb: endpoint {
-                               };
-                       };
-                       port@1 {
-                               reg = <1>;
-                               du_out_lvds0: endpoint {
-                               };
-                       };
+               adc: adc@e6e54000 {
+                       compatible = "renesas,r8a7791-gyroadc",
+                                    "renesas,rcar-gyroadc";
+                       reg = <0 0xe6e54000 0 64>;
+                       clocks = <&cpg CPG_MOD 901>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 901>;
+                       status = "disabled";
                };
-       };
 
-       can0: can@e6e80000 {
-               compatible = "renesas,can-r8a7791", "renesas,rcar-gen2-can";
-               reg = <0 0xe6e80000 0 0x1000>;
-               interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7791_CLK_RCAN>,
-                        <&can_clk>;
-               clock-names = "clkp1", "clkp2", "can_clk";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 916>;
-               status = "disabled";
-       };
+               can0: can@e6e80000 {
+                       compatible = "renesas,can-r8a7791",
+                                    "renesas,rcar-gen2-can";
+                       reg = <0 0xe6e80000 0 0x1000>;
+                       interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 916>,
+                                <&cpg CPG_CORE R8A7791_CLK_RCAN>, <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 916>;
+                       status = "disabled";
+               };
 
-       can1: can@e6e88000 {
-               compatible = "renesas,can-r8a7791", "renesas,rcar-gen2-can";
-               reg = <0 0xe6e88000 0 0x1000>;
-               interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7791_CLK_RCAN>,
-                        <&can_clk>;
-               clock-names = "clkp1", "clkp2", "can_clk";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 915>;
-               status = "disabled";
-       };
+               can1: can@e6e88000 {
+                       compatible = "renesas,can-r8a7791",
+                                    "renesas,rcar-gen2-can";
+                       reg = <0 0xe6e88000 0 0x1000>;
+                       interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 915>,
+                                <&cpg CPG_CORE R8A7791_CLK_RCAN>, <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 915>;
+                       status = "disabled";
+               };
 
-       jpu: jpeg-codec@fe980000 {
-               compatible = "renesas,jpu-r8a7791", "renesas,rcar-gen2-jpu";
-               reg = <0 0xfe980000 0 0x10300>;
-               interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 106>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 106>;
-       };
+               vin0: video@e6ef0000 {
+                       compatible = "renesas,vin-r8a7791",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef0000 0 0x1000>;
+                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 811>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 811>;
+                       status = "disabled";
+               };
 
-       /* External root clock */
-       extal_clk: extal {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+               vin1: video@e6ef1000 {
+                       compatible = "renesas,vin-r8a7791",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef1000 0 0x1000>;
+                       interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 810>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 810>;
+                       status = "disabled";
+               };
 
-       /*
-        * The external audio clocks are configured as 0 Hz fixed frequency
-        * clocks by default.
-        * Boards that provide audio clocks should override them.
-        */
-       audio_clk_a: audio_clk_a {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
-       audio_clk_b: audio_clk_b {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
-       audio_clk_c: audio_clk_c {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
+               vin2: video@e6ef2000 {
+                       compatible = "renesas,vin-r8a7791",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef2000 0 0x1000>;
+                       interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 809>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 809>;
+                       status = "disabled";
+               };
 
-       /* External PCIe clock - can be overridden by the board */
-       pcie_bus_clk: pcie_bus {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
+               rcar_sound: sound@ec500000 {
+                       /*
+                        * #sound-dai-cells is required
+                        *
+                        * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
+                        * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
+                        */
+                       compatible = "renesas,rcar_sound-r8a7791",
+                                    "renesas,rcar_sound-gen2";
+                       reg = <0 0xec500000 0 0x1000>, /* SCU */
+                             <0 0xec5a0000 0 0x100>,  /* ADG */
+                             <0 0xec540000 0 0x1000>, /* SSIU */
+                             <0 0xec541000 0 0x280>,  /* SSI */
+                             <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
+                       reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+
+                       clocks = <&cpg CPG_MOD 1005>,
+                                <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
+                                <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
+                                <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
+                                <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
+                                <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
+                                <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
+                                <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
+                                <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
+                                <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
+                                <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
+                                <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
+                                <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
+                                <&cpg CPG_CORE R8A7791_CLK_M2>;
+                       clock-names = "ssi-all",
+                                     "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                     "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                     "ssi.1", "ssi.0", "src.9", "src.8",
+                                     "src.7", "src.6", "src.5", "src.4",
+                                     "src.3", "src.2", "src.1", "src.0",
+                                     "ctu.0", "ctu.1",
+                                     "mix.0", "mix.1",
+                                     "dvc.0", "dvc.1",
+                                     "clk_a", "clk_b", "clk_c", "clk_i";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 1005>,
+                                <&cpg 1006>, <&cpg 1007>,
+                                <&cpg 1008>, <&cpg 1009>,
+                                <&cpg 1010>, <&cpg 1011>,
+                                <&cpg 1012>, <&cpg 1013>,
+                                <&cpg 1014>, <&cpg 1015>;
+                       reset-names = "ssi-all",
+                                     "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                     "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                     "ssi.1", "ssi.0";
+
+                       status = "disabled";
+
+                       rcar_sound,dvc {
+                               dvc0: dvc-0 {
+                                       dmas = <&audma1 0xbc>;
+                                       dma-names = "tx";
+                               };
+                               dvc1: dvc-1 {
+                                       dmas = <&audma1 0xbe>;
+                                       dma-names = "tx";
+                               };
+                       };
 
-       /* External SCIF clock */
-       scif_clk: scif {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+                       rcar_sound,mix {
+                               mix0: mix-0 { };
+                               mix1: mix-1 { };
+                       };
 
-       /* External USB clock - can be overridden by the board */
-       usb_extal_clk: usb_extal {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <48000000>;
-       };
+                       rcar_sound,ctu {
+                               ctu00: ctu-0 { };
+                               ctu01: ctu-1 { };
+                               ctu02: ctu-2 { };
+                               ctu03: ctu-3 { };
+                               ctu10: ctu-4 { };
+                               ctu11: ctu-5 { };
+                               ctu12: ctu-6 { };
+                               ctu13: ctu-7 { };
+                       };
 
-       /* External CAN clock */
-       can_clk: can {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+                       rcar_sound,src {
+                               src0: src-0 {
+                                       interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x85>, <&audma1 0x9a>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src1: src-1 {
+                                       interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x87>, <&audma1 0x9c>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src2: src-2 {
+                                       interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x89>, <&audma1 0x9e>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src3: src-3 {
+                                       interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8b>, <&audma1 0xa0>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src4: src-4 {
+                                       interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8d>, <&audma1 0xb0>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src5: src-5 {
+                                       interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8f>, <&audma1 0xb2>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src6: src-6 {
+                                       interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x91>, <&audma1 0xb4>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src7: src-7 {
+                                       interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x93>, <&audma1 0xb6>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src8: src-8 {
+                                       interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x95>, <&audma1 0xb8>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src9: src-9 {
+                                       interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x97>, <&audma1 0xba>;
+                                       dma-names = "rx", "tx";
+                               };
+                       };
 
-       cpg: clock-controller@e6150000 {
-               compatible = "renesas,r8a7791-cpg-mssr";
-               reg = <0 0xe6150000 0 0x1000>;
-               clocks = <&extal_clk>, <&usb_extal_clk>;
-               clock-names = "extal", "usb_extal";
-               #clock-cells = <2>;
-               #power-domain-cells = <0>;
-               #reset-cells = <1>;
-       };
+                       rcar_sound,ssi {
+                               ssi0: ssi-0 {
+                                       interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x01>, <&audma1 0x02>,
+                                              <&audma0 0x15>, <&audma1 0x16>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi1: ssi-1 {
+                                        interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x03>, <&audma1 0x04>,
+                                              <&audma0 0x49>, <&audma1 0x4a>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi2: ssi-2 {
+                                       interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x05>, <&audma1 0x06>,
+                                              <&audma0 0x63>, <&audma1 0x64>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi3: ssi-3 {
+                                       interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x07>, <&audma1 0x08>,
+                                              <&audma0 0x6f>, <&audma1 0x70>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi4: ssi-4 {
+                                       interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x09>, <&audma1 0x0a>,
+                                              <&audma0 0x71>, <&audma1 0x72>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi5: ssi-5 {
+                                       interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0b>, <&audma1 0x0c>,
+                                              <&audma0 0x73>, <&audma1 0x74>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi6: ssi-6 {
+                                       interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0d>, <&audma1 0x0e>,
+                                              <&audma0 0x75>, <&audma1 0x76>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi7: ssi-7 {
+                                       interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0f>, <&audma1 0x10>,
+                                              <&audma0 0x79>, <&audma1 0x7a>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi8: ssi-8 {
+                                       interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x11>, <&audma1 0x12>,
+                                              <&audma0 0x7b>, <&audma1 0x7c>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi9: ssi-9 {
+                                       interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x13>, <&audma1 0x14>,
+                                              <&audma0 0x7d>, <&audma1 0x7e>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                       };
+               };
 
-       rst: reset-controller@e6160000 {
-               compatible = "renesas,r8a7791-rst";
-               reg = <0 0xe6160000 0 0x0100>;
-       };
+               audma0: dma-controller@ec700000 {
+                       compatible = "renesas,dmac-r8a7791",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xec700000 0 0x10000>;
+                       interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12";
+                       clocks = <&cpg CPG_MOD 502>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 502>;
+                       #dma-cells = <1>;
+                       dma-channels = <13>;
+               };
 
-       prr: chipid@ff000044 {
-               compatible = "renesas,prr";
-               reg = <0 0xff000044 0 4>;
-       };
+               audma1: dma-controller@ec720000 {
+                       compatible = "renesas,dmac-r8a7791",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xec720000 0 0x10000>;
+                       interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12";
+                       clocks = <&cpg CPG_MOD 501>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 501>;
+                       #dma-cells = <1>;
+                       dma-channels = <13>;
+               };
 
-       sysc: system-controller@e6180000 {
-               compatible = "renesas,r8a7791-sysc";
-               reg = <0 0xe6180000 0 0x0200>;
-               #power-domain-cells = <1>;
-       };
+               xhci: usb@ee000000 {
+                       compatible = "renesas,xhci-r8a7791",
+                                    "renesas,rcar-gen2-xhci";
+                       reg = <0 0xee000000 0 0xc00>;
+                       interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 328>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 328>;
+                       phys = <&usb2 1>;
+                       phy-names = "usb";
+                       status = "disabled";
+               };
 
-       qspi: spi@e6b10000 {
-               compatible = "renesas,qspi-r8a7791", "renesas,qspi";
-               reg = <0 0xe6b10000 0 0x2c>;
-               interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 917>;
-               dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                      <&dmac1 0x17>, <&dmac1 0x18>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 917>;
-               num-cs = <1>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               pci0: pci@ee090000 {
+                       compatible = "renesas,pci-r8a7791",
+                                    "renesas,pci-rcar-gen2";
+                       device_type = "pci";
+                       reg = <0 0xee090000 0 0xc00>,
+                             <0 0xee080000 0 0x1100>;
+                       interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 703>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
+                       status = "disabled";
+
+                       bus-range = <0 0>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                       interrupt-map-mask = <0xff00 0 0 0x7>;
+                       interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                        0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                        0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+
+                       usb@1,0 {
+                               reg = <0x800 0 0 0 0>;
+                               phys = <&usb0 0>;
+                               phy-names = "usb";
+                       };
 
-       msiof0: spi@e6e20000 {
-               compatible = "renesas,msiof-r8a7791",
-                            "renesas,rcar-gen2-msiof";
-               reg = <0 0xe6e20000 0 0x0064>;
-               interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 000>;
-               dmas = <&dmac0 0x51>, <&dmac0 0x52>,
-                      <&dmac1 0x51>, <&dmac1 0x52>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+                       usb@2,0 {
+                               reg = <0x1000 0 0 0 0>;
+                               phys = <&usb0 0>;
+                               phy-names = "usb";
+                       };
+               };
 
-       msiof1: spi@e6e10000 {
-               compatible = "renesas,msiof-r8a7791",
-                            "renesas,rcar-gen2-msiof";
-               reg = <0 0xe6e10000 0 0x0064>;
-               interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 208>;
-               dmas = <&dmac0 0x55>, <&dmac0 0x56>,
-                      <&dmac1 0x55>, <&dmac1 0x56>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 208>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               pci1: pci@ee0d0000 {
+                       compatible = "renesas,pci-r8a7791",
+                                    "renesas,pci-rcar-gen2";
+                       device_type = "pci";
+                       reg = <0 0xee0d0000 0 0xc00>,
+                             <0 0xee0c0000 0 0x1100>;
+                       interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 703>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
+                       status = "disabled";
+
+                       bus-range = <1 1>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                       interrupt-map-mask = <0xff00 0 0 0x7>;
+                       interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                        0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                        0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+
+                       usb@1,0 {
+                               reg = <0x10800 0 0 0 0>;
+                               phys = <&usb2 0>;
+                               phy-names = "usb";
+                       };
 
-       msiof2: spi@e6e00000 {
-               compatible = "renesas,msiof-r8a7791",
-                            "renesas,rcar-gen2-msiof";
-               reg = <0 0xe6e00000 0 0x0064>;
-               interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 205>;
-               dmas = <&dmac0 0x41>, <&dmac0 0x42>,
-                      <&dmac1 0x41>, <&dmac1 0x42>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 205>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+                       usb@2,0 {
+                               reg = <0x11000 0 0 0 0>;
+                               phys = <&usb2 0>;
+                               phy-names = "usb";
+                       };
+               };
 
-       xhci: usb@ee000000 {
-               compatible = "renesas,xhci-r8a7791", "renesas,rcar-gen2-xhci";
-               reg = <0 0xee000000 0 0xc00>;
-               interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 328>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 328>;
-               phys = <&usb2 1>;
-               phy-names = "usb";
-               status = "disabled";
-       };
+               sdhi0: sd@ee100000 {
+                       compatible = "renesas,sdhi-r8a7791",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee100000 0 0x328>;
+                       interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 314>;
+                       dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                              <&dmac1 0xcd>, <&dmac1 0xce>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <195000000>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 314>;
+                       status = "disabled";
+               };
 
-       pci0: pci@ee090000 {
-               compatible = "renesas,pci-r8a7791", "renesas,pci-rcar-gen2";
-               device_type = "pci";
-               reg = <0 0xee090000 0 0xc00>,
-                     <0 0xee080000 0 0x1100>;
-               interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 703>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 703>;
-               status = "disabled";
-
-               bus-range = <0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               #interrupt-cells = <1>;
-               ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
-               interrupt-map-mask = <0xff00 0 0 0x7>;
-               interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-
-               usb@1,0 {
-                       reg = <0x800 0 0 0 0>;
-                       phys = <&usb0 0>;
-                       phy-names = "usb";
+               sdhi1: sd@ee140000 {
+                       compatible = "renesas,sdhi-r8a7791",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee140000 0 0x100>;
+                       interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 312>;
+                       dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                              <&dmac1 0xc1>, <&dmac1 0xc2>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <97500000>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 312>;
+                       status = "disabled";
                };
 
-               usb@2,0 {
-                       reg = <0x1000 0 0 0 0>;
-                       phys = <&usb0 0>;
-                       phy-names = "usb";
+               sdhi2: sd@ee160000 {
+                       compatible = "renesas,sdhi-r8a7791",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee160000 0 0x100>;
+                       interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 311>;
+                       dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                              <&dmac1 0xd3>, <&dmac1 0xd4>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <97500000>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 311>;
+                       status = "disabled";
                };
-       };
 
-       pci1: pci@ee0d0000 {
-               compatible = "renesas,pci-r8a7791", "renesas,pci-rcar-gen2";
-               device_type = "pci";
-               reg = <0 0xee0d0000 0 0xc00>,
-                     <0 0xee0c0000 0 0x1100>;
-               interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 703>;
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 703>;
-               status = "disabled";
-
-               bus-range = <1 1>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               #interrupt-cells = <1>;
-               ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
-               interrupt-map-mask = <0xff00 0 0 0x7>;
-               interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-
-               usb@1,0 {
-                       reg = <0x10800 0 0 0 0>;
-                       phys = <&usb2 0>;
-                       phy-names = "usb";
+               mmcif0: mmc@ee200000 {
+                       compatible = "renesas,mmcif-r8a7791",
+                                    "renesas,sh-mmcif";
+                       reg = <0 0xee200000 0 0x80>;
+                       interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 315>;
+                       dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                              <&dmac1 0xd1>, <&dmac1 0xd2>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 315>;
+                       reg-io-width = <4>;
+                       status = "disabled";
+                       max-frequency = <97500000>;
                };
 
-               usb@2,0 {
-                       reg = <0x11000 0 0 0 0>;
-                       phys = <&usb2 0>;
-                       phy-names = "usb";
+               sata0: sata@ee300000 {
+                       compatible = "renesas,sata-r8a7791",
+                                    "renesas,rcar-gen2-sata";
+                       reg = <0 0xee300000 0 0x2000>;
+                       interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 815>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 815>;
+                       status = "disabled";
                };
-       };
 
-       pciec: pcie@fe000000 {
-               compatible = "renesas,pcie-r8a7791", "renesas,pcie-rcar-gen2";
-               reg = <0 0xfe000000 0 0x80000>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               bus-range = <0x00 0xff>;
-               device_type = "pci";
-               ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
-                         0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
-                         0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
-                         0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
-               /* Map all possible DDR as inbound ranges */
-               dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
-                             0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
-               interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-               #interrupt-cells = <1>;
-               interrupt-map-mask = <0 0 0 0>;
-               interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
-               clock-names = "pcie", "pcie_bus";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 319>;
-               status = "disabled";
-       };
+               sata1: sata@ee500000 {
+                       compatible = "renesas,sata-r8a7791",
+                                    "renesas,rcar-gen2-sata";
+                       reg = <0 0xee500000 0 0x2000>;
+                       interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 814>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 814>;
+                       status = "disabled";
+               };
 
-       ipmmu_sy0: mmu@e6280000 {
-               compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6280000 0 0x1000>;
-               interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               ether: ethernet@ee700000 {
+                       compatible = "renesas,ether-r8a7791",
+                                    "renesas,rcar-gen2-ether";
+                       reg = <0 0xee700000 0 0x400>;
+                       interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 813>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 813>;
+                       phy-mode = "rmii";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       ipmmu_sy1: mmu@e6290000 {
-               compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6290000 0 0x1000>;
-               interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               gic: interrupt-controller@f1001000 {
+                       compatible = "arm,gic-400";
+                       #interrupt-cells = <3>;
+                       #address-cells = <0>;
+                       interrupt-controller;
+                       reg = <0 0xf1001000 0 0x1000>, <0 0xf1002000 0 0x2000>,
+                             <0 0xf1004000 0 0x2000>, <0 0xf1006000 0 0x2000>;
+                       interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                       clocks = <&cpg CPG_MOD 408>;
+                       clock-names = "clk";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 408>;
+               };
 
-       ipmmu_ds: mmu@e6740000 {
-               compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6740000 0 0x1000>;
-               interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               pciec: pcie@fe000000 {
+                       compatible = "renesas,pcie-r8a7791",
+                                    "renesas,pcie-rcar-gen2";
+                       reg = <0 0xfe000000 0 0x80000>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       bus-range = <0x00 0xff>;
+                       device_type = "pci";
+                       ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+                                 0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+                                 0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+                                 0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+                       /* Map all possible DDR as inbound ranges */
+                       dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+                                     0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
+                       interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0>;
+                       interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
+                       clock-names = "pcie", "pcie_bus";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 319>;
+                       status = "disabled";
+               };
 
-       ipmmu_mp: mmu@ec680000 {
-               compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-               reg = <0 0xec680000 0 0x1000>;
-               interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               vsp@fe928000 {
+                       compatible = "renesas,vsp1";
+                       reg = <0 0xfe928000 0 0x8000>;
+                       interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 131>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 131>;
+               };
 
-       ipmmu_mx: mmu@fe951000 {
-               compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-               reg = <0 0xfe951000 0 0x1000>;
-               interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               vsp@fe930000 {
+                       compatible = "renesas,vsp1";
+                       reg = <0 0xfe930000 0 0x8000>;
+                       interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 128>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 128>;
+               };
 
-       ipmmu_rt: mmu@ffc80000 {
-               compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-               reg = <0 0xffc80000 0 0x1000>;
-               interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               vsp@fe938000 {
+                       compatible = "renesas,vsp1";
+                       reg = <0 0xfe938000 0 0x8000>;
+                       interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 127>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 127>;
+               };
 
-       ipmmu_gp: mmu@e62a0000 {
-               compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-               reg = <0 0xe62a0000 0 0x1000>;
-               interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               jpu: jpeg-codec@fe980000 {
+                       compatible = "renesas,jpu-r8a7791",
+                                    "renesas,rcar-gen2-jpu";
+                       reg = <0 0xfe980000 0 0x10300>;
+                       interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 106>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 106>;
+               };
 
-       rcar_sound: sound@ec500000 {
-               /*
-                * #sound-dai-cells is required
-                *
-                * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
-                * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
-                */
-               compatible =  "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2";
-               reg =   <0 0xec500000 0 0x1000>, /* SCU */
-                       <0 0xec5a0000 0 0x100>,  /* ADG */
-                       <0 0xec540000 0 0x1000>, /* SSIU */
-                       <0 0xec541000 0 0x280>,  /* SSI */
-                       <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
-               reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
-
-               clocks = <&cpg CPG_MOD 1005>,
-                        <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-                        <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
-                        <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
-                        <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
-                        <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
-                        <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
-                        <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
-                        <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
-                        <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
-                        <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
-                        <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                        <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                        <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
-                        <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
-                        <&cpg CPG_CORE R8A7791_CLK_M2>;
-               clock-names = "ssi-all",
-                               "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                               "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
-                               "src.9", "src.8", "src.7", "src.6", "src.5",
-                               "src.4", "src.3", "src.2", "src.1", "src.0",
-                               "ctu.0", "ctu.1",
-                               "mix.0", "mix.1",
-                               "dvc.0", "dvc.1",
-                               "clk_a", "clk_b", "clk_c", "clk_i";
-               power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-               resets = <&cpg 1005>,
-                        <&cpg 1006>, <&cpg 1007>, <&cpg 1008>, <&cpg 1009>,
-                        <&cpg 1010>, <&cpg 1011>, <&cpg 1012>, <&cpg 1013>,
-                        <&cpg 1014>, <&cpg 1015>;
-               reset-names = "ssi-all",
-                             "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                             "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0";
-
-               status = "disabled";
-
-               rcar_sound,dvc {
-                       dvc0: dvc-0 {
-                               dmas = <&audma1 0xbc>;
-                               dma-names = "tx";
+               du: display@feb00000 {
+                       compatible = "renesas,du-r8a7791";
+                       reg = <0 0xfeb00000 0 0x40000>;
+                       interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 724>,
+                                <&cpg CPG_MOD 723>;
+                       clock-names = "du.0", "du.1";
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       du_out_rgb: endpoint {
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       du_out_lvds0: endpoint {
+                                               remote-endpoint = <&lvds0_in>;
+                                       };
+                               };
                        };
-                       dvc1: dvc-1 {
-                               dmas = <&audma1 0xbe>;
-                               dma-names = "tx";
+               };
+
+               lvds0: lvds@feb90000 {
+                       compatible = "renesas,r8a7791-lvds";
+                       reg = <0 0xfeb90000 0 0x1c>;
+                       clocks = <&cpg CPG_MOD 726>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 726>;
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       lvds0_in: endpoint {
+                                               remote-endpoint = <&du_out_lvds0>;
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       lvds0_out: endpoint {
+                                       };
+                               };
                        };
                };
 
-               rcar_sound,mix {
-                       mix0: mix-0 { };
-                       mix1: mix-1 { };
+               prr: chipid@ff000044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xff000044 0 4>;
                };
 
-               rcar_sound,ctu {
-                       ctu00: ctu-0 { };
-                       ctu01: ctu-1 { };
-                       ctu02: ctu-2 { };
-                       ctu03: ctu-3 { };
-                       ctu10: ctu-4 { };
-                       ctu11: ctu-5 { };
-                       ctu12: ctu-6 { };
-                       ctu13: ctu-7 { };
+               cmt0: timer@ffca0000 {
+                       compatible = "renesas,r8a7791-cmt0",
+                                    "renesas,rcar-gen2-cmt0";
+                       reg = <0 0xffca0000 0 0x1004>;
+                       interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 124>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 124>;
+
+                       status = "disabled";
                };
 
-               rcar_sound,src {
-                       src0: src-0 {
-                               interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x85>, <&audma1 0x9a>;
-                               dma-names = "rx", "tx";
-                       };
-                       src1: src-1 {
-                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x87>, <&audma1 0x9c>;
-                               dma-names = "rx", "tx";
-                       };
-                       src2: src-2 {
-                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x89>, <&audma1 0x9e>;
-                               dma-names = "rx", "tx";
-                       };
-                       src3: src-3 {
-                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8b>, <&audma1 0xa0>;
-                               dma-names = "rx", "tx";
-                       };
-                       src4: src-4 {
-                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8d>, <&audma1 0xb0>;
-                               dma-names = "rx", "tx";
-                       };
-                       src5: src-5 {
-                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8f>, <&audma1 0xb2>;
-                               dma-names = "rx", "tx";
-                       };
-                       src6: src-6 {
-                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x91>, <&audma1 0xb4>;
-                               dma-names = "rx", "tx";
-                       };
-                       src7: src-7 {
-                               interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x93>, <&audma1 0xb6>;
-                               dma-names = "rx", "tx";
-                       };
-                       src8: src-8 {
-                               interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x95>, <&audma1 0xb8>;
-                               dma-names = "rx", "tx";
-                       };
-                       src9: src-9 {
-                               interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x97>, <&audma1 0xba>;
-                               dma-names = "rx", "tx";
-                       };
+               cmt1: timer@e6130000 {
+                       compatible = "renesas,r8a7791-cmt1",
+                                    "renesas,rcar-gen2-cmt1";
+                       reg = <0 0xe6130000 0 0x1004>;
+                       interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 329>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 329>;
+
+                       status = "disabled";
                };
+       };
 
-               rcar_sound,ssi {
-                       ssi0: ssi-0 {
-                               interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi1: ssi-1 {
-                                interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi2: ssi-2 {
-                               interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi3: ssi-3 {
-                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi4: ssi-4 {
-                               interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi5: ssi-5 {
-                               interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi6: ssi-6 {
-                               interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi7: ssi-7 {
-                               interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi8: ssi-8 {
-                               interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-                               dma-names = "rx", "tx", "rxu", "txu";
+       thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+
+                       thermal-sensors = <&thermal>;
+
+                       trips {
+                               cpu-crit {
+                                       temperature = <95000>;
+                                       hysteresis = <0>;
+                                       type = "critical";
+                               };
                        };
-                       ssi9: ssi-9 {
-                               interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-                               dma-names = "rx", "tx", "rxu", "txu";
+                       cooling-maps {
                        };
                };
        };
+
+       timer {
+               compatible = "arm,armv7-timer";
+               interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+       };
+
+       /* External USB clock - can be overridden by the board */
+       usb_extal_clk: usb_extal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <48000000>;
+       };
 };
index afadc8fc706b2f3fee8ad542d0b12ebc23f34d9e..8e26dede308b2c252408559f49d1cc246346b4bb 100644 (file)
                vin5 = &vin5;
        };
 
+       /* External CAN clock */
+       can_clk: can {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
                };
        };
 
+       /* External root clock */
+       extal_clk: extal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
+       };
+
+       /* External SCIF clock */
+       scif_clk: scif {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
+       };
+
        soc {
                compatible = "simple-bus";
                interrupt-parent = <&gic>;
                #size-cells = <2>;
                ranges;
 
-               apmu@e6152000 {
-                       compatible = "renesas,r8a7792-apmu", "renesas,apmu";
-                       reg = <0 0xe6152000 0 0x188>;
-                       cpus = <&cpu0 &cpu1>;
-               };
-
-               gic: interrupt-controller@f1001000 {
-                       compatible = "arm,gic-400";
-                       #interrupt-cells = <3>;
-                       interrupt-controller;
-                       reg = <0 0xf1001000 0 0x1000>,
-                             <0 0xf1002000 0 0x2000>,
-                             <0 0xf1004000 0 0x2000>,
-                             <0 0xf1006000 0 0x2000>;
-                       interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
-                                     IRQ_TYPE_LEVEL_HIGH)>;
-                       clocks = <&cpg CPG_MOD 408>;
-                       clock-names = "clk";
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 408>;
-               };
-
-               irqc: interrupt-controller@e61c0000 {
-                       compatible = "renesas,irqc-r8a7792", "renesas,irqc";
-                       #interrupt-cells = <2>;
-                       interrupt-controller;
-                       reg = <0 0xe61c0000 0 0x200>;
-                       interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 407>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 407>;
-               };
-
-               timer {
-                       compatible = "arm,armv7-timer";
-                       interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
-                                     IRQ_TYPE_LEVEL_LOW)>,
-                                    <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |
-                                     IRQ_TYPE_LEVEL_LOW)>,
-                                    <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) |
-                                     IRQ_TYPE_LEVEL_LOW)>,
-                                    <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |
-                                     IRQ_TYPE_LEVEL_LOW)>;
-               };
-
-               rst: reset-controller@e6160000 {
-                       compatible = "renesas,r8a7792-rst";
-                       reg = <0 0xe6160000 0 0x0100>;
-               };
-
-               prr: chipid@ff000044 {
-                       compatible = "renesas,prr";
-                       reg = <0 0xff000044 0 4>;
-               };
-
-               sysc: system-controller@e6180000 {
-                       compatible = "renesas,r8a7792-sysc";
-                       reg = <0 0xe6180000 0 0x0200>;
-                       #power-domain-cells = <1>;
-               };
-
-               pfc: pin-controller@e6060000 {
-                       compatible = "renesas,pfc-r8a7792";
-                       reg = <0 0xe6060000 0 0x144>;
-               };
-
                gpio0: gpio@e6050000 {
                        compatible = "renesas,gpio-r8a7792",
                                     "renesas,rcar-gen2-gpio";
                        resets = <&cpg 913>;
                };
 
+               pfc: pin-controller@e6060000 {
+                       compatible = "renesas,pfc-r8a7792";
+                       reg = <0 0xe6060000 0 0x144>;
+               };
+
+               cpg: clock-controller@e6150000 {
+                       compatible = "renesas,r8a7792-cpg-mssr";
+                       reg = <0 0xe6150000 0 0x1000>;
+                       clocks = <&extal_clk>;
+                       clock-names = "extal";
+                       #clock-cells = <2>;
+                       #power-domain-cells = <0>;
+                       #reset-cells = <1>;
+               };
+
+               apmu@e6152000 {
+                       compatible = "renesas,r8a7792-apmu", "renesas,apmu";
+                       reg = <0 0xe6152000 0 0x188>;
+                       cpus = <&cpu0 &cpu1>;
+               };
+
+               rst: reset-controller@e6160000 {
+                       compatible = "renesas,r8a7792-rst";
+                       reg = <0 0xe6160000 0 0x0100>;
+               };
+
+               sysc: system-controller@e6180000 {
+                       compatible = "renesas,r8a7792-sysc";
+                       reg = <0 0xe6180000 0 0x0200>;
+                       #power-domain-cells = <1>;
+               };
+
+               irqc: interrupt-controller@e61c0000 {
+                       compatible = "renesas,irqc-r8a7792", "renesas,irqc";
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       reg = <0 0xe61c0000 0 0x200>;
+                       interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 407>;
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 407>;
+               };
+
+               icram0: sram@e63a0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63a0000 0 0x12000>;
+               };
+
+               icram1: sram@e63c0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63c0000 0 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0 0xe63c0000 0x1000>;
+
+                       smp-sram@0 {
+                               compatible = "renesas,smp-sram";
+                               reg = <0 0x10>;
+                       };
+               };
+
+               /* I2C doesn't need pinmux */
+               i2c0: i2c@e6508000 {
+                       compatible = "renesas,i2c-r8a7792",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6508000 0 0x40>;
+                       interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 931>;
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 931>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               i2c1: i2c@e6518000 {
+                       compatible = "renesas,i2c-r8a7792",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6518000 0 0x40>;
+                       interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 930>;
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 930>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               i2c2: i2c@e6530000 {
+                       compatible = "renesas,i2c-r8a7792",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6530000 0 0x40>;
+                       interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 929>;
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 929>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               i2c3: i2c@e6540000 {
+                       compatible = "renesas,i2c-r8a7792",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6540000 0 0x40>;
+                       interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 928>;
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 928>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               i2c4: i2c@e6520000 {
+                       compatible = "renesas,i2c-r8a7792",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6520000 0 0x40>;
+                       interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 927>;
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 927>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               i2c5: i2c@e6528000 {
+                       compatible = "renesas,i2c-r8a7792",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6528000 0 0x40>;
+                       interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 925>;
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 925>;
+                       i2c-scl-internal-delay-ns = <110>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
                dmac0: dma-controller@e6700000 {
                        compatible = "renesas,dmac-r8a7792",
                                     "renesas,rcar-dmac";
                        dma-channels = <15>;
                };
 
-               scif0: serial@e6e60000 {
-                       compatible = "renesas,scif-r8a7792",
-                                    "renesas,rcar-gen2-scif", "renesas,scif";
-                       reg = <0 0xe6e60000 0 64>;
-                       interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 721>,
-                                <&cpg CPG_CORE R8A7792_CLK_ZS>, <&scif_clk>;
-                       clock-names = "fck", "brg_int", "scif_clk";
-                       dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
-                              <&dmac1 0x29>, <&dmac1 0x2a>;
-                       dma-names = "tx", "rx", "tx", "rx";
+               avb: ethernet@e6800000 {
+                       compatible = "renesas,etheravb-r8a7792",
+                                    "renesas,etheravb-rcar-gen2";
+                       reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                       interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 812>;
                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 721>;
+                       resets = <&cpg 812>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
-               scif1: serial@e6e68000 {
-                       compatible = "renesas,scif-r8a7792",
-                                    "renesas,rcar-gen2-scif", "renesas,scif";
+               qspi: spi@e6b10000 {
+                       compatible = "renesas,qspi-r8a7792", "renesas,qspi";
+                       reg = <0 0xe6b10000 0 0x2c>;
+                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 917>;
+                       dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                              <&dmac1 0x17>, <&dmac1 0x18>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 917>;
+                       num-cs = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               scif0: serial@e6e60000 {
+                       compatible = "renesas,scif-r8a7792",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6e60000 0 64>;
+                       interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 721>,
+                                <&cpg CPG_CORE R8A7792_CLK_ZS>, <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
+                              <&dmac1 0x29>, <&dmac1 0x2a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 721>;
+                       status = "disabled";
+               };
+
+               scif1: serial@e6e68000 {
+                       compatible = "renesas,scif-r8a7792",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
                        reg = <0 0xe6e68000 0 64>;
                        interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 720>,
                        status = "disabled";
                };
 
-               icram0: sram@e63a0000 {
-                       compatible = "mmio-sram";
-                       reg = <0 0xe63a0000 0 0x12000>;
-               };
-
-               icram1: sram@e63c0000 {
-                       compatible = "mmio-sram";
-                       reg = <0 0xe63c0000 0 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges = <0 0 0xe63c0000 0x1000>;
-
-                       smp-sram@0 {
-                               compatible = "renesas,smp-sram";
-                               reg = <0 0x10>;
-                       };
-               };
-
-               sdhi0: sd@ee100000 {
-                       compatible = "renesas,sdhi-r8a7792";
-                       reg = <0 0xee100000 0 0x328>;
-                       interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
-                       dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                              <&dmac1 0xcd>, <&dmac1 0xce>;
-                       dma-names = "tx", "rx", "tx", "rx";
-                       clocks = <&cpg CPG_MOD 314>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 314>;
-                       status = "disabled";
-               };
-
-               jpu: jpeg-codec@fe980000 {
-                       compatible = "renesas,jpu-r8a7792",
-                                    "renesas,rcar-gen2-jpu";
-                       reg = <0 0xfe980000 0 0x10300>;
-                       interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 106>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 106>;
-               };
-
-               avb: ethernet@e6800000 {
-                       compatible = "renesas,etheravb-r8a7792",
-                                    "renesas,etheravb-rcar-gen2";
-                       reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-                       interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 812>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 812>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               /* I2C doesn't need pinmux */
-               i2c0: i2c@e6508000 {
-                       compatible = "renesas,i2c-r8a7792",
-                                    "renesas,rcar-gen2-i2c";
-                       reg = <0 0xe6508000 0 0x40>;
-                       interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 931>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 931>;
-                       i2c-scl-internal-delay-ns = <6>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               i2c1: i2c@e6518000 {
-                       compatible = "renesas,i2c-r8a7792",
-                                    "renesas,rcar-gen2-i2c";
-                       reg = <0 0xe6518000 0 0x40>;
-                       interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 930>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 930>;
-                       i2c-scl-internal-delay-ns = <6>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               i2c2: i2c@e6530000 {
-                       compatible = "renesas,i2c-r8a7792",
-                                    "renesas,rcar-gen2-i2c";
-                       reg = <0 0xe6530000 0 0x40>;
-                       interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 929>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 929>;
-                       i2c-scl-internal-delay-ns = <6>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               i2c3: i2c@e6540000 {
-                       compatible = "renesas,i2c-r8a7792",
-                                    "renesas,rcar-gen2-i2c";
-                       reg = <0 0xe6540000 0 0x40>;
-                       interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 928>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 928>;
-                       i2c-scl-internal-delay-ns = <6>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               i2c4: i2c@e6520000 {
-                       compatible = "renesas,i2c-r8a7792",
-                                    "renesas,rcar-gen2-i2c";
-                       reg = <0 0xe6520000 0 0x40>;
-                       interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 927>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 927>;
-                       i2c-scl-internal-delay-ns = <6>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               i2c5: i2c@e6528000 {
-                       compatible = "renesas,i2c-r8a7792",
-                                    "renesas,rcar-gen2-i2c";
-                       reg = <0 0xe6528000 0 0x40>;
-                       interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 925>;
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 925>;
-                       i2c-scl-internal-delay-ns = <110>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               qspi: spi@e6b10000 {
-                       compatible = "renesas,qspi-r8a7792", "renesas,qspi";
-                       reg = <0 0xe6b10000 0 0x2c>;
-                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 917>;
-                       dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                              <&dmac1 0x17>, <&dmac1 0x18>;
-                       dma-names = "tx", "rx", "tx", "rx";
-                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                       resets = <&cpg 917>;
-                       num-cs = <1>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
                msiof0: spi@e6e20000 {
                        compatible = "renesas,msiof-r8a7792",
                                     "renesas,rcar-gen2-msiof";
                        status = "disabled";
                };
 
-               du: display@feb00000 {
-                       compatible = "renesas,du-r8a7792";
-                       reg = <0 0xfeb00000 0 0x40000>;
-                       reg-names = "du";
-                       interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 724>,
-                                <&cpg CPG_MOD 723>;
-                       clock-names = "du.0", "du.1";
-                       status = "disabled";
-
-                       ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               port@0 {
-                                       reg = <0>;
-                                       du_out_rgb0: endpoint {
-                                       };
-                               };
-                               port@1 {
-                                       reg = <1>;
-                                       du_out_rgb1: endpoint {
-                                       };
-                               };
-                       };
-               };
-
                can0: can@e6e80000 {
                        compatible = "renesas,can-r8a7792",
                                     "renesas,rcar-gen2-can";
                        status = "disabled";
                };
 
+               sdhi0: sd@ee100000 {
+                       compatible = "renesas,sdhi-r8a7792",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee100000 0 0x328>;
+                       interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
+                       dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                              <&dmac1 0xcd>, <&dmac1 0xce>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       clocks = <&cpg CPG_MOD 314>;
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 314>;
+                       status = "disabled";
+               };
+
+               gic: interrupt-controller@f1001000 {
+                       compatible = "arm,gic-400";
+                       #interrupt-cells = <3>;
+                       interrupt-controller;
+                       reg = <0 0xf1001000 0 0x1000>,
+                             <0 0xf1002000 0 0x2000>,
+                             <0 0xf1004000 0 0x2000>,
+                             <0 0xf1006000 0 0x2000>;
+                       interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
+                                     IRQ_TYPE_LEVEL_HIGH)>;
+                       clocks = <&cpg CPG_MOD 408>;
+                       clock-names = "clk";
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 408>;
+               };
+
                vsp@fe928000 {
                        compatible = "renesas,vsp1";
                        reg = <0 0xfe928000 0 0x8000>;
                        resets = <&cpg 127>;
                };
 
-               cpg: clock-controller@e6150000 {
-                       compatible = "renesas,r8a7792-cpg-mssr";
-                       reg = <0 0xe6150000 0 0x1000>;
-                       clocks = <&extal_clk>;
-                       clock-names = "extal";
-                       #clock-cells = <2>;
-                       #power-domain-cells = <0>;
-                       #reset-cells = <1>;
+               jpu: jpeg-codec@fe980000 {
+                       compatible = "renesas,jpu-r8a7792",
+                                    "renesas,rcar-gen2-jpu";
+                       reg = <0 0xfe980000 0 0x10300>;
+                       interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 106>;
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                       resets = <&cpg 106>;
                };
-       };
 
-       /* External root clock */
-       extal_clk: extal {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+               du: display@feb00000 {
+                       compatible = "renesas,du-r8a7792";
+                       reg = <0 0xfeb00000 0 0x40000>;
+                       reg-names = "du";
+                       interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 724>,
+                                <&cpg CPG_MOD 723>;
+                       clock-names = "du.0", "du.1";
+                       status = "disabled";
 
-       /* External SCIF clock */
-       scif_clk: scif {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       du_out_rgb0: endpoint {
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       du_out_rgb1: endpoint {
+                                       };
+                               };
+                       };
+               };
+
+               prr: chipid@ff000044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xff000044 0 4>;
+               };
        };
 
-       /* External CAN clock */
-       can_clk: can {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
+       timer {
+               compatible = "arm,armv7-timer";
+               interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
        };
 };
index 068bd291af849493c64fc2017b86f1ea88c20eed..9c893458ce7d2179cc84f6ea086e0a951741f150 100644 (file)
        aliases {
                serial0 = &scif0;
                serial1 = &scif1;
+               i2c9 = &gpioi2c2;
+               i2c10 = &gpioi2c4;
+               i2c11 = &i2chdmi;
+               i2c12 = &i2cexio4;
        };
 
        chosen {
                #clock-cells = <0>;
                clock-frequency = <148500000>;
        };
+
+       gpioi2c2: i2c-9 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "i2c-gpio";
+               status = "disabled";
+               scl-gpios = <&gpio2 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio2 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               i2c-gpio,delay-us = <5>;
+       };
+
+       gpioi2c4: i2c-10 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "i2c-gpio";
+               status = "disabled";
+               scl-gpios = <&gpio7 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio7 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               i2c-gpio,delay-us = <5>;
+       };
+
+       /*
+        * A fallback to GPIO is provided for I2C2.
+        */
+       i2chdmi: i2c-11 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&i2c2>, <&gpioi2c2>;
+               i2c-bus-name = "i2c-hdmi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ak4643: codec@12 {
+                       compatible = "asahi-kasei,ak4643";
+                       #sound-dai-cells = <0>;
+                       reg = <0x12>;
+               };
+
+               composite-in@20 {
+                       compatible = "adi,adv7180cp";
+                       reg = <0x20>;
+                       remote = <&vin1>;
+
+                       port {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       adv7180_in: endpoint {
+                                               remote-endpoint = <&composite_con_in>;
+                                       };
+                               };
+
+                               port@3 {
+                                       reg = <3>;
+                                       adv7180_out: endpoint {
+                                               bus-width = <8>;
+                                               remote-endpoint = <&vin1ep>;
+                                       };
+                               };
+                       };
+               };
+
+               hdmi@39 {
+                       compatible = "adi,adv7511w";
+                       reg = <0x39>;
+                       interrupt-parent = <&gpio3>;
+                       interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+
+                       adi,input-depth = <8>;
+                       adi,input-colorspace = "rgb";
+                       adi,input-clock = "1x";
+                       adi,input-style = <1>;
+                       adi,input-justification = "evenly";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       adv7511_in: endpoint {
+                                               remote-endpoint = <&du_out_rgb>;
+                                       };
+                               };
+
+                               port@1 {
+                                       reg = <1>;
+                                       adv7511_out: endpoint {
+                                               remote-endpoint = <&hdmi_con_out>;
+                                       };
+                               };
+                       };
+               };
+
+               hdmi-in@4c {
+                       compatible = "adi,adv7612";
+                       reg = <0x4c>;
+                       interrupt-parent = <&gpio4>;
+                       interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+                       default-input = <0>;
+
+                       port {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       adv7612_in: endpoint {
+                                               remote-endpoint = <&hdmi_con_in>;
+                                       };
+                               };
+
+                               port@2 {
+                                       reg = <2>;
+                                       adv7612_out: endpoint {
+                                               remote-endpoint = <&vin0ep2>;
+                                       };
+                               };
+                       };
+               };
+
+               eeprom@50 {
+                       compatible = "renesas,r1ex24002", "atmel,24c02";
+                       reg = <0x50>;
+                       pagesize = <16>;
+               };
+       };
+
+       /*
+        * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
+        * A fallback to GPIO is provided.
+        */
+       i2cexio4: i2c-12 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&i2c4>, <&gpioi2c4>;
+               i2c-bus-name = "i2c-exio4";
+               #address-cells = <1>;
+               #size-cells = <0>;
+       };
 };
 
 &du {
        pinctrl-names = "default";
        status = "okay";
 
-       clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 726>,
+       clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
                 <&x13_clk>, <&x2_clk>;
-       clock-names = "du.0", "du.1", "lvds.0",
-                     "dclkin.0", "dclkin.1";
+       clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
 
        ports {
                port@0 {
                                remote-endpoint = <&adv7511_in>;
                        };
                };
+       };
+};
+
+&lvds0 {
+       ports {
                port@1 {
                        lvds_connector: endpoint {
                        };
                function = "i2c2";
        };
 
+       i2c4_pins: i2c4 {
+               groups = "i2c4_c";
+               function = "i2c4";
+       };
+
        du_pins: du {
                groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
                function = "du";
 
 &i2c2 {
        pinctrl-0 = <&i2c2_pins>;
-       pinctrl-names = "default";
+       pinctrl-names = "i2c-hdmi";
 
        status = "okay";
        clock-frequency = <100000>;
 
-       ak4643: codec@12 {
-               compatible = "asahi-kasei,ak4643";
-               #sound-dai-cells = <0>;
-               reg = <0x12>;
-       };
-
-       composite-in@20 {
-               compatible = "adi,adv7180cp";
-               reg = <0x20>;
-               remote = <&vin1>;
-
-               port {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               adv7180_in: endpoint {
-                                       remote-endpoint = <&composite_con_in>;
-                               };
-                       };
-
-                       port@3 {
-                               reg = <3>;
-                               adv7180_out: endpoint {
-                                       bus-width = <8>;
-                                       remote-endpoint = <&vin1ep>;
-                               };
-                       };
-               };
-       };
-
-       hdmi@39 {
-               compatible = "adi,adv7511w";
-               reg = <0x39>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
-
-               adi,input-depth = <8>;
-               adi,input-colorspace = "rgb";
-               adi,input-clock = "1x";
-               adi,input-style = <1>;
-               adi,input-justification = "evenly";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               adv7511_in: endpoint {
-                                       remote-endpoint = <&du_out_rgb>;
-                               };
-                       };
-
-                       port@1 {
-                               reg = <1>;
-                               adv7511_out: endpoint {
-                                       remote-endpoint = <&hdmi_con_out>;
-                               };
-                       };
-               };
-       };
-
-       hdmi-in@4c {
-               compatible = "adi,adv7612";
-               reg = <0x4c>;
-               interrupt-parent = <&gpio4>;
-               interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-               default-input = <0>;
-
-               port {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               adv7612_in: endpoint {
-                                       remote-endpoint = <&hdmi_con_in>;
-                               };
-                       };
-
-                       port@2 {
-                               reg = <2>;
-                               adv7612_out: endpoint {
-                                       remote-endpoint = <&vin0ep2>;
-                               };
-                       };
-               };
-       };
-
-       eeprom@50 {
-               compatible = "renesas,r1ex24002", "atmel,24c02";
-               reg = <0x50>;
-               pagesize = <16>;
-       };
 };
 
 &i2c6 {
        };
 };
 
+&i2c4 {
+       pinctrl-0 = <&i2c4_pins>;
+       pinctrl-names = "i2c-exio4";
+};
+
 &rcar_sound {
        pinctrl-0 = <&sound_pins &sound_clk_pins>;
        pinctrl-names = "default";
index 0fdbb002d7cbfc7c4ce93fdc9732ca220d636fa8..8201b4e8d1df4d24edb8221196621ca7282702a1 100644 (file)
@@ -12,7 +12,6 @@
 
 / {
        compatible = "renesas,r8a7793";
-       interrupt-parent = <&gic>;
        #address-cells = <2>;
        #size-cells = <2>;
 
                spi0 = &qspi;
        };
 
+       /*
+        * The external audio clocks are configured as 0 Hz fixed frequency
+        * clocks by default.
+        * Boards that provide audio clocks should override them.
+        */
+       audio_clk_a: audio_clk_a {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+       audio_clk_b: audio_clk_b {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+       audio_clk_c: audio_clk_c {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+
+       /* External CAN clock */
+       can_clk: can {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
                };
        };
 
-       apmu@e6152000 {
-               compatible = "renesas,r8a7793-apmu", "renesas,apmu";
-               reg = <0 0xe6152000 0 0x188>;
-               cpus = <&cpu0 &cpu1>;
+       /* External root clock */
+       extal_clk: extal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
        };
 
-       thermal-zones {
-               cpu_thermal: cpu-thermal {
-                       polling-delay-passive   = <0>;
-                       polling-delay           = <0>;
-
-                       thermal-sensors = <&thermal>;
-
-                       trips {
-                               cpu-crit {
-                                       temperature     = <115000>;
-                                       hysteresis      = <0>;
-                                       type            = "critical";
-                               };
-                       };
-                       cooling-maps {
-                       };
-               };
+       /* External SCIF clock */
+       scif_clk: scif {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
        };
 
-       gic: interrupt-controller@f1001000 {
-               compatible = "arm,gic-400";
-               #interrupt-cells = <3>;
-               #address-cells = <0>;
-               interrupt-controller;
-               reg = <0 0xf1001000 0 0x1000>,
-                       <0 0xf1002000 0 0x2000>,
-                       <0 0xf1004000 0 0x2000>,
-                       <0 0xf1006000 0 0x2000>;
-               interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
-               clocks = <&cpg CPG_MOD 408>;
-               clock-names = "clk";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 408>;
-       };
+       soc {
+               compatible = "simple-bus";
+               interrupt-parent = <&gic>;
+
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               gpio0: gpio@e6050000 {
+                       compatible = "renesas,gpio-r8a7793",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6050000 0 0x50>;
+                       interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 0 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 912>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 912>;
+               };
 
-       gpio0: gpio@e6050000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6050000 0 0x50>;
-               interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 0 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 912>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 912>;
-       };
+               gpio1: gpio@e6051000 {
+                       compatible = "renesas,gpio-r8a7793",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6051000 0 0x50>;
+                       interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 32 26>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 911>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 911>;
+               };
 
-       gpio1: gpio@e6051000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6051000 0 0x50>;
-               interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 32 26>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 911>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 911>;
-       };
+               gpio2: gpio@e6052000 {
+                       compatible = "renesas,gpio-r8a7793",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6052000 0 0x50>;
+                       interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 64 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 910>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 910>;
+               };
 
-       gpio2: gpio@e6052000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6052000 0 0x50>;
-               interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 64 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 910>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 910>;
-       };
+               gpio3: gpio@e6053000 {
+                       compatible = "renesas,gpio-r8a7793",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6053000 0 0x50>;
+                       interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 96 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 909>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 909>;
+               };
 
-       gpio3: gpio@e6053000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6053000 0 0x50>;
-               interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 96 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 909>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 909>;
-       };
+               gpio4: gpio@e6054000 {
+                       compatible = "renesas,gpio-r8a7793",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6054000 0 0x50>;
+                       interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 128 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 908>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 908>;
+               };
 
-       gpio4: gpio@e6054000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6054000 0 0x50>;
-               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 128 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 908>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 908>;
-       };
+               gpio5: gpio@e6055000 {
+                       compatible = "renesas,gpio-r8a7793",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6055000 0 0x50>;
+                       interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 160 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 907>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 907>;
+               };
 
-       gpio5: gpio@e6055000 {
-               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6055000 0 0x50>;
-               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 160 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 907>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 907>;
-       };
+               gpio6: gpio@e6055400 {
+                       compatible = "renesas,gpio-r8a7793",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6055400 0 0x50>;
+                       interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 192 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 905>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 905>;
+               };
 
-       gpio6: gpio@e6055400 {
-               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6055400 0 0x50>;
-               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 192 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 905>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 905>;
-       };
+               gpio7: gpio@e6055800 {
+                       compatible = "renesas,gpio-r8a7793",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6055800 0 0x50>;
+                       interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 224 26>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 904>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 904>;
+               };
 
-       gpio7: gpio@e6055800 {
-               compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6055800 0 0x50>;
-               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 224 26>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 904>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 904>;
-       };
+               pfc: pin-controller@e6060000 {
+                       compatible = "renesas,pfc-r8a7793";
+                       reg = <0 0xe6060000 0 0x250>;
+               };
 
-       thermal: thermal@e61f0000 {
-               compatible =    "renesas,thermal-r8a7793",
-                               "renesas,rcar-gen2-thermal",
-                               "renesas,rcar-thermal";
-               reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
-               interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 522>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 522>;
-               #thermal-sensor-cells = <0>;
-       };
+               /* Special CPG clocks */
+               cpg: clock-controller@e6150000 {
+                       compatible = "renesas,r8a7793-cpg-mssr";
+                       reg = <0 0xe6150000 0 0x1000>;
+                       clocks = <&extal_clk>, <&usb_extal_clk>;
+                       clock-names = "extal", "usb_extal";
+                       #clock-cells = <2>;
+                       #power-domain-cells = <0>;
+                       #reset-cells = <1>;
+               };
 
-       timer {
-               compatible = "arm,armv7-timer";
-               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
-       };
+               apmu@e6152000 {
+                       compatible = "renesas,r8a7793-apmu", "renesas,apmu";
+                       reg = <0 0xe6152000 0 0x188>;
+                       cpus = <&cpu0 &cpu1>;
+               };
 
-       cmt0: timer@ffca0000 {
-               compatible = "renesas,cmt-48-r8a7793", "renesas,cmt-48-gen2";
-               reg = <0 0xffca0000 0 0x1004>;
-               interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 124>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 124>;
+               rst: reset-controller@e6160000 {
+                       compatible = "renesas,r8a7793-rst";
+                       reg = <0 0xe6160000 0 0x0100>;
+               };
 
-               renesas,channels-mask = <0x60>;
+               sysc: system-controller@e6180000 {
+                       compatible = "renesas,r8a7793-sysc";
+                       reg = <0 0xe6180000 0 0x0200>;
+                       #power-domain-cells = <1>;
+               };
 
-               status = "disabled";
-       };
+               irqc0: interrupt-controller@e61c0000 {
+                       compatible = "renesas,irqc-r8a7793", "renesas,irqc";
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       reg = <0 0xe61c0000 0 0x200>;
+                       interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 407>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 407>;
+               };
 
-       cmt1: timer@e6130000 {
-               compatible = "renesas,cmt-48-r8a7793", "renesas,cmt-48-gen2";
-               reg = <0 0xe6130000 0 0x1004>;
-               interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 329>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 329>;
-
-               renesas,channels-mask = <0xff>;
-
-               status = "disabled";
-       };
+               thermal: thermal@e61f0000 {
+                       compatible = "renesas,thermal-r8a7793",
+                                    "renesas,rcar-gen2-thermal",
+                                    "renesas,rcar-thermal";
+                       reg = <0 0xe61f0000 0 0x10>, <0 0xe61f0100 0 0x38>;
+                       interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 522>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 522>;
+                       #thermal-sensor-cells = <0>;
+               };
 
-       irqc0: interrupt-controller@e61c0000 {
-               compatible = "renesas,irqc-r8a7793", "renesas,irqc";
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               reg = <0 0xe61c0000 0 0x200>;
-               interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 407>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 407>;
-       };
+               ipmmu_sy0: mmu@e6280000 {
+                       compatible = "renesas,ipmmu-r8a7793",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6280000 0 0x1000>;
+                       interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       dmac0: dma-controller@e6700000 {
-               compatible = "renesas,dmac-r8a7793", "renesas,rcar-dmac";
-               reg = <0 0xe6700000 0 0x20000>;
-               interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12", "ch13", "ch14";
-               clocks = <&cpg CPG_MOD 219>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 219>;
-               #dma-cells = <1>;
-               dma-channels = <15>;
-       };
+               ipmmu_sy1: mmu@e6290000 {
+                       compatible = "renesas,ipmmu-r8a7793",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6290000 0 0x1000>;
+                       interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       dmac1: dma-controller@e6720000 {
-               compatible = "renesas,dmac-r8a7793", "renesas,rcar-dmac";
-               reg = <0 0xe6720000 0 0x20000>;
-               interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12", "ch13", "ch14";
-               clocks = <&cpg CPG_MOD 218>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 218>;
-               #dma-cells = <1>;
-               dma-channels = <15>;
-       };
+               ipmmu_ds: mmu@e6740000 {
+                       compatible = "renesas,ipmmu-r8a7793",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6740000 0 0x1000>;
+                       interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       audma0: dma-controller@ec700000 {
-               compatible = "renesas,dmac-r8a7793", "renesas,rcar-dmac";
-               reg = <0 0xec700000 0 0x10000>;
-               interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12";
-               clocks = <&cpg CPG_MOD 502>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 502>;
-               #dma-cells = <1>;
-               dma-channels = <13>;
-       };
+               ipmmu_mp: mmu@ec680000 {
+                       compatible = "renesas,ipmmu-r8a7793",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xec680000 0 0x1000>;
+                       interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       audma1: dma-controller@ec720000 {
-               compatible = "renesas,dmac-r8a7793", "renesas,rcar-dmac";
-               reg = <0 0xec720000 0 0x10000>;
-               interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12";
-               clocks = <&cpg CPG_MOD 501>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 501>;
-               #dma-cells = <1>;
-               dma-channels = <13>;
-       };
+               ipmmu_mx: mmu@fe951000 {
+                       compatible = "renesas,ipmmu-r8a7793",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xfe951000 0 0x1000>;
+                       interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       /* The memory map in the User's Manual maps the cores to bus numbers */
-       i2c0: i2c@e6508000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6508000 0 0x40>;
-               interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 931>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 931>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               ipmmu_rt: mmu@ffc80000 {
+                       compatible = "renesas,ipmmu-r8a7793",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xffc80000 0 0x1000>;
+                       interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c1: i2c@e6518000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6518000 0 0x40>;
-               interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 930>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 930>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               ipmmu_gp: mmu@e62a0000 {
+                       compatible = "renesas,ipmmu-r8a7793",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe62a0000 0 0x1000>;
+                       interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       i2c2: i2c@e6530000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6530000 0 0x40>;
-               interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 929>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 929>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               icram0: sram@e63a0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63a0000 0 0x12000>;
+               };
 
-       i2c3: i2c@e6540000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6540000 0 0x40>;
-               interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 928>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 928>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               icram1: sram@e63c0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63c0000 0 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0 0xe63c0000 0x1000>;
 
-       i2c4: i2c@e6520000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6520000 0 0x40>;
-               interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 927>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 927>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+                       smp-sram@0 {
+                               compatible = "renesas,smp-sram";
+                               reg = <0 0x10>;
+                       };
+               };
 
-       i2c5: i2c@e6528000 {
-               /* doesn't need pinmux */
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6528000 0 0x40>;
-               interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 925>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 925>;
-               i2c-scl-internal-delay-ns = <110>;
-               status = "disabled";
-       };
+               /* The memory map in the User's Manual maps the cores to
+                * bus numbers
+                */
+               i2c0: i2c@e6508000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7793",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6508000 0 0x40>;
+                       interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 931>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 931>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       i2c6: i2c@e60b0000 {
-               /* doesn't need pinmux */
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7793", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe60b0000 0 0x425>;
-               interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 926>;
-               dmas = <&dmac0 0x77>, <&dmac0 0x78>,
-                      <&dmac1 0x77>, <&dmac1 0x78>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 926>;
-               status = "disabled";
-       };
+               i2c1: i2c@e6518000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7793",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6518000 0 0x40>;
+                       interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 930>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 930>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       i2c7: i2c@e6500000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7793", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe6500000 0 0x425>;
-               interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 318>;
-               dmas = <&dmac0 0x61>, <&dmac0 0x62>,
-                      <&dmac1 0x61>, <&dmac1 0x62>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 318>;
-               status = "disabled";
-       };
+               i2c2: i2c@e6530000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7793",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6530000 0 0x40>;
+                       interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 929>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 929>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       i2c8: i2c@e6510000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "renesas,iic-r8a7793", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe6510000 0 0x425>;
-               interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 323>;
-               dmas = <&dmac0 0x65>, <&dmac0 0x66>,
-                      <&dmac1 0x65>, <&dmac1 0x66>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 323>;
-               status = "disabled";
-       };
+               i2c3: i2c@e6540000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7793",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6540000 0 0x40>;
+                       interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 928>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 928>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       pfc: pin-controller@e6060000 {
-               compatible = "renesas,pfc-r8a7793";
-               reg = <0 0xe6060000 0 0x250>;
-       };
+               i2c4: i2c@e6520000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7793",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6520000 0 0x40>;
+                       interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 927>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 927>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       sdhi0: sd@ee100000 {
-               compatible = "renesas,sdhi-r8a7793";
-               reg = <0 0xee100000 0 0x328>;
-               interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 314>;
-               dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                      <&dmac1 0xcd>, <&dmac1 0xce>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <195000000>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 314>;
-               status = "disabled";
-       };
+               i2c5: i2c@e6528000 {
+                       /* doesn't need pinmux */
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,i2c-r8a7793",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6528000 0 0x40>;
+                       interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 925>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 925>;
+                       i2c-scl-internal-delay-ns = <110>;
+                       status = "disabled";
+               };
 
-       sdhi1: sd@ee140000 {
-               compatible = "renesas,sdhi-r8a7793";
-               reg = <0 0xee140000 0 0x100>;
-               interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 312>;
-               dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                      <&dmac1 0xc1>, <&dmac1 0xc2>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <97500000>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 312>;
-               status = "disabled";
-       };
+               i2c6: i2c@e60b0000 {
+                       /* doesn't need pinmux */
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7793",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe60b0000 0 0x425>;
+                       interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 926>;
+                       dmas = <&dmac0 0x77>, <&dmac0 0x78>,
+                              <&dmac1 0x77>, <&dmac1 0x78>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 926>;
+                       status = "disabled";
+               };
 
-       sdhi2: sd@ee160000 {
-               compatible = "renesas,sdhi-r8a7793";
-               reg = <0 0xee160000 0 0x100>;
-               interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 311>;
-               dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                      <&dmac1 0xd3>, <&dmac1 0xd4>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <97500000>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 311>;
-               status = "disabled";
-       };
+               i2c7: i2c@e6500000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7793",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe6500000 0 0x425>;
+                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 318>;
+                       dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+                              <&dmac1 0x61>, <&dmac1 0x62>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 318>;
+                       status = "disabled";
+               };
 
-       mmcif0: mmc@ee200000 {
-               compatible = "renesas,mmcif-r8a7793", "renesas,sh-mmcif";
-               reg = <0 0xee200000 0 0x80>;
-               interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 315>;
-               dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                      <&dmac1 0xd1>, <&dmac1 0xd2>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 315>;
-               reg-io-width = <4>;
-               status = "disabled";
-               max-frequency = <97500000>;
-       };
+               i2c8: i2c@e6510000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "renesas,iic-r8a7793",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe6510000 0 0x425>;
+                       interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 323>;
+                       dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+                              <&dmac1 0x65>, <&dmac1 0x66>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 323>;
+                       status = "disabled";
+               };
 
-       scifa0: serial@e6c40000 {
-               compatible = "renesas,scifa-r8a7793",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c40000 0 64>;
-               interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 204>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x21>, <&dmac0 0x22>,
-                      <&dmac1 0x21>, <&dmac1 0x22>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 204>;
-               status = "disabled";
-       };
+               dmac0: dma-controller@e6700000 {
+                       compatible = "renesas,dmac-r8a7793",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe6700000 0 0x20000>;
+                       interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12", "ch13", "ch14";
+                       clocks = <&cpg CPG_MOD 219>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 219>;
+                       #dma-cells = <1>;
+                       dma-channels = <15>;
+               };
 
-       scifa1: serial@e6c50000 {
-               compatible = "renesas,scifa-r8a7793",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c50000 0 64>;
-               interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 203>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x25>, <&dmac0 0x26>,
-                      <&dmac1 0x25>, <&dmac1 0x26>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 203>;
-               status = "disabled";
-       };
+               dmac1: dma-controller@e6720000 {
+                       compatible = "renesas,dmac-r8a7793",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe6720000 0 0x20000>;
+                       interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12", "ch13", "ch14";
+                       clocks = <&cpg CPG_MOD 218>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 218>;
+                       #dma-cells = <1>;
+                       dma-channels = <15>;
+               };
 
-       scifa2: serial@e6c60000 {
-               compatible = "renesas,scifa-r8a7793",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c60000 0 64>;
-               interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 202>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x27>, <&dmac0 0x28>,
-                      <&dmac1 0x27>, <&dmac1 0x28>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 202>;
-               status = "disabled";
-       };
+               qspi: spi@e6b10000 {
+                       compatible = "renesas,qspi-r8a7793", "renesas,qspi";
+                       reg = <0 0xe6b10000 0 0x2c>;
+                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 917>;
+                       dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                              <&dmac1 0x17>, <&dmac1 0x18>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 917>;
+                       num-cs = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       scifa3: serial@e6c70000 {
-               compatible = "renesas,scifa-r8a7793",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c70000 0 64>;
-               interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 1106>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
-                      <&dmac1 0x1b>, <&dmac1 0x1c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 1106>;
-               status = "disabled";
-       };
+               scifa0: serial@e6c40000 {
+                       compatible = "renesas,scifa-r8a7793",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c40000 0 64>;
+                       interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 204>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x21>, <&dmac0 0x22>,
+                              <&dmac1 0x21>, <&dmac1 0x22>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 204>;
+                       status = "disabled";
+               };
 
-       scifa4: serial@e6c78000 {
-               compatible = "renesas,scifa-r8a7793",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c78000 0 64>;
-               interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 1107>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
-                      <&dmac1 0x1f>, <&dmac1 0x20>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 1107>;
-               status = "disabled";
-       };
+               scifa1: serial@e6c50000 {
+                       compatible = "renesas,scifa-r8a7793",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c50000 0 64>;
+                       interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 203>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x25>, <&dmac0 0x26>,
+                              <&dmac1 0x25>, <&dmac1 0x26>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 203>;
+                       status = "disabled";
+               };
 
-       scifa5: serial@e6c80000 {
-               compatible = "renesas,scifa-r8a7793",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c80000 0 64>;
-               interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 1108>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x23>, <&dmac0 0x24>,
-                      <&dmac1 0x23>, <&dmac1 0x24>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 1108>;
-               status = "disabled";
-       };
+               scifa2: serial@e6c60000 {
+                       compatible = "renesas,scifa-r8a7793",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c60000 0 64>;
+                       interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 202>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x27>, <&dmac0 0x28>,
+                              <&dmac1 0x27>, <&dmac1 0x28>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 202>;
+                       status = "disabled";
+               };
 
-       scifb0: serial@e6c20000 {
-               compatible = "renesas,scifb-r8a7793",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c20000 0 0x100>;
-               interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 206>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
-                      <&dmac1 0x3d>, <&dmac1 0x3e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 206>;
-               status = "disabled";
-       };
+               scifa3: serial@e6c70000 {
+                       compatible = "renesas,scifa-r8a7793",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c70000 0 64>;
+                       interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 1106>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
+                              <&dmac1 0x1b>, <&dmac1 0x1c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 1106>;
+                       status = "disabled";
+               };
 
-       scifb1: serial@e6c30000 {
-               compatible = "renesas,scifb-r8a7793",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c30000 0 0x100>;
-               interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 207>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
-                      <&dmac1 0x19>, <&dmac1 0x1a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 207>;
-               status = "disabled";
-       };
+               scifa4: serial@e6c78000 {
+                       compatible = "renesas,scifa-r8a7793",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c78000 0 64>;
+                       interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 1107>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
+                              <&dmac1 0x1f>, <&dmac1 0x20>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 1107>;
+                       status = "disabled";
+               };
 
-       scifb2: serial@e6ce0000 {
-               compatible = "renesas,scifb-r8a7793",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6ce0000 0 0x100>;
-               interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 216>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
-                      <&dmac1 0x1d>, <&dmac1 0x1e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 216>;
-               status = "disabled";
-       };
+               scifa5: serial@e6c80000 {
+                       compatible = "renesas,scifa-r8a7793",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c80000 0 64>;
+                       interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 1108>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x23>, <&dmac0 0x24>,
+                              <&dmac1 0x23>, <&dmac1 0x24>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 1108>;
+                       status = "disabled";
+               };
 
-       scif0: serial@e6e60000 {
-               compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e60000 0 64>;
-               interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
-                      <&dmac1 0x29>, <&dmac1 0x2a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 721>;
-               status = "disabled";
-       };
+               scifb0: serial@e6c20000 {
+                       compatible = "renesas,scifb-r8a7793",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6c20000 0 0x100>;
+                       interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 206>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
+                              <&dmac1 0x3d>, <&dmac1 0x3e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 206>;
+                       status = "disabled";
+               };
 
-       scif1: serial@e6e68000 {
-               compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e68000 0 64>;
-               interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
-                      <&dmac1 0x2d>, <&dmac1 0x2e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 720>;
-               status = "disabled";
-       };
+               scifb1: serial@e6c30000 {
+                       compatible = "renesas,scifb-r8a7793",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6c30000 0 0x100>;
+                       interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 207>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
+                              <&dmac1 0x19>, <&dmac1 0x1a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 207>;
+                       status = "disabled";
+               };
 
-       scif2: serial@e6e58000 {
-               compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e58000 0 64>;
-               interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
-                      <&dmac1 0x2b>, <&dmac1 0x2c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 719>;
-               status = "disabled";
-       };
+               scifb2: serial@e6ce0000 {
+                       compatible = "renesas,scifb-r8a7793",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6ce0000 0 0x100>;
+                       interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 216>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
+                              <&dmac1 0x1d>, <&dmac1 0x1e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 216>;
+                       status = "disabled";
+               };
 
-       scif3: serial@e6ea8000 {
-               compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6ea8000 0 64>;
-               interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
-                      <&dmac1 0x2f>, <&dmac1 0x30>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 718>;
-               status = "disabled";
-       };
+               scif0: serial@e6e60000 {
+                       compatible = "renesas,scif-r8a7793",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6e60000 0 64>;
+                       interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
+                              <&dmac1 0x29>, <&dmac1 0x2a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 721>;
+                       status = "disabled";
+               };
 
-       scif4: serial@e6ee0000 {
-               compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6ee0000 0 64>;
-               interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
-                      <&dmac1 0xfb>, <&dmac1 0xfc>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 715>;
-               status = "disabled";
-       };
+               scif1: serial@e6e68000 {
+                       compatible = "renesas,scif-r8a7793",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6e68000 0 64>;
+                       interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
+                              <&dmac1 0x2d>, <&dmac1 0x2e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 720>;
+                       status = "disabled";
+               };
 
-       scif5: serial@e6ee8000 {
-               compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6ee8000 0 64>;
-               interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
-                      <&dmac1 0xfd>, <&dmac1 0xfe>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 714>;
-               status = "disabled";
-       };
+               scif2: serial@e6e58000 {
+                       compatible = "renesas,scif-r8a7793",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6e58000 0 64>;
+                       interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
+                              <&dmac1 0x2b>, <&dmac1 0x2c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 719>;
+                       status = "disabled";
+               };
 
-       hscif0: serial@e62c0000 {
-               compatible = "renesas,hscif-r8a7793",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62c0000 0 96>;
-               interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
-                      <&dmac1 0x39>, <&dmac1 0x3a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 717>;
-               status = "disabled";
-       };
+               scif3: serial@e6ea8000 {
+                       compatible = "renesas,scif-r8a7793",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6ea8000 0 64>;
+                       interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
+                              <&dmac1 0x2f>, <&dmac1 0x30>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 718>;
+                       status = "disabled";
+               };
 
-       hscif1: serial@e62c8000 {
-               compatible = "renesas,hscif-r8a7793",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62c8000 0 96>;
-               interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
-                      <&dmac1 0x4d>, <&dmac1 0x4e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 716>;
-               status = "disabled";
-       };
+               scif4: serial@e6ee0000 {
+                       compatible = "renesas,scif-r8a7793",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6ee0000 0 64>;
+                       interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
+                              <&dmac1 0xfb>, <&dmac1 0xfc>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 715>;
+                       status = "disabled";
+               };
 
-       hscif2: serial@e62d0000 {
-               compatible = "renesas,hscif-r8a7793",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62d0000 0 96>;
-               interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
-                      <&dmac1 0x3b>, <&dmac1 0x3c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 713>;
-               status = "disabled";
-       };
+               scif5: serial@e6ee8000 {
+                       compatible = "renesas,scif-r8a7793",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6ee8000 0 64>;
+                       interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
+                              <&dmac1 0xfd>, <&dmac1 0xfe>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 714>;
+                       status = "disabled";
+               };
 
-       icram0: sram@e63a0000 {
-               compatible = "mmio-sram";
-               reg = <0 0xe63a0000 0 0x12000>;
-       };
+               hscif0: serial@e62c0000 {
+                       compatible = "renesas,hscif-r8a7793",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62c0000 0 96>;
+                       interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
+                              <&dmac1 0x39>, <&dmac1 0x3a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 717>;
+                       status = "disabled";
+               };
 
-       icram1: sram@e63c0000 {
-               compatible = "mmio-sram";
-               reg = <0 0xe63c0000 0 0x1000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges = <0 0 0xe63c0000 0x1000>;
+               hscif1: serial@e62c8000 {
+                       compatible = "renesas,hscif-r8a7793",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62c8000 0 96>;
+                       interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
+                              <&dmac1 0x4d>, <&dmac1 0x4e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 716>;
+                       status = "disabled";
+               };
 
-               smp-sram@0 {
-                       compatible = "renesas,smp-sram";
-                       reg = <0 0x10>;
+               hscif2: serial@e62d0000 {
+                       compatible = "renesas,hscif-r8a7793",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62d0000 0 96>;
+                       interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
+                              <&dmac1 0x3b>, <&dmac1 0x3c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 713>;
+                       status = "disabled";
                };
-       };
 
-       ether: ethernet@ee700000 {
-               compatible = "renesas,ether-r8a7793";
-               reg = <0 0xee700000 0 0x400>;
-               interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 813>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 813>;
-               phy-mode = "rmii";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               can0: can@e6e80000 {
+                       compatible = "renesas,can-r8a7793",
+                                    "renesas,rcar-gen2-can";
+                       reg = <0 0xe6e80000 0 0x1000>;
+                       interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7793_CLK_RCAN>,
+                                <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 916>;
+                       status = "disabled";
+               };
 
-       vin0: video@e6ef0000 {
-               compatible = "renesas,vin-r8a7793", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef0000 0 0x1000>;
-               interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 811>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 811>;
-               status = "disabled";
-       };
+               can1: can@e6e88000 {
+                       compatible = "renesas,can-r8a7793",
+                                    "renesas,rcar-gen2-can";
+                       reg = <0 0xe6e88000 0 0x1000>;
+                       interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7793_CLK_RCAN>,
+                                <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 915>;
+                       status = "disabled";
+               };
 
-       vin1: video@e6ef1000 {
-               compatible = "renesas,vin-r8a7793", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef1000 0 0x1000>;
-               interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 810>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 810>;
-               status = "disabled";
-       };
+               vin0: video@e6ef0000 {
+                       compatible = "renesas,vin-r8a7793",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef0000 0 0x1000>;
+                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 811>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 811>;
+                       status = "disabled";
+               };
 
-       vin2: video@e6ef2000 {
-               compatible = "renesas,vin-r8a7793", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef2000 0 0x1000>;
-               interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 809>;
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 809>;
-               status = "disabled";
-       };
+               vin1: video@e6ef1000 {
+                       compatible = "renesas,vin-r8a7793",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef1000 0 0x1000>;
+                       interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 810>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 810>;
+                       status = "disabled";
+               };
 
-       qspi: spi@e6b10000 {
-               compatible = "renesas,qspi-r8a7793", "renesas,qspi";
-               reg = <0 0xe6b10000 0 0x2c>;
-               interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 917>;
-               dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                      <&dmac1 0x17>, <&dmac1 0x18>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 917>;
-               num-cs = <1>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               vin2: video@e6ef2000 {
+                       compatible = "renesas,vin-r8a7793",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef2000 0 0x1000>;
+                       interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 809>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 809>;
+                       status = "disabled";
+               };
 
-       du: display@feb00000 {
-               compatible = "renesas,du-r8a7793";
-               reg = <0 0xfeb00000 0 0x40000>,
-                     <0 0xfeb90000 0 0x1c>;
-               reg-names = "du", "lvds.0";
-               interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 724>,
-                        <&cpg CPG_MOD 723>,
-                        <&cpg CPG_MOD 726>;
-               clock-names = "du.0", "du.1", "lvds.0";
-               status = "disabled";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               rcar_sound: sound@ec500000 {
+                       /*
+                        * #sound-dai-cells is required
+                        *
+                        * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
+                        * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
+                        */
+                       compatible = "renesas,rcar_sound-r8a7793",
+                                    "renesas,rcar_sound-gen2";
+                       reg = <0 0xec500000 0 0x1000>, /* SCU */
+                             <0 0xec5a0000 0 0x100>,  /* ADG */
+                             <0 0xec540000 0 0x1000>, /* SSIU */
+                             <0 0xec541000 0 0x280>,  /* SSI */
+                             <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
+                       reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+
+                       clocks = <&cpg CPG_MOD 1005>,
+                                <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
+                                <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
+                                <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
+                                <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
+                                <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
+                                <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
+                                <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
+                                <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
+                                <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
+                                <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
+                                <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
+                                <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
+                                <&cpg CPG_CORE R8A7793_CLK_M2>;
+                       clock-names = "ssi-all",
+                                     "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                     "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                     "ssi.1", "ssi.0",
+                                     "src.9", "src.8", "src.7", "src.6",
+                                     "src.5", "src.4", "src.3", "src.2",
+                                     "src.1", "src.0",
+                                     "dvc.0", "dvc.1",
+                                     "clk_a", "clk_b", "clk_c", "clk_i";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 1005>,
+                                <&cpg 1006>, <&cpg 1007>,
+                                <&cpg 1008>, <&cpg 1009>,
+                                <&cpg 1010>, <&cpg 1011>,
+                                <&cpg 1012>, <&cpg 1013>,
+                                <&cpg 1014>, <&cpg 1015>;
+                       reset-names = "ssi-all",
+                                     "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                     "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                     "ssi.1", "ssi.0";
+
+                       status = "disabled";
+
+                       rcar_sound,dvc {
+                               dvc0: dvc-0 {
+                                       dmas = <&audma1 0xbc>;
+                                       dma-names = "tx";
+                               };
+                               dvc1: dvc-1 {
+                                       dmas = <&audma1 0xbe>;
+                                       dma-names = "tx";
+                               };
+                       };
 
-                       port@0 {
-                               reg = <0>;
-                               du_out_rgb: endpoint {
+                       rcar_sound,src {
+                               src0: src-0 {
+                                       interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x85>, <&audma1 0x9a>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src1: src-1 {
+                                       interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x87>, <&audma1 0x9c>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src2: src-2 {
+                                       interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x89>, <&audma1 0x9e>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src3: src-3 {
+                                       interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8b>, <&audma1 0xa0>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src4: src-4 {
+                                       interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8d>, <&audma1 0xb0>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src5: src-5 {
+                                       interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8f>, <&audma1 0xb2>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src6: src-6 {
+                                       interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x91>, <&audma1 0xb4>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src7: src-7 {
+                                       interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x93>, <&audma1 0xb6>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src8: src-8 {
+                                       interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x95>, <&audma1 0xb8>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src9: src-9 {
+                                       interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x97>, <&audma1 0xba>;
+                                       dma-names = "rx", "tx";
                                };
                        };
-                       port@1 {
-                               reg = <1>;
-                               du_out_lvds0: endpoint {
+
+                       rcar_sound,ssi {
+                               ssi0: ssi-0 {
+                                       interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x01>, <&audma1 0x02>,
+                                              <&audma0 0x15>, <&audma1 0x16>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi1: ssi-1 {
+                                        interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x03>, <&audma1 0x04>,
+                                              <&audma0 0x49>, <&audma1 0x4a>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi2: ssi-2 {
+                                       interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x05>, <&audma1 0x06>,
+                                              <&audma0 0x63>, <&audma1 0x64>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi3: ssi-3 {
+                                       interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x07>, <&audma1 0x08>,
+                                              <&audma0 0x6f>, <&audma1 0x70>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi4: ssi-4 {
+                                       interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x09>, <&audma1 0x0a>,
+                                              <&audma0 0x71>, <&audma1 0x72>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi5: ssi-5 {
+                                       interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0b>, <&audma1 0x0c>,
+                                              <&audma0 0x73>, <&audma1 0x74>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi6: ssi-6 {
+                                       interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0d>, <&audma1 0x0e>,
+                                              <&audma0 0x75>, <&audma1 0x76>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi7: ssi-7 {
+                                       interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0f>, <&audma1 0x10>,
+                                              <&audma0 0x79>, <&audma1 0x7a>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi8: ssi-8 {
+                                       interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x11>, <&audma1 0x12>,
+                                              <&audma0 0x7b>, <&audma1 0x7c>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi9: ssi-9 {
+                                       interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x13>, <&audma1 0x14>,
+                                              <&audma0 0x7d>, <&audma1 0x7e>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
                                };
                        };
                };
-       };
 
-       can0: can@e6e80000 {
-               compatible = "renesas,can-r8a7793", "renesas,rcar-gen2-can";
-               reg = <0 0xe6e80000 0 0x1000>;
-               interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7793_CLK_RCAN>,
-                        <&can_clk>;
-               clock-names = "clkp1", "clkp2", "can_clk";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 916>;
-               status = "disabled";
-       };
+               audma0: dma-controller@ec700000 {
+                       compatible = "renesas,dmac-r8a7793",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xec700000 0 0x10000>;
+                       interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12";
+                       clocks = <&cpg CPG_MOD 502>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 502>;
+                       #dma-cells = <1>;
+                       dma-channels = <13>;
+               };
 
-       can1: can@e6e88000 {
-               compatible = "renesas,can-r8a7793", "renesas,rcar-gen2-can";
-               reg = <0 0xe6e88000 0 0x1000>;
-               interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7793_CLK_RCAN>,
-                        <&can_clk>;
-               clock-names = "clkp1", "clkp2", "can_clk";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 915>;
-               status = "disabled";
-       };
+               audma1: dma-controller@ec720000 {
+                       compatible = "renesas,dmac-r8a7793",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xec720000 0 0x10000>;
+                       interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12";
+                       clocks = <&cpg CPG_MOD 501>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 501>;
+                       #dma-cells = <1>;
+                       dma-channels = <13>;
+               };
 
-       /* External root clock */
-       extal_clk: extal {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+               sdhi0: sd@ee100000 {
+                       compatible = "renesas,sdhi-r8a7793",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee100000 0 0x328>;
+                       interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 314>;
+                       dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                              <&dmac1 0xcd>, <&dmac1 0xce>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <195000000>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 314>;
+                       status = "disabled";
+               };
 
-       /*
-        * The external audio clocks are configured as 0 Hz fixed frequency
-        * clocks by default.
-        * Boards that provide audio clocks should override them.
-        */
-       audio_clk_a: audio_clk_a {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
-       audio_clk_b: audio_clk_b {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
-       audio_clk_c: audio_clk_c {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
+               sdhi1: sd@ee140000 {
+                       compatible = "renesas,sdhi-r8a7793",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee140000 0 0x100>;
+                       interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 312>;
+                       dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                              <&dmac1 0xc1>, <&dmac1 0xc2>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <97500000>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 312>;
+                       status = "disabled";
+               };
 
-       /* External USB clock - can be overridden by the board */
-       usb_extal_clk: usb_extal {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <48000000>;
-       };
+               sdhi2: sd@ee160000 {
+                       compatible = "renesas,sdhi-r8a7793",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee160000 0 0x100>;
+                       interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 311>;
+                       dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                              <&dmac1 0xd3>, <&dmac1 0xd4>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <97500000>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 311>;
+                       status = "disabled";
+               };
 
-       /* External CAN clock */
-       can_clk: can {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+               mmcif0: mmc@ee200000 {
+                       compatible = "renesas,mmcif-r8a7793",
+                                    "renesas,sh-mmcif";
+                       reg = <0 0xee200000 0 0x80>;
+                       interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 315>;
+                       dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                              <&dmac1 0xd1>, <&dmac1 0xd2>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 315>;
+                       reg-io-width = <4>;
+                       status = "disabled";
+                       max-frequency = <97500000>;
+               };
 
-       /* External SCIF clock */
-       scif_clk: scif {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+               ether: ethernet@ee700000 {
+                       compatible = "renesas,ether-r8a7793",
+                                    "renesas,rcar-gen2-ether";
+                       reg = <0 0xee700000 0 0x400>;
+                       interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 813>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 813>;
+                       phy-mode = "rmii";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       /* Special CPG clocks */
-       cpg: clock-controller@e6150000 {
-               compatible = "renesas,r8a7793-cpg-mssr";
-               reg = <0 0xe6150000 0 0x1000>;
-               clocks = <&extal_clk>, <&usb_extal_clk>;
-               clock-names = "extal", "usb_extal";
-               #clock-cells = <2>;
-               #power-domain-cells = <0>;
-               #reset-cells = <1>;
-       };
+               gic: interrupt-controller@f1001000 {
+                       compatible = "arm,gic-400";
+                       #interrupt-cells = <3>;
+                       #address-cells = <0>;
+                       interrupt-controller;
+                       reg = <0 0xf1001000 0 0x1000>,
+                               <0 0xf1002000 0 0x2000>,
+                               <0 0xf1004000 0 0x2000>,
+                               <0 0xf1006000 0 0x2000>;
+                       interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                       clocks = <&cpg CPG_MOD 408>;
+                       clock-names = "clk";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 408>;
+               };
 
-       rst: reset-controller@e6160000 {
-               compatible = "renesas,r8a7793-rst";
-               reg = <0 0xe6160000 0 0x0100>;
-       };
+               du: display@feb00000 {
+                       compatible = "renesas,du-r8a7793";
+                       reg = <0 0xfeb00000 0 0x40000>;
+                       interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 724>,
+                                <&cpg CPG_MOD 723>;
+                       clock-names = "du.0", "du.1";
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       du_out_rgb: endpoint {
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       du_out_lvds0: endpoint {
+                                               remote-endpoint = <&lvds0_in>;
+                                       };
+                               };
+                       };
+               };
 
-       prr: chipid@ff000044 {
-               compatible = "renesas,prr";
-               reg = <0 0xff000044 0 4>;
-       };
+               lvds0: lvds@feb90000 {
+                       compatible = "renesas,r8a7793-lvds";
+                       reg = <0 0xfeb90000 0 0x1c>;
+                       clocks = <&cpg CPG_MOD 726>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 726>;
 
-       sysc: system-controller@e6180000 {
-               compatible = "renesas,r8a7793-sysc";
-               reg = <0 0xe6180000 0 0x0200>;
-               #power-domain-cells = <1>;
-       };
+                       status = "disabled";
 
-       ipmmu_sy0: mmu@e6280000 {
-               compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6280000 0 0x1000>;
-               interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
 
-       ipmmu_sy1: mmu@e6290000 {
-               compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6290000 0 0x1000>;
-               interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+                               port@0 {
+                                       reg = <0>;
+                                       lvds0_in: endpoint {
+                                               remote-endpoint = <&du_out_lvds0>;
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       lvds0_out: endpoint {
+                                       };
+                               };
+                       };
+               };
 
-       ipmmu_ds: mmu@e6740000 {
-               compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6740000 0 0x1000>;
-               interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               prr: chipid@ff000044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xff000044 0 4>;
+               };
 
-       ipmmu_mp: mmu@ec680000 {
-               compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-               reg = <0 0xec680000 0 0x1000>;
-               interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               cmt0: timer@ffca0000 {
+                       compatible = "renesas,r8a7793-cmt0",
+                                    "renesas,rcar-gen2-cmt0";
+                       reg = <0 0xffca0000 0 0x1004>;
+                       interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 124>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 124>;
+
+                       status = "disabled";
+               };
 
-       ipmmu_mx: mmu@fe951000 {
-               compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-               reg = <0 0xfe951000 0 0x1000>;
-               interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
+               cmt1: timer@e6130000 {
+                       compatible = "renesas,r8a7793-cmt1",
+                                    "renesas,rcar-gen2-cmt1";
+                       reg = <0 0xe6130000 0 0x1004>;
+                       interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 329>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 329>;
+
+                       status = "disabled";
+               };
        };
 
-       ipmmu_rt: mmu@ffc80000 {
-               compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-               reg = <0 0xffc80000 0 0x1000>;
-               interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+       thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
 
-       ipmmu_gp: mmu@e62a0000 {
-               compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-               reg = <0 0xe62a0000 0 0x1000>;
-               interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+                       thermal-sensors = <&thermal>;
 
-       rcar_sound: sound@ec500000 {
-               /*
-                * #sound-dai-cells is required
-                *
-                * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
-                * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
-                */
-               compatible =  "renesas,rcar_sound-r8a7793", "renesas,rcar_sound-gen2";
-               reg =   <0 0xec500000 0 0x1000>, /* SCU */
-                       <0 0xec5a0000 0 0x100>,  /* ADG */
-                       <0 0xec540000 0 0x1000>, /* SSIU */
-                       <0 0xec541000 0 0x280>,  /* SSI */
-                       <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
-               reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
-
-               clocks = <&cpg CPG_MOD 1005>,
-                        <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-                        <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
-                        <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
-                        <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
-                        <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
-                        <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
-                        <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
-                        <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
-                        <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
-                        <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
-                        <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
-                        <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
-                        <&cpg CPG_CORE R8A7793_CLK_M2>;
-               clock-names = "ssi-all",
-                               "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                               "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
-                               "src.9", "src.8", "src.7", "src.6", "src.5",
-                               "src.4", "src.3", "src.2", "src.1", "src.0",
-                               "dvc.0", "dvc.1",
-                               "clk_a", "clk_b", "clk_c", "clk_i";
-               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-               resets = <&cpg 1005>,
-                        <&cpg 1006>, <&cpg 1007>, <&cpg 1008>, <&cpg 1009>,
-                        <&cpg 1010>, <&cpg 1011>, <&cpg 1012>, <&cpg 1013>,
-                        <&cpg 1014>, <&cpg 1015>;
-               reset-names = "ssi-all",
-                             "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                             "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0";
-
-               status = "disabled";
-
-               rcar_sound,dvc {
-                       dvc0: dvc-0 {
-                               dmas = <&audma1 0xbc>;
-                               dma-names = "tx";
+                       trips {
+                               cpu-crit {
+                                       temperature = <95000>;
+                                       hysteresis = <0>;
+                                       type = "critical";
+                               };
                        };
-                       dvc1: dvc-1 {
-                               dmas = <&audma1 0xbe>;
-                               dma-names = "tx";
+                       cooling-maps {
                        };
                };
+       };
 
-               rcar_sound,src {
-                       src0: src-0 {
-                               interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x85>, <&audma1 0x9a>;
-                               dma-names = "rx", "tx";
-                       };
-                       src1: src-1 {
-                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x87>, <&audma1 0x9c>;
-                               dma-names = "rx", "tx";
-                       };
-                       src2: src-2 {
-                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x89>, <&audma1 0x9e>;
-                               dma-names = "rx", "tx";
-                       };
-                       src3: src-3 {
-                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8b>, <&audma1 0xa0>;
-                               dma-names = "rx", "tx";
-                       };
-                       src4: src-4 {
-                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8d>, <&audma1 0xb0>;
-                               dma-names = "rx", "tx";
-                       };
-                       src5: src-5 {
-                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8f>, <&audma1 0xb2>;
-                               dma-names = "rx", "tx";
-                       };
-                       src6: src-6 {
-                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x91>, <&audma1 0xb4>;
-                               dma-names = "rx", "tx";
-                       };
-                       src7: src-7 {
-                               interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x93>, <&audma1 0xb6>;
-                               dma-names = "rx", "tx";
-                       };
-                       src8: src-8 {
-                               interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x95>, <&audma1 0xb8>;
-                               dma-names = "rx", "tx";
-                       };
-                       src9: src-9 {
-                               interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x97>, <&audma1 0xba>;
-                               dma-names = "rx", "tx";
-                       };
-               };
+       timer {
+               compatible = "arm,armv7-timer";
+               interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+       };
 
-               rcar_sound,ssi {
-                       ssi0: ssi-0 {
-                               interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi1: ssi-1 {
-                                interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi2: ssi-2 {
-                               interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi3: ssi-3 {
-                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi4: ssi-4 {
-                               interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi5: ssi-5 {
-                               interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi6: ssi-6 {
-                               interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi7: ssi-7 {
-                               interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi8: ssi-8 {
-                               interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi9: ssi-9 {
-                               interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-               };
+       /* External USB clock - can be overridden by the board */
+       usb_extal_clk: usb_extal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <48000000>;
        };
 };
index bde6e477b8b04ac65228d5ef105bf498b1c7391b..af3c67eb02dedbc1ba01a809ff82a7b8272cc595 100644 (file)
@@ -15,7 +15,9 @@
 
        aliases {
                serial0 = &scif2;
+               i2c9 = &gpioi2c1;
                i2c10 = &gpioi2c4;
+               i2c11 = &i2chdmi;
                i2c12 = &i2cexio4;
        };
 
                clock-frequency = <148500000>;
        };
 
+       gpioi2c1: i2c-9 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "i2c-gpio";
+               status = "disabled";
+               scl-gpios = <&gpio4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       };
+
        gpioi2c4: i2c-10 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "i2c-gpio";
                status = "disabled";
-               gpios = <&gpio4 9 GPIO_ACTIVE_HIGH /* sda */
-                        &gpio4 8 GPIO_ACTIVE_HIGH /* scl */
-                       >;
+               scl-gpios = <&gpio4 8 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio4 9 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                i2c-gpio,delay-us = <5>;
        };
 
+       /*
+        * A fallback to GPIO is provided for I2C1.
+        */
+       i2chdmi: i2c-11 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&i2c1>, <&gpioi2c1>;
+               i2c-bus-name = "i2c-hdmi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               composite-in@20 {
+                       compatible = "adi,adv7180";
+                       reg = <0x20>;
+                       remote = <&vin0>;
+
+                       port {
+                               adv7180: endpoint {
+                                       bus-width = <8>;
+                                       remote-endpoint = <&vin0ep>;
+                               };
+                       };
+               };
+       };
+
        /*
         * I2C4 is routed to EXIO connector B, pins 73 (SCL) + 74 (SDA).
         * A fallback to GPIO is provided.
 
 &i2c1 {
        pinctrl-0 = <&i2c1_pins>;
-       pinctrl-names = "default";
+       pinctrl-names = "i2c-hdmi";
 
-       status = "okay";
        clock-frequency = <400000>;
-
-       composite-in@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-               remote = <&vin0>;
-
-               port {
-                       adv7180: endpoint {
-                               bus-width = <8>;
-                               remote-endpoint = <&vin0ep>;
-                       };
-               };
-       };
 };
 
 &i2c4 {
index 4316087ce3704dd7ac0f1f3fabe4da62add04d39..50dad43c102d1484e1375a6a1cf88429d9c6d11a 100644 (file)
@@ -21,6 +21,7 @@
 /dts-v1/;
 #include "r8a7794.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
        model = "SILK";
@@ -28,6 +29,8 @@
 
        aliases {
                serial0 = &scif2;
+               i2c9 = &gpioi2c1;
+               i2c10 = &i2chdmi;
        };
 
        chosen {
                reg = <0 0x40000000 0 0x40000000>;
        };
 
+       gpio-keys {
+               compatible = "gpio-keys";
+
+               key-3 {
+                       gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_3>;
+                       label = "SW3";
+                       wakeup-source;
+                       debounce-interval = <20>;
+               };
+               key-4 {
+                       gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_4>;
+                       label = "SW4";
+                       wakeup-source;
+                       debounce-interval = <20>;
+               };
+               key-6 {
+                       gpios = <&gpio5 12 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_6>;
+                       label = "SW6";
+                       wakeup-source;
+                       debounce-interval = <20>;
+               };
+               key-a {
+                       gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_A>;
+                       label = "SW12-1";
+                       wakeup-source;
+                       debounce-interval = <20>;
+               };
+               key-b {
+                       gpios = <&gpio3 10 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_B>;
+                       label = "SW12-2";
+                       wakeup-source;
+                       debounce-interval = <20>;
+               };
+               key-c {
+                       gpios = <&gpio3 11 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_C>;
+                       label = "SW12-3";
+                       wakeup-source;
+                       debounce-interval = <20>;
+               };
+               key-d {
+                       gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_D>;
+                       label = "SW12-4";
+                       wakeup-source;
+                       debounce-interval = <20>;
+               };
+       };
+
        d3_3v: regulator-d3-3v {
                compatible = "regulator-fixed";
                regulator-name = "D3.3V";
                        clocks = <&x9_clk>;
                };
        };
+
+       gpioi2c1: i2c-9 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "i2c-gpio";
+               status = "disabled";
+               scl-gpios = <&gpio4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               i2c-gpio,delay-us = <5>;
+       };
+
+       /*
+        * A fallback to GPIO is provided for I2C1.
+        */
+       i2chdmi: i2c-10 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&i2c1>, <&gpioi2c1>;
+               i2c-bus-name = "i2c-hdmi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ak4643: codec@12 {
+                       compatible = "asahi-kasei,ak4643";
+                       #sound-dai-cells = <0>;
+                       reg = <0x12>;
+               };
+
+               composite-in@20 {
+                       compatible = "adi,adv7180";
+                       reg = <0x20>;
+                       remote = <&vin0>;
+
+                       port {
+                               adv7180: endpoint {
+                                       bus-width = <8>;
+                                       remote-endpoint = <&vin0ep>;
+                               };
+                       };
+               };
+
+               hdmi@39 {
+                       compatible = "adi,adv7511w";
+                       reg = <0x39>;
+                       interrupt-parent = <&gpio5>;
+                       interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
+
+                       adi,input-depth = <8>;
+                       adi,input-colorspace = "rgb";
+                       adi,input-clock = "1x";
+                       adi,input-style = <1>;
+                       adi,input-justification = "evenly";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       adv7511_in: endpoint {
+                                               remote-endpoint = <&du_out_rgb0>;
+                                       };
+                               };
+
+                               port@1 {
+                                       reg = <1>;
+                                       adv7511_out: endpoint {
+                                               remote-endpoint = <&hdmi_con>;
+                                       };
+                               };
+                       };
+               };
+
+               eeprom@50 {
+                       compatible = "renesas,r1ex24002", "atmel,24c02";
+                       reg = <0x50>;
+                       pagesize = <16>;
+               };
+       };
 };
 
 &extal_clk {
 
 &i2c1 {
        pinctrl-0 = <&i2c1_pins>;
-       pinctrl-names = "default";
+       pinctrl-names = "i2c-hdmi";
 
-       status = "okay";
        clock-frequency = <400000>;
-
-       ak4643: codec@12 {
-               compatible = "asahi-kasei,ak4643";
-               #sound-dai-cells = <0>;
-               reg = <0x12>;
-       };
-
-       composite-in@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-               remote = <&vin0>;
-
-               port {
-                       adv7180: endpoint {
-                               bus-width = <8>;
-                               remote-endpoint = <&vin0ep>;
-                       };
-               };
-       };
-
-       hdmi@39 {
-               compatible = "adi,adv7511w";
-               reg = <0x39>;
-               interrupt-parent = <&gpio5>;
-               interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
-
-               adi,input-depth = <8>;
-               adi,input-colorspace = "rgb";
-               adi,input-clock = "1x";
-               adi,input-style = <1>;
-               adi,input-justification = "evenly";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               adv7511_in: endpoint {
-                                       remote-endpoint = <&du_out_rgb0>;
-                               };
-                       };
-
-                       port@1 {
-                               reg = <1>;
-                               adv7511_out: endpoint {
-                                       remote-endpoint = <&hdmi_con>;
-                               };
-                       };
-               };
-       };
 };
 
 &mmcif0 {
index 649756f484860f6abefc43ed57fb8f3fcb4dcf50..0cc07b30d17df42ddf9065298a41837ec2307c14 100644 (file)
@@ -13,7 +13,6 @@
 
 / {
        compatible = "renesas,r8a7794";
-       interrupt-parent = <&gic>;
        #address-cells = <2>;
        #size-cells = <2>;
 
                vin1 = &vin1;
        };
 
+       /*
+        * The external audio clocks are configured as 0 Hz fixed frequency
+        * clocks by default.
+        * Boards that provide audio clocks should override them.
+        */
+       audio_clka: audio_clka {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+       audio_clkb: audio_clkb {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+       audio_clkc: audio_clkc {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+
+       /* External CAN clock */
+       can_clk: can {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
+               enable-method = "renesas,apmu";
 
                cpu0: cpu@0 {
                        device_type = "cpu";
                };
        };
 
-       gic: interrupt-controller@f1001000 {
-               compatible = "arm,gic-400";
-               #interrupt-cells = <3>;
-               #address-cells = <0>;
-               interrupt-controller;
-               reg = <0 0xf1001000 0 0x1000>,
-                       <0 0xf1002000 0 0x2000>,
-                       <0 0xf1004000 0 0x2000>,
-                       <0 0xf1006000 0 0x2000>;
-               interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
-               clocks = <&cpg CPG_MOD 408>;
-               clock-names = "clk";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 408>;
-       };
-
-       gpio0: gpio@e6050000 {
-               compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6050000 0 0x50>;
-               interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 0 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 912>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 912>;
-       };
-
-       gpio1: gpio@e6051000 {
-               compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6051000 0 0x50>;
-               interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 32 26>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 911>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 911>;
+       /* External root clock */
+       extal_clk: extal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
        };
 
-       gpio2: gpio@e6052000 {
-               compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6052000 0 0x50>;
-               interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 64 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 910>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 910>;
+       /* External SCIF clock */
+       scif_clk: scif {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               /* This value must be overridden by the board. */
+               clock-frequency = <0>;
        };
 
-       gpio3: gpio@e6053000 {
-               compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6053000 0 0x50>;
-               interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 96 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 909>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 909>;
-       };
+       soc {
+               compatible = "simple-bus";
+               interrupt-parent = <&gic>;
 
-       gpio4: gpio@e6054000 {
-               compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6054000 0 0x50>;
-               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 128 32>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 908>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 908>;
-       };
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               gpio0: gpio@e6050000 {
+                       compatible = "renesas,gpio-r8a7794",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6050000 0 0x50>;
+                       interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 0 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 912>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 912>;
+               };
 
-       gpio5: gpio@e6055000 {
-               compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6055000 0 0x50>;
-               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 160 28>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 907>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 907>;
-       };
+               gpio1: gpio@e6051000 {
+                       compatible = "renesas,gpio-r8a7794",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6051000 0 0x50>;
+                       interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 32 26>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 911>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 911>;
+               };
 
-       gpio6: gpio@e6055400 {
-               compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-               reg = <0 0xe6055400 0 0x50>;
-               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               gpio-ranges = <&pfc 0 192 26>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               clocks = <&cpg CPG_MOD 905>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 905>;
-       };
+               gpio2: gpio@e6052000 {
+                       compatible = "renesas,gpio-r8a7794",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6052000 0 0x50>;
+                       interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 64 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 910>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 910>;
+               };
 
-       cmt0: timer@ffca0000 {
-               compatible = "renesas,cmt-48-gen2";
-               reg = <0 0xffca0000 0 0x1004>;
-               interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 124>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 124>;
+               gpio3: gpio@e6053000 {
+                       compatible = "renesas,gpio-r8a7794",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6053000 0 0x50>;
+                       interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 96 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 909>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 909>;
+               };
 
-               renesas,channels-mask = <0x60>;
+               gpio4: gpio@e6054000 {
+                       compatible = "renesas,gpio-r8a7794",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6054000 0 0x50>;
+                       interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 128 32>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 908>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 908>;
+               };
 
-               status = "disabled";
-       };
+               gpio5: gpio@e6055000 {
+                       compatible = "renesas,gpio-r8a7794",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6055000 0 0x50>;
+                       interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 160 28>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 907>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 907>;
+               };
 
-       cmt1: timer@e6130000 {
-               compatible = "renesas,cmt-48-gen2";
-               reg = <0 0xe6130000 0 0x1004>;
-               interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 329>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 329>;
-
-               renesas,channels-mask = <0xff>;
-
-               status = "disabled";
-       };
+               gpio6: gpio@e6055400 {
+                       compatible = "renesas,gpio-r8a7794",
+                                    "renesas,rcar-gen2-gpio";
+                       reg = <0 0xe6055400 0 0x50>;
+                       interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                       #gpio-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pfc 0 192 26>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       clocks = <&cpg CPG_MOD 905>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 905>;
+               };
 
-       timer {
-               compatible = "arm,armv7-timer";
-               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
-       };
+               pfc: pin-controller@e6060000 {
+                       compatible = "renesas,pfc-r8a7794";
+                       reg = <0 0xe6060000 0 0x11c>;
+               };
 
-       irqc0: interrupt-controller@e61c0000 {
-               compatible = "renesas,irqc-r8a7794", "renesas,irqc";
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               reg = <0 0xe61c0000 0 0x200>;
-               interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 407>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 407>;
-       };
+               cpg: clock-controller@e6150000 {
+                       compatible = "renesas,r8a7794-cpg-mssr";
+                       reg = <0 0xe6150000 0 0x1000>;
+                       clocks = <&extal_clk>, <&usb_extal_clk>;
+                       clock-names = "extal", "usb_extal";
+                       #clock-cells = <2>;
+                       #power-domain-cells = <0>;
+                       #reset-cells = <1>;
+               };
 
-       pfc: pin-controller@e6060000 {
-               compatible = "renesas,pfc-r8a7794";
-               reg = <0 0xe6060000 0 0x11c>;
-       };
+               apmu@e6151000 {
+                       compatible = "renesas,r8a7794-apmu", "renesas,apmu";
+                       reg = <0 0xe6151000 0 0x188>;
+                       cpus = <&cpu0 &cpu1>;
+               };
 
-       dmac0: dma-controller@e6700000 {
-               compatible = "renesas,dmac-r8a7794", "renesas,rcar-dmac";
-               reg = <0 0xe6700000 0 0x20000>;
-               interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12", "ch13", "ch14";
-               clocks = <&cpg CPG_MOD 219>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 219>;
-               #dma-cells = <1>;
-               dma-channels = <15>;
-       };
+               rst: reset-controller@e6160000 {
+                       compatible = "renesas,r8a7794-rst";
+                       reg = <0 0xe6160000 0 0x0100>;
+               };
 
-       dmac1: dma-controller@e6720000 {
-               compatible = "renesas,dmac-r8a7794", "renesas,rcar-dmac";
-               reg = <0 0xe6720000 0 0x20000>;
-               interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
-                             GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                               "ch0", "ch1", "ch2", "ch3",
-                               "ch4", "ch5", "ch6", "ch7",
-                               "ch8", "ch9", "ch10", "ch11",
-                               "ch12", "ch13", "ch14";
-               clocks = <&cpg CPG_MOD 218>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 218>;
-               #dma-cells = <1>;
-               dma-channels = <15>;
-       };
+               sysc: system-controller@e6180000 {
+                       compatible = "renesas,r8a7794-sysc";
+                       reg = <0 0xe6180000 0 0x0200>;
+                       #power-domain-cells = <1>;
+               };
 
-       audma0: dma-controller@ec700000 {
-               compatible = "renesas,dmac-r8a7794", "renesas,rcar-dmac";
-               reg = <0 0xec700000 0 0x10000>;
-               interrupts =    <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                                GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "error",
-                                 "ch0", "ch1", "ch2", "ch3", "ch4", "ch5",
-                                 "ch6", "ch7", "ch8", "ch9", "ch10", "ch11",
-                                 "ch12";
-               clocks = <&cpg CPG_MOD 502>;
-               clock-names = "fck";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 502>;
-               #dma-cells = <1>;
-               dma-channels = <13>;
-       };
+               irqc0: interrupt-controller@e61c0000 {
+                       compatible = "renesas,irqc-r8a7794", "renesas,irqc";
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
+                       reg = <0 0xe61c0000 0 0x200>;
+                       interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 407>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 407>;
+               };
 
-       scifa0: serial@e6c40000 {
-               compatible = "renesas,scifa-r8a7794",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c40000 0 64>;
-               interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 204>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x21>, <&dmac0 0x22>,
-                      <&dmac1 0x21>, <&dmac1 0x22>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 204>;
-               status = "disabled";
-       };
+               ipmmu_sy0: mmu@e6280000 {
+                       compatible = "renesas,ipmmu-r8a7794",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6280000 0 0x1000>;
+                       interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       scifa1: serial@e6c50000 {
-               compatible = "renesas,scifa-r8a7794",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c50000 0 64>;
-               interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 203>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x25>, <&dmac0 0x26>,
-                      <&dmac1 0x25>, <&dmac1 0x26>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 203>;
-               status = "disabled";
-       };
+               ipmmu_sy1: mmu@e6290000 {
+                       compatible = "renesas,ipmmu-r8a7794",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6290000 0 0x1000>;
+                       interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       scifa2: serial@e6c60000 {
-               compatible = "renesas,scifa-r8a7794",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c60000 0 64>;
-               interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 202>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x27>, <&dmac0 0x28>,
-                      <&dmac1 0x27>, <&dmac1 0x28>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 202>;
-               status = "disabled";
-       };
+               ipmmu_ds: mmu@e6740000 {
+                       compatible = "renesas,ipmmu-r8a7794",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe6740000 0 0x1000>;
+                       interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       scifa3: serial@e6c70000 {
-               compatible = "renesas,scifa-r8a7794",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c70000 0 64>;
-               interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 1106>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
-                      <&dmac1 0x1b>, <&dmac1 0x1c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 1106>;
-               status = "disabled";
-       };
+               ipmmu_mp: mmu@ec680000 {
+                       compatible = "renesas,ipmmu-r8a7794",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xec680000 0 0x1000>;
+                       interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       scifa4: serial@e6c78000 {
-               compatible = "renesas,scifa-r8a7794",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c78000 0 64>;
-               interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 1107>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
-                      <&dmac1 0x1f>, <&dmac1 0x20>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 1107>;
-               status = "disabled";
-       };
+               ipmmu_mx: mmu@fe951000 {
+                       compatible = "renesas,ipmmu-r8a7794",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xfe951000 0 0x1000>;
+                       interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       scifa5: serial@e6c80000 {
-               compatible = "renesas,scifa-r8a7794",
-                            "renesas,rcar-gen2-scifa", "renesas,scifa";
-               reg = <0 0xe6c80000 0 64>;
-               interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 1108>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x23>, <&dmac0 0x24>,
-                      <&dmac1 0x23>, <&dmac1 0x24>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 1108>;
-               status = "disabled";
-       };
+               ipmmu_gp: mmu@e62a0000 {
+                       compatible = "renesas,ipmmu-r8a7794",
+                                    "renesas,ipmmu-vmsa";
+                       reg = <0 0xe62a0000 0 0x1000>;
+                       interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+               };
 
-       scifb0: serial@e6c20000 {
-               compatible = "renesas,scifb-r8a7794",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c20000 0 0x100>;
-               interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 206>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
-                      <&dmac1 0x3d>, <&dmac1 0x3e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 206>;
-               status = "disabled";
-       };
+               icram0: sram@e63a0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63a0000 0 0x12000>;
+               };
 
-       scifb1: serial@e6c30000 {
-               compatible = "renesas,scifb-r8a7794",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c30000 0 0x100>;
-               interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 207>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
-                      <&dmac1 0x19>, <&dmac1 0x1a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 207>;
-               status = "disabled";
-       };
+               icram1: sram@e63c0000 {
+                       compatible = "mmio-sram";
+                       reg = <0 0xe63c0000 0 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0 0xe63c0000 0x1000>;
 
-       scifb2: serial@e6ce0000 {
-               compatible = "renesas,scifb-r8a7794",
-                            "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6ce0000 0 0x100>;
-               interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 216>;
-               clock-names = "fck";
-               dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
-                      <&dmac1 0x1d>, <&dmac1 0x1e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 216>;
-               status = "disabled";
-       };
+                       smp-sram@0 {
+                               compatible = "renesas,smp-sram";
+                               reg = <0 0x10>;
+                       };
+               };
 
-       scif0: serial@e6e60000 {
-               compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e60000 0 64>;
-               interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
-                      <&dmac1 0x29>, <&dmac1 0x2a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 721>;
-               status = "disabled";
-       };
+               /* The memory map in the User's Manual maps the cores to
+                * bus numbers
+                */
+               i2c0: i2c@e6508000 {
+                       compatible = "renesas,i2c-r8a7794",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6508000 0 0x40>;
+                       interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 931>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 931>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       scif1: serial@e6e68000 {
-               compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e68000 0 64>;
-               interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
-                      <&dmac1 0x2d>, <&dmac1 0x2e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 720>;
-               status = "disabled";
-       };
+               i2c1: i2c@e6518000 {
+                       compatible = "renesas,i2c-r8a7794",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6518000 0 0x40>;
+                       interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 930>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 930>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       scif2: serial@e6e58000 {
-               compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6e58000 0 64>;
-               interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
-                      <&dmac1 0x2b>, <&dmac1 0x2c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 719>;
-               status = "disabled";
-       };
+               i2c2: i2c@e6530000 {
+                       compatible = "renesas,i2c-r8a7794",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6530000 0 0x40>;
+                       interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 929>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 929>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       scif3: serial@e6ea8000 {
-               compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6ea8000 0 64>;
-               interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
-                      <&dmac1 0x2f>, <&dmac1 0x30>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 718>;
-               status = "disabled";
-       };
+               i2c3: i2c@e6540000 {
+                       compatible = "renesas,i2c-r8a7794",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6540000 0 0x40>;
+                       interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 928>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 928>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       scif4: serial@e6ee0000 {
-               compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6ee0000 0 64>;
-               interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
-                      <&dmac1 0xfb>, <&dmac1 0xfc>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 715>;
-               status = "disabled";
-       };
+               i2c4: i2c@e6520000 {
+                       compatible = "renesas,i2c-r8a7794",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6520000 0 0x40>;
+                       interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 927>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 927>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       scif5: serial@e6ee8000 {
-               compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                            "renesas,scif";
-               reg = <0 0xe6ee8000 0 64>;
-               interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
-                      <&dmac1 0xfd>, <&dmac1 0xfe>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 714>;
-               status = "disabled";
-       };
+               i2c5: i2c@e6528000 {
+                       compatible = "renesas,i2c-r8a7794",
+                                    "renesas,rcar-gen2-i2c";
+                       reg = <0 0xe6528000 0 0x40>;
+                       interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 925>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 925>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       i2c-scl-internal-delay-ns = <6>;
+                       status = "disabled";
+               };
 
-       hscif0: serial@e62c0000 {
-               compatible = "renesas,hscif-r8a7794",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62c0000 0 96>;
-               interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
-                      <&dmac1 0x39>, <&dmac1 0x3a>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 717>;
-               status = "disabled";
-       };
+               i2c6: i2c@e6500000 {
+                       compatible = "renesas,iic-r8a7794",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe6500000 0 0x425>;
+                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 318>;
+                       dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+                              <&dmac1 0x61>, <&dmac1 0x62>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 318>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       hscif1: serial@e62c8000 {
-               compatible = "renesas,hscif-r8a7794",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62c8000 0 96>;
-               interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
-                      <&dmac1 0x4d>, <&dmac1 0x4e>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 716>;
-               status = "disabled";
-       };
+               i2c7: i2c@e6510000 {
+                       compatible = "renesas,iic-r8a7794",
+                                    "renesas,rcar-gen2-iic",
+                                    "renesas,rmobile-iic";
+                       reg = <0 0xe6510000 0 0x425>;
+                       interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 323>;
+                       dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+                              <&dmac1 0x65>, <&dmac1 0x66>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 323>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       hscif2: serial@e62d0000 {
-               compatible = "renesas,hscif-r8a7794",
-                            "renesas,rcar-gen2-hscif", "renesas,hscif";
-               reg = <0 0xe62d0000 0 96>;
-               interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                        <&scif_clk>;
-               clock-names = "fck", "brg_int", "scif_clk";
-               dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
-                      <&dmac1 0x3b>, <&dmac1 0x3c>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 713>;
-               status = "disabled";
-       };
+               hsusb: usb@e6590000 {
+                       compatible = "renesas,usbhs-r8a7794",
+                                    "renesas,rcar-gen2-usbhs";
+                       reg = <0 0xe6590000 0 0x100>;
+                       interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 704>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 704>;
+                       renesas,buswait = <4>;
+                       phys = <&usb0 1>;
+                       phy-names = "usb";
+                       status = "disabled";
+               };
 
-       icram0: sram@e63a0000 {
-               compatible = "mmio-sram";
-               reg = <0 0xe63a0000 0 0x12000>;
-       };
+               usbphy: usb-phy@e6590100 {
+                       compatible = "renesas,usb-phy-r8a7794",
+                                    "renesas,rcar-gen2-usb-phy";
+                       reg = <0 0xe6590100 0 0x100>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       clocks = <&cpg CPG_MOD 704>;
+                       clock-names = "usbhs";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 704>;
+                       status = "disabled";
 
-       icram1: sram@e63c0000 {
-               compatible = "mmio-sram";
-               reg = <0 0xe63c0000 0 0x1000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges = <0 0 0xe63c0000 0x1000>;
+                       usb0: usb-channel@0 {
+                               reg = <0>;
+                               #phy-cells = <1>;
+                       };
+                       usb2: usb-channel@2 {
+                               reg = <2>;
+                               #phy-cells = <1>;
+                       };
+               };
 
-               smp-sram@0 {
-                       compatible = "renesas,smp-sram";
-                       reg = <0 0x10>;
+               dmac0: dma-controller@e6700000 {
+                       compatible = "renesas,dmac-r8a7794",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe6700000 0 0x20000>;
+                       interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12", "ch13", "ch14";
+                       clocks = <&cpg CPG_MOD 219>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 219>;
+                       #dma-cells = <1>;
+                       dma-channels = <15>;
                };
-       };
 
-       ether: ethernet@ee700000 {
-               compatible = "renesas,ether-r8a7794";
-               reg = <0 0xee700000 0 0x400>;
-               interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 813>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 813>;
-               phy-mode = "rmii";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               dmac1: dma-controller@e6720000 {
+                       compatible = "renesas,dmac-r8a7794",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xe6720000 0 0x20000>;
+                       interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch11",
+                                         "ch12", "ch13", "ch14";
+                       clocks = <&cpg CPG_MOD 218>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 218>;
+                       #dma-cells = <1>;
+                       dma-channels = <15>;
+               };
 
-       avb: ethernet@e6800000 {
-               compatible = "renesas,etheravb-r8a7794",
-                            "renesas,etheravb-rcar-gen2";
-               reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-               interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 812>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 812>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               avb: ethernet@e6800000 {
+                       compatible = "renesas,etheravb-r8a7794",
+                                    "renesas,etheravb-rcar-gen2";
+                       reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                       interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 812>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 812>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       /* The memory map in the User's Manual maps the cores to bus numbers */
-       i2c0: i2c@e6508000 {
-               compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6508000 0 0x40>;
-               interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 931>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 931>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               qspi: spi@e6b10000 {
+                       compatible = "renesas,qspi-r8a7794", "renesas,qspi";
+                       reg = <0 0xe6b10000 0 0x2c>;
+                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 917>;
+                       dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                              <&dmac1 0x17>, <&dmac1 0x18>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 917>;
+                       num-cs = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       i2c1: i2c@e6518000 {
-               compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6518000 0 0x40>;
-               interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 930>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 930>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               scifa0: serial@e6c40000 {
+                       compatible = "renesas,scifa-r8a7794",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c40000 0 64>;
+                       interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 204>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x21>, <&dmac0 0x22>,
+                              <&dmac1 0x21>, <&dmac1 0x22>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 204>;
+                       status = "disabled";
+               };
 
-       i2c2: i2c@e6530000 {
-               compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6530000 0 0x40>;
-               interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 929>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 929>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               scifa1: serial@e6c50000 {
+                       compatible = "renesas,scifa-r8a7794",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c50000 0 64>;
+                       interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 203>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x25>, <&dmac0 0x26>,
+                              <&dmac1 0x25>, <&dmac1 0x26>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 203>;
+                       status = "disabled";
+               };
 
-       i2c3: i2c@e6540000 {
-               compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6540000 0 0x40>;
-               interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 928>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 928>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               scifa2: serial@e6c60000 {
+                       compatible = "renesas,scifa-r8a7794",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c60000 0 64>;
+                       interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 202>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x27>, <&dmac0 0x28>,
+                              <&dmac1 0x27>, <&dmac1 0x28>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 202>;
+                       status = "disabled";
+               };
 
-       i2c4: i2c@e6520000 {
-               compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6520000 0 0x40>;
-               interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 927>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 927>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               scifa3: serial@e6c70000 {
+                       compatible = "renesas,scifa-r8a7794",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c70000 0 64>;
+                       interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 1106>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
+                              <&dmac1 0x1b>, <&dmac1 0x1c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 1106>;
+                       status = "disabled";
+               };
 
-       i2c5: i2c@e6528000 {
-               compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-               reg = <0 0xe6528000 0 0x40>;
-               interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 925>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 925>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               i2c-scl-internal-delay-ns = <6>;
-               status = "disabled";
-       };
+               scifa4: serial@e6c78000 {
+                       compatible = "renesas,scifa-r8a7794",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c78000 0 64>;
+                       interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 1107>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
+                              <&dmac1 0x1f>, <&dmac1 0x20>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 1107>;
+                       status = "disabled";
+               };
 
-       i2c6: i2c@e6500000 {
-               compatible = "renesas,iic-r8a7794", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe6500000 0 0x425>;
-               interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 318>;
-               dmas = <&dmac0 0x61>, <&dmac0 0x62>,
-                      <&dmac1 0x61>, <&dmac1 0x62>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 318>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               scifa5: serial@e6c80000 {
+                       compatible = "renesas,scifa-r8a7794",
+                                    "renesas,rcar-gen2-scifa", "renesas,scifa";
+                       reg = <0 0xe6c80000 0 64>;
+                       interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 1108>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x23>, <&dmac0 0x24>,
+                              <&dmac1 0x23>, <&dmac1 0x24>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 1108>;
+                       status = "disabled";
+               };
 
-       i2c7: i2c@e6510000 {
-               compatible = "renesas,iic-r8a7794", "renesas,rcar-gen2-iic",
-                            "renesas,rmobile-iic";
-               reg = <0 0xe6510000 0 0x425>;
-               interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 323>;
-               dmas = <&dmac0 0x65>, <&dmac0 0x66>,
-                      <&dmac1 0x65>, <&dmac1 0x66>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 323>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               scifb0: serial@e6c20000 {
+                       compatible = "renesas,scifb-r8a7794",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6c20000 0 0x100>;
+                       interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 206>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
+                              <&dmac1 0x3d>, <&dmac1 0x3e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 206>;
+                       status = "disabled";
+               };
 
-       mmcif0: mmc@ee200000 {
-               compatible = "renesas,mmcif-r8a7794", "renesas,sh-mmcif";
-               reg = <0 0xee200000 0 0x80>;
-               interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 315>;
-               dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                      <&dmac1 0xd1>, <&dmac1 0xd2>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 315>;
-               reg-io-width = <4>;
-               status = "disabled";
-       };
+               scifb1: serial@e6c30000 {
+                       compatible = "renesas,scifb-r8a7794",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6c30000 0 0x100>;
+                       interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 207>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
+                              <&dmac1 0x19>, <&dmac1 0x1a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 207>;
+                       status = "disabled";
+               };
 
-       sdhi0: sd@ee100000 {
-               compatible = "renesas,sdhi-r8a7794";
-               reg = <0 0xee100000 0 0x328>;
-               interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 314>;
-               dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                      <&dmac1 0xcd>, <&dmac1 0xce>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <195000000>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 314>;
-               status = "disabled";
-       };
+               scifb2: serial@e6ce0000 {
+                       compatible = "renesas,scifb-r8a7794",
+                                    "renesas,rcar-gen2-scifb", "renesas,scifb";
+                       reg = <0 0xe6ce0000 0 0x100>;
+                       interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 216>;
+                       clock-names = "fck";
+                       dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
+                              <&dmac1 0x1d>, <&dmac1 0x1e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 216>;
+                       status = "disabled";
+               };
 
-       sdhi1: sd@ee140000 {
-               compatible = "renesas,sdhi-r8a7794";
-               reg = <0 0xee140000 0 0x100>;
-               interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 312>;
-               dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                      <&dmac1 0xc1>, <&dmac1 0xc2>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <97500000>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 312>;
-               status = "disabled";
-       };
+               scif0: serial@e6e60000 {
+                       compatible = "renesas,scif-r8a7794",
+                                    "renesas,rcar-gen2-scif",
+                                    "renesas,scif";
+                       reg = <0 0xe6e60000 0 64>;
+                       interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
+                              <&dmac1 0x29>, <&dmac1 0x2a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 721>;
+                       status = "disabled";
+               };
 
-       sdhi2: sd@ee160000 {
-               compatible = "renesas,sdhi-r8a7794";
-               reg = <0 0xee160000 0 0x100>;
-               interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 311>;
-               dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                      <&dmac1 0xd3>, <&dmac1 0xd4>;
-               dma-names = "tx", "rx", "tx", "rx";
-               max-frequency = <97500000>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 311>;
-               status = "disabled";
-       };
+               scif1: serial@e6e68000 {
+                       compatible = "renesas,scif-r8a7794",
+                                    "renesas,rcar-gen2-scif",
+                                    "renesas,scif";
+                       reg = <0 0xe6e68000 0 64>;
+                       interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
+                              <&dmac1 0x2d>, <&dmac1 0x2e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 720>;
+                       status = "disabled";
+               };
 
-       qspi: spi@e6b10000 {
-               compatible = "renesas,qspi-r8a7794", "renesas,qspi";
-               reg = <0 0xe6b10000 0 0x2c>;
-               interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 917>;
-               dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                      <&dmac1 0x17>, <&dmac1 0x18>;
-               dma-names = "tx", "rx", "tx", "rx";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 917>;
-               num-cs = <1>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
+               scif2: serial@e6e58000 {
+                       compatible = "renesas,scif-r8a7794",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6e58000 0 64>;
+                       interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
+                              <&dmac1 0x2b>, <&dmac1 0x2c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 719>;
+                       status = "disabled";
+               };
 
-       vin0: video@e6ef0000 {
-               compatible = "renesas,vin-r8a7794", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef0000 0 0x1000>;
-               interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 811>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 811>;
-               status = "disabled";
-       };
+               scif3: serial@e6ea8000 {
+                       compatible = "renesas,scif-r8a7794",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6ea8000 0 64>;
+                       interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
+                              <&dmac1 0x2f>, <&dmac1 0x30>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 718>;
+                       status = "disabled";
+               };
 
-       vin1: video@e6ef1000 {
-               compatible = "renesas,vin-r8a7794", "renesas,rcar-gen2-vin";
-               reg = <0 0xe6ef1000 0 0x1000>;
-               interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 810>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 810>;
-               status = "disabled";
-       };
+               scif4: serial@e6ee0000 {
+                       compatible = "renesas,scif-r8a7794",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6ee0000 0 64>;
+                       interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
+                              <&dmac1 0xfb>, <&dmac1 0xfc>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 715>;
+                       status = "disabled";
+               };
 
-       pci0: pci@ee090000 {
-               compatible = "renesas,pci-r8a7794", "renesas,pci-rcar-gen2";
-               device_type = "pci";
-               reg = <0 0xee090000 0 0xc00>,
-                     <0 0xee080000 0 0x1100>;
-               interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 703>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 703>;
-               status = "disabled";
-
-               bus-range = <0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               #interrupt-cells = <1>;
-               ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
-               interrupt-map-mask = <0xff00 0 0 0x7>;
-               interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-
-               usb@1,0 {
-                       reg = <0x800 0 0 0 0>;
-                       phys = <&usb0 0>;
-                       phy-names = "usb";
+               scif5: serial@e6ee8000 {
+                       compatible = "renesas,scif-r8a7794",
+                                    "renesas,rcar-gen2-scif", "renesas,scif";
+                       reg = <0 0xe6ee8000 0 64>;
+                       interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
+                              <&dmac1 0xfd>, <&dmac1 0xfe>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 714>;
+                       status = "disabled";
                };
 
-               usb@2,0 {
-                       reg = <0x1000 0 0 0 0>;
-                       phys = <&usb0 0>;
-                       phy-names = "usb";
+               hscif0: serial@e62c0000 {
+                       compatible = "renesas,hscif-r8a7794",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62c0000 0 96>;
+                       interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 717>,
+                                <&cpg CPG_CORE R8A7794_CLK_ZS>, <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
+                              <&dmac1 0x39>, <&dmac1 0x3a>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 717>;
+                       status = "disabled";
                };
-       };
 
-       pci1: pci@ee0d0000 {
-               compatible = "renesas,pci-r8a7794", "renesas,pci-rcar-gen2";
-               device_type = "pci";
-               reg = <0 0xee0d0000 0 0xc00>,
-                     <0 0xee0c0000 0 0x1100>;
-               interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 703>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 703>;
-               status = "disabled";
-
-               bus-range = <1 1>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               #interrupt-cells = <1>;
-               ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
-               interrupt-map-mask = <0xff00 0 0 0x7>;
-               interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-
-               usb@1,0 {
-                       reg = <0x10800 0 0 0 0>;
-                       phys = <&usb2 0>;
-                       phy-names = "usb";
+               hscif1: serial@e62c8000 {
+                       compatible = "renesas,hscif-r8a7794",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62c8000 0 96>;
+                       interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 716>,
+                                <&cpg CPG_CORE R8A7794_CLK_ZS>, <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
+                              <&dmac1 0x4d>, <&dmac1 0x4e>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 716>;
+                       status = "disabled";
                };
 
-               usb@2,0 {
-                       reg = <0x11000 0 0 0 0>;
-                       phys = <&usb2 0>;
-                       phy-names = "usb";
+               hscif2: serial@e62d0000 {
+                       compatible = "renesas,hscif-r8a7794",
+                                    "renesas,rcar-gen2-hscif", "renesas,hscif";
+                       reg = <0 0xe62d0000 0 96>;
+                       interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                <&scif_clk>;
+                       clock-names = "fck", "brg_int", "scif_clk";
+                       dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
+                              <&dmac1 0x3b>, <&dmac1 0x3c>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 713>;
+                       status = "disabled";
                };
-       };
 
-       hsusb: usb@e6590000 {
-               compatible = "renesas,usbhs-r8a7794", "renesas,rcar-gen2-usbhs";
-               reg = <0 0xe6590000 0 0x100>;
-               interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 704>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 704>;
-               renesas,buswait = <4>;
-               phys = <&usb0 1>;
-               phy-names = "usb";
-               status = "disabled";
-       };
+               can0: can@e6e80000 {
+                       compatible = "renesas,can-r8a7794",
+                                    "renesas,rcar-gen2-can";
+                       reg = <0 0xe6e80000 0 0x1000>;
+                       interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7794_CLK_RCAN>,
+                                <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 916>;
+                       status = "disabled";
+               };
 
-       usbphy: usb-phy@e6590100 {
-               compatible = "renesas,usb-phy-r8a7794",
-                            "renesas,rcar-gen2-usb-phy";
-               reg = <0 0xe6590100 0 0x100>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               clocks = <&cpg CPG_MOD 704>;
-               clock-names = "usbhs";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 704>;
-               status = "disabled";
+               can1: can@e6e88000 {
+                       compatible = "renesas,can-r8a7794",
+                                    "renesas,rcar-gen2-can";
+                       reg = <0 0xe6e88000 0 0x1000>;
+                       interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7794_CLK_RCAN>,
+                                <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 915>;
+                       status = "disabled";
+               };
 
-               usb0: usb-channel@0 {
-                       reg = <0>;
-                       #phy-cells = <1>;
+               vin0: video@e6ef0000 {
+                       compatible = "renesas,vin-r8a7794",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef0000 0 0x1000>;
+                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 811>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 811>;
+                       status = "disabled";
                };
-               usb2: usb-channel@2 {
-                       reg = <2>;
-                       #phy-cells = <1>;
+
+               vin1: video@e6ef1000 {
+                       compatible = "renesas,vin-r8a7794",
+                                    "renesas,rcar-gen2-vin";
+                       reg = <0 0xe6ef1000 0 0x1000>;
+                       interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 810>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 810>;
+                       status = "disabled";
                };
-       };
 
-       vsp@fe928000 {
-               compatible = "renesas,vsp1";
-               reg = <0 0xfe928000 0 0x8000>;
-               interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 131>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 131>;
-       };
+               rcar_sound: sound@ec500000 {
+                       /*
+                        * #sound-dai-cells is required
+                        *
+                        * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
+                        * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
+                        */
+                       compatible = "renesas,rcar_sound-r8a7794",
+                                    "renesas,rcar_sound-gen2";
+                       reg = <0 0xec500000 0 0x1000>, /* SCU */
+                             <0 0xec5a0000 0 0x100>,  /* ADG */
+                             <0 0xec540000 0 0x1000>, /* SSIU */
+                             <0 0xec541000 0 0x280>,  /* SSI */
+                             <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri */
+                       reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+
+                       clocks = <&cpg CPG_MOD 1005>,
+                                <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
+                                <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
+                                <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
+                                <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
+                                <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
+                                <&cpg CPG_MOD 1025>, <&cpg CPG_MOD 1026>,
+                                <&cpg CPG_MOD 1027>, <&cpg CPG_MOD 1028>,
+                                <&cpg CPG_MOD 1029>, <&cpg CPG_MOD 1030>,
+                                <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
+                                <&audio_clka>, <&audio_clkb>, <&audio_clkc>,
+                                <&cpg CPG_CORE R8A7794_CLK_M2>;
+                       clock-names = "ssi-all",
+                                     "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                     "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                     "ssi.1", "ssi.0",
+                                     "src.6", "src.5", "src.4", "src.3",
+                                     "src.2", "src.1",
+                                     "ctu.0", "ctu.1",
+                                     "mix.0", "mix.1",
+                                     "dvc.0", "dvc.1",
+                                     "clk_a", "clk_b", "clk_c", "clk_i";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 1005>,
+                                <&cpg 1006>, <&cpg 1007>,
+                                <&cpg 1008>, <&cpg 1009>,
+                                <&cpg 1010>, <&cpg 1011>,
+                                <&cpg 1012>, <&cpg 1013>,
+                                <&cpg 1014>, <&cpg 1015>;
+                       reset-names = "ssi-all",
+                                     "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                     "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                     "ssi.1", "ssi.0";
+
+                       status = "disabled";
+
+                       rcar_sound,dvc {
+                               dvc0: dvc-0 {
+                                       dmas = <&audma0 0xbc>;
+                                       dma-names = "tx";
+                               };
+                               dvc1: dvc-1 {
+                                       dmas = <&audma0 0xbe>;
+                                       dma-names = "tx";
+                               };
+                       };
 
-       vsp@fe930000 {
-               compatible = "renesas,vsp1";
-               reg = <0 0xfe930000 0 0x8000>;
-               interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 128>;
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 128>;
-       };
+                       rcar_sound,mix {
+                               mix0: mix-0 { };
+                               mix1: mix-1 { };
+                       };
 
-       du: display@feb00000 {
-               compatible = "renesas,du-r8a7794";
-               reg = <0 0xfeb00000 0 0x40000>;
-               reg-names = "du";
-               interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
-               clock-names = "du.0", "du.1";
-               status = "disabled";
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+                       rcar_sound,ctu {
+                               ctu00: ctu-0 { };
+                               ctu01: ctu-1 { };
+                               ctu02: ctu-2 { };
+                               ctu03: ctu-3 { };
+                               ctu10: ctu-4 { };
+                               ctu11: ctu-5 { };
+                               ctu12: ctu-6 { };
+                               ctu13: ctu-7 { };
+                       };
 
-                       port@0 {
-                               reg = <0>;
-                               du_out_rgb0: endpoint {
+                       rcar_sound,src {
+                               src-0 {
+                                       status = "disabled";
+                               };
+                               src1: src-1 {
+                                       interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x87>, <&audma0 0x9c>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src2: src-2 {
+                                       interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x89>, <&audma0 0x9e>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src3: src-3 {
+                                       interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8b>, <&audma0 0xa0>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src4: src-4 {
+                                       interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8d>, <&audma0 0xb0>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src5: src-5 {
+                                       interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x8f>, <&audma0 0xb2>;
+                                       dma-names = "rx", "tx";
+                               };
+                               src6: src-6 {
+                                       interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x91>, <&audma0 0xb4>;
+                                       dma-names = "rx", "tx";
                                };
                        };
-                       port@1 {
-                               reg = <1>;
-                               du_out_rgb1: endpoint {
+
+                       rcar_sound,ssi {
+                               ssi0: ssi-0 {
+                                       interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x01>, <&audma0 0x02>,
+                                              <&audma0 0x15>, <&audma0 0x16>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi1: ssi-1 {
+                                       interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x03>, <&audma0 0x04>,
+                                              <&audma0 0x49>, <&audma0 0x4a>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi2: ssi-2 {
+                                       interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x05>, <&audma0 0x06>,
+                                              <&audma0 0x63>, <&audma0 0x64>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi3: ssi-3 {
+                                       interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x07>, <&audma0 0x08>,
+                                              <&audma0 0x6f>, <&audma0 0x70>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi4: ssi-4 {
+                                       interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x09>, <&audma0 0x0a>,
+                                              <&audma0 0x71>, <&audma0 0x72>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi5: ssi-5 {
+                                       interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0b>, <&audma0 0x0c>,
+                                              <&audma0 0x73>, <&audma0 0x74>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi6: ssi-6 {
+                                       interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0d>, <&audma0 0x0e>,
+                                              <&audma0 0x75>, <&audma0 0x76>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi7: ssi-7 {
+                                       interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x0f>, <&audma0 0x10>,
+                                              <&audma0 0x79>, <&audma0 0x7a>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi8: ssi-8 {
+                                       interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x11>, <&audma0 0x12>,
+                                              <&audma0 0x7b>, <&audma0 0x7c>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
+                               };
+                               ssi9: ssi-9 {
+                                       interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
+                                       dmas = <&audma0 0x13>, <&audma0 0x14>,
+                                              <&audma0 0x7d>, <&audma0 0x7e>;
+                                       dma-names = "rx", "tx", "rxu", "txu";
                                };
                        };
                };
-       };
-
-       can0: can@e6e80000 {
-               compatible = "renesas,can-r8a7794", "renesas,rcar-gen2-can";
-               reg = <0 0xe6e80000 0 0x1000>;
-               interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7794_CLK_RCAN>,
-                        <&can_clk>;
-               clock-names = "clkp1", "clkp2", "can_clk";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 916>;
-               status = "disabled";
-       };
 
-       can1: can@e6e88000 {
-               compatible = "renesas,can-r8a7794", "renesas,rcar-gen2-can";
-               reg = <0 0xe6e88000 0 0x1000>;
-               interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7794_CLK_RCAN>,
-                        <&can_clk>;
-               clock-names = "clkp1", "clkp2", "can_clk";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 915>;
-               status = "disabled";
-       };
-
-       /* External root clock */
-       extal_clk: extal {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
-
-       /* External USB clock - can be overridden by the board */
-       usb_extal_clk: usb_extal {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <48000000>;
-       };
-
-       /* External CAN clock */
-       can_clk: can {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+               audma0: dma-controller@ec700000 {
+                       compatible = "renesas,dmac-r8a7794",
+                                    "renesas,rcar-dmac";
+                       reg = <0 0xec700000 0 0x10000>;
+                       interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                     GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3", "ch4",
+                                         "ch5", "ch6", "ch7", "ch8", "ch9",
+                                         "ch10", "ch11",
+                                         "ch12";
+                       clocks = <&cpg CPG_MOD 502>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 502>;
+                       #dma-cells = <1>;
+                       dma-channels = <13>;
+               };
 
-       /* External SCIF clock */
-       scif_clk: scif {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               /* This value must be overridden by the board. */
-               clock-frequency = <0>;
-       };
+               pci0: pci@ee090000 {
+                       compatible = "renesas,pci-r8a7794",
+                                    "renesas,pci-rcar-gen2";
+                       device_type = "pci";
+                       reg = <0 0xee090000 0 0xc00>,
+                             <0 0xee080000 0 0x1100>;
+                       interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 703>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
+                       status = "disabled";
+
+                       bus-range = <0 0>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                       interrupt-map-mask = <0xff00 0 0 0x7>;
+                       interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                        0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                        0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+
+                       usb@1,0 {
+                               reg = <0x800 0 0 0 0>;
+                               phys = <&usb0 0>;
+                               phy-names = "usb";
+                       };
 
-       /*
-        * The external audio clocks are configured  as 0 Hz fixed
-        * frequency clocks by default.  Boards that provide audio
-        * clocks should override them.
-        */
-       audio_clka: audio_clka {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
-       audio_clkb: audio_clkb {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
-       audio_clkc: audio_clkc {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <0>;
-       };
+                       usb@2,0 {
+                               reg = <0x1000 0 0 0 0>;
+                               phys = <&usb0 0>;
+                               phy-names = "usb";
+                       };
+               };
 
-       cpg: clock-controller@e6150000 {
-               compatible = "renesas,r8a7794-cpg-mssr";
-               reg = <0 0xe6150000 0 0x1000>;
-               clocks = <&extal_clk>, <&usb_extal_clk>;
-               clock-names = "extal", "usb_extal";
-               #clock-cells = <2>;
-               #power-domain-cells = <0>;
-               #reset-cells = <1>;
-       };
+               pci1: pci@ee0d0000 {
+                       compatible = "renesas,pci-r8a7794",
+                                    "renesas,pci-rcar-gen2";
+                       device_type = "pci";
+                       reg = <0 0xee0d0000 0 0xc00>,
+                             <0 0xee0c0000 0 0x1100>;
+                       interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 703>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
+                       status = "disabled";
+
+                       bus-range = <1 1>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       #interrupt-cells = <1>;
+                       ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                       interrupt-map-mask = <0xff00 0 0 0x7>;
+                       interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                        0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                        0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+
+                       usb@1,0 {
+                               reg = <0x10800 0 0 0 0>;
+                               phys = <&usb2 0>;
+                               phy-names = "usb";
+                       };
 
-       rst: reset-controller@e6160000 {
-               compatible = "renesas,r8a7794-rst";
-               reg = <0 0xe6160000 0 0x0100>;
-       };
+                       usb@2,0 {
+                               reg = <0x11000 0 0 0 0>;
+                               phys = <&usb2 0>;
+                               phy-names = "usb";
+                       };
+               };
 
-       prr: chipid@ff000044 {
-               compatible = "renesas,prr";
-               reg = <0 0xff000044 0 4>;
-       };
+               sdhi0: sd@ee100000 {
+                       compatible = "renesas,sdhi-r8a7794",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee100000 0 0x328>;
+                       interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 314>;
+                       dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                              <&dmac1 0xcd>, <&dmac1 0xce>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <195000000>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 314>;
+                       status = "disabled";
+               };
 
-       sysc: system-controller@e6180000 {
-               compatible = "renesas,r8a7794-sysc";
-               reg = <0 0xe6180000 0 0x0200>;
-               #power-domain-cells = <1>;
-       };
+               sdhi1: sd@ee140000 {
+                       compatible = "renesas,sdhi-r8a7794",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee140000 0 0x100>;
+                       interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 312>;
+                       dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                              <&dmac1 0xc1>, <&dmac1 0xc2>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <97500000>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 312>;
+                       status = "disabled";
+               };
 
-       ipmmu_sy0: mmu@e6280000 {
-               compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6280000 0 0x1000>;
-               interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               sdhi2: sd@ee160000 {
+                       compatible = "renesas,sdhi-r8a7794",
+                                    "renesas,rcar-gen2-sdhi";
+                       reg = <0 0xee160000 0 0x100>;
+                       interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 311>;
+                       dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                              <&dmac1 0xd3>, <&dmac1 0xd4>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       max-frequency = <97500000>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 311>;
+                       status = "disabled";
+               };
 
-       ipmmu_sy1: mmu@e6290000 {
-               compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6290000 0 0x1000>;
-               interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               mmcif0: mmc@ee200000 {
+                       compatible = "renesas,mmcif-r8a7794",
+                                    "renesas,sh-mmcif";
+                       reg = <0 0xee200000 0 0x80>;
+                       interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 315>;
+                       dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                              <&dmac1 0xd1>, <&dmac1 0xd2>;
+                       dma-names = "tx", "rx", "tx", "rx";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 315>;
+                       reg-io-width = <4>;
+                       status = "disabled";
+               };
 
-       ipmmu_ds: mmu@e6740000 {
-               compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-               reg = <0 0xe6740000 0 0x1000>;
-               interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               ether: ethernet@ee700000 {
+                       compatible = "renesas,ether-r8a7794",
+                                    "renesas,rcar-gen2-ether";
+                       reg = <0 0xee700000 0 0x400>;
+                       interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 813>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 813>;
+                       phy-mode = "rmii";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
 
-       ipmmu_mp: mmu@ec680000 {
-               compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-               reg = <0 0xec680000 0 0x1000>;
-               interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               gic: interrupt-controller@f1001000 {
+                       compatible = "arm,gic-400";
+                       #interrupt-cells = <3>;
+                       #address-cells = <0>;
+                       interrupt-controller;
+                       reg = <0 0xf1001000 0 0x1000>,
+                             <0 0xf1002000 0 0x2000>,
+                             <0 0xf1004000 0 0x2000>,
+                             <0 0xf1006000 0 0x2000>;
+                       interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                       clocks = <&cpg CPG_MOD 408>;
+                       clock-names = "clk";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 408>;
+               };
 
-       ipmmu_mx: mmu@fe951000 {
-               compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-               reg = <0 0xfe951000 0 0x1000>;
-               interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               vsp@fe928000 {
+                       compatible = "renesas,vsp1";
+                       reg = <0 0xfe928000 0 0x8000>;
+                       interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 131>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 131>;
+               };
 
-       ipmmu_gp: mmu@e62a0000 {
-               compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-               reg = <0 0xe62a0000 0 0x1000>;
-               interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
-               #iommu-cells = <1>;
-               status = "disabled";
-       };
+               vsp@fe930000 {
+                       compatible = "renesas,vsp1";
+                       reg = <0 0xfe930000 0 0x8000>;
+                       interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 128>;
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 128>;
+               };
 
-       rcar_sound: sound@ec500000 {
-               /*
-                * #sound-dai-cells is required
-                *
-                * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
-                * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
-                */
-               compatible = "renesas,rcar_sound-r8a7794",
-                            "renesas,rcar_sound-gen2";
-               reg =   <0 0xec500000 0 0x1000>, /* SCU */
-                       <0 0xec5a0000 0 0x100>,  /* ADG */
-                       <0 0xec540000 0 0x1000>, /* SSIU */
-                       <0 0xec541000 0 0x280>,  /* SSI */
-                       <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri */
-               reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
-
-               clocks = <&cpg CPG_MOD 1005>,
-                        <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-                        <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
-                        <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
-                        <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
-                        <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
-                        <&cpg CPG_MOD 1025>, <&cpg CPG_MOD 1026>,
-                        <&cpg CPG_MOD 1027>, <&cpg CPG_MOD 1028>,
-                        <&cpg CPG_MOD 1029>, <&cpg CPG_MOD 1030>,
-                        <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                        <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                        <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
-                        <&audio_clka>, <&audio_clkb>, <&audio_clkc>,
-                        <&cpg CPG_CORE R8A7794_CLK_M2>;
-               clock-names = "ssi-all",
-                             "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                             "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
-                             "src.6", "src.5", "src.4", "src.3", "src.2",
-                             "src.1",
-                             "ctu.0", "ctu.1",
-                             "mix.0", "mix.1",
-                             "dvc.0", "dvc.1",
-                             "clk_a", "clk_b", "clk_c", "clk_i";
-               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-               resets = <&cpg 1005>,
-                        <&cpg 1006>, <&cpg 1007>, <&cpg 1008>, <&cpg 1009>,
-                        <&cpg 1010>, <&cpg 1011>, <&cpg 1012>, <&cpg 1013>,
-                        <&cpg 1014>, <&cpg 1015>;
-               reset-names = "ssi-all",
-                             "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                             "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0";
-
-               status = "disabled";
-
-               rcar_sound,dvc {
-                       dvc0: dvc-0 {
-                               dmas = <&audma0 0xbc>;
-                               dma-names = "tx";
-                       };
-                       dvc1: dvc-1 {
-                               dmas = <&audma0 0xbe>;
-                               dma-names = "tx";
+               du: display@feb00000 {
+                       compatible = "renesas,du-r8a7794";
+                       reg = <0 0xfeb00000 0 0x40000>;
+                       reg-names = "du";
+                       interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
+                       clock-names = "du.0", "du.1";
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       du_out_rgb0: endpoint {
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       du_out_rgb1: endpoint {
+                                       };
+                               };
                        };
                };
 
-               rcar_sound,mix {
-                       mix0: mix-0 { };
-                       mix1: mix-1 { };
+               prr: chipid@ff000044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xff000044 0 4>;
                };
 
-               rcar_sound,ctu {
-                       ctu00: ctu-0 { };
-                       ctu01: ctu-1 { };
-                       ctu02: ctu-2 { };
-                       ctu03: ctu-3 { };
-                       ctu10: ctu-4 { };
-                       ctu11: ctu-5 { };
-                       ctu12: ctu-6 { };
-                       ctu13: ctu-7 { };
+               cmt0: timer@ffca0000 {
+                       compatible = "renesas,r8a7794-cmt0",
+                                    "renesas,rcar-gen2-cmt0";
+                       reg = <0 0xffca0000 0 0x1004>;
+                       interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 124>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 124>;
+
+                       status = "disabled";
                };
 
-               rcar_sound,src {
-                       src-0 {
-                               status = "disabled";
-                       };
-                       src1: src-1 {
-                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x87>, <&audma0 0x9c>;
-                               dma-names = "rx", "tx";
-                       };
-                       src2: src-2 {
-                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x89>, <&audma0 0x9e>;
-                               dma-names = "rx", "tx";
-                       };
-                       src3: src-3 {
-                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8b>, <&audma0 0xa0>;
-                               dma-names = "rx", "tx";
-                       };
-                       src4: src-4 {
-                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8d>, <&audma0 0xb0>;
-                               dma-names = "rx", "tx";
-                       };
-                       src5: src-5 {
-                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x8f>, <&audma0 0xb2>;
-                               dma-names = "rx", "tx";
-                       };
-                       src6: src-6 {
-                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x91>, <&audma0 0xb4>;
-                               dma-names = "rx", "tx";
-                       };
+               cmt1: timer@e6130000 {
+                       compatible = "renesas,r8a7794-cmt1",
+                                    "renesas,rcar-gen2-cmt1";
+                       reg = <0 0xe6130000 0 0x1004>;
+                       interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 329>;
+                       clock-names = "fck";
+                       power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                       resets = <&cpg 329>;
+
+                       status = "disabled";
                };
+       };
 
-               rcar_sound,ssi {
-                       ssi0: ssi-0 {
-                               interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x01>, <&audma0 0x02>,
-                                      <&audma0 0x15>, <&audma0 0x16>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi1: ssi-1 {
-                               interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x03>, <&audma0 0x04>,
-                                      <&audma0 0x49>, <&audma0 0x4a>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi2: ssi-2 {
-                               interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x05>, <&audma0 0x06>,
-                                      <&audma0 0x63>, <&audma0 0x64>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi3: ssi-3 {
-                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x07>, <&audma0 0x08>,
-                                      <&audma0 0x6f>, <&audma0 0x70>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi4: ssi-4 {
-                               interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x09>, <&audma0 0x0a>,
-                                      <&audma0 0x71>, <&audma0 0x72>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi5: ssi-5 {
-                               interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0b>, <&audma0 0x0c>,
-                                      <&audma0 0x73>, <&audma0 0x74>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi6: ssi-6 {
-                               interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0d>, <&audma0 0x0e>,
-                                      <&audma0 0x75>, <&audma0 0x76>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi7: ssi-7 {
-                               interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x0f>, <&audma0 0x10>,
-                                      <&audma0 0x79>, <&audma0 0x7a>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi8: ssi-8 {
-                               interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x11>, <&audma0 0x12>,
-                                      <&audma0 0x7b>, <&audma0 0x7c>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-                       ssi9: ssi-9 {
-                               interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-                               dmas = <&audma0 0x13>, <&audma0 0x14>,
-                                      <&audma0 0x7d>, <&audma0 0x7e>;
-                               dma-names = "rx", "tx", "rxu", "txu";
-                       };
-               };
+       timer {
+               compatible = "arm,armv7-timer";
+               interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+       };
+
+       /* External USB clock - can be overridden by the board */
+       usb_extal_clk: usb_extal {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <48000000>;
        };
 };