Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit

[linux-2.6-microblaze.git] / arch / arm / boot / dts / r8a7793.dtsi

diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index e4b385e..2fb527c 100644 (file)
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -666,7 +666,7 @@
        scifb0: serial@e6c20000 {
                compatible = "renesas,scifb-r8a7793",
                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c20000 0 64>;
+               reg = <0 0xe6c20000 0 0x100>;
                interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp2_clks R8A7793_CLK_SCIFB0>;
                clock-names = "fck";
@@ -680,7 +680,7 @@
        scifb1: serial@e6c30000 {
                compatible = "renesas,scifb-r8a7793",
                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6c30000 0 64>;
+               reg = <0 0xe6c30000 0 0x100>;
                interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp2_clks R8A7793_CLK_SCIFB1>;
                clock-names = "fck";
@@ -694,7 +694,7 @@
        scifb2: serial@e6ce0000 {
                compatible = "renesas,scifb-r8a7793",
                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-               reg = <0 0xe6ce0000 0 64>;
+               reg = <0 0xe6ce0000 0 0x100>;
                interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp2_clks R8A7793_CLK_SCIFB2>;
                clock-names = "fck";
@@ -852,6 +852,33 @@
                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 = <&mstp8_clks R8A7793_CLK_VIN0>;
+               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+               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 = <&mstp8_clks R8A7793_CLK_VIN1>;
+               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+               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 = <&mstp8_clks R8A7793_CLK_VIN2>;
+               power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+               status = "disabled";
+       };
+
        qspi: spi@e6b10000 {
                compatible = "renesas,qspi-r8a7793", "renesas,qspi";
                reg = <0 0xe6b10000 0 0x2c>;
@@ -1284,6 +1311,11 @@
                reg = <0 0xe6160000 0 0x0100>;
        };
 
+       prr: chipid@ff000044 {
+               compatible = "renesas,prr";
+               reg = <0 0xff000044 0 4>;
+       };
+
        sysc: system-controller@e6180000 {
                compatible = "renesas,r8a7793-sysc";
                reg = <0 0xe6180000 0 0x0200>;