Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / boot / dts / r7s72100.dtsi

diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 5a6e248..801a556 100644 (file)
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -110,6 +110,30 @@
                        >;
                        clock-output-names = "scif0", "scif1", "scif2", "scif3", "scif4", "scif5", "scif6", "scif7";
                };
+
+               mstp9_clks: mstp9_clks@fcfe0438 {
+                       #clock-cells = <1>;
+                       compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
+                       reg = <0xfcfe0438 4>;
+                       clocks = <&p0_clk>, <&p0_clk>, <&p0_clk>, <&p0_clk>;
+                       clock-indices = <
+                               R7S72100_CLK_I2C0 R7S72100_CLK_I2C1 R7S72100_CLK_I2C2 R7S72100_CLK_I2C3
+                       >;
+                       clock-output-names = "i2c0", "i2c1", "i2c2", "i2c3";
+               };
+
+               mstp10_clks: mstp10_clks@fcfe043c {
+                       #clock-cells = <1>;
+                       compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
+                       reg = <0xfcfe043c 4>;
+                       clocks = <&p1_clk>, <&p1_clk>, <&p1_clk>, <&p1_clk>,
+                                <&p1_clk>;
+                       clock-indices = <
+                               R7S72100_CLK_SPI0 R7S72100_CLK_SPI1 R7S72100_CLK_SPI2 R7S72100_CLK_SPI3
+                               R7S72100_CLK_SPI4
+                       >;
+                       clock-output-names = "spi0", "spi1", "spi2", "spi3", "spi4";
+               };
        };
 
        cpus {
@@ -120,6 +144,7 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <0>;
+                       clock-frequency = <400000000>;
                };
        };
 
@@ -145,6 +170,7 @@
                             <0 162 IRQ_TYPE_LEVEL_HIGH>,
                             <0 163 IRQ_TYPE_LEVEL_HIGH>,
                             <0 164 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp9_clks R7S72100_CLK_I2C0>;
                clock-frequency = <100000>;
                status = "disabled";
        };
@@ -162,6 +188,7 @@
                             <0 170 IRQ_TYPE_LEVEL_HIGH>,
                             <0 171 IRQ_TYPE_LEVEL_HIGH>,
                             <0 172 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp9_clks R7S72100_CLK_I2C1>;
                clock-frequency = <100000>;
                status = "disabled";
        };
@@ -179,6 +206,7 @@
                             <0 178 IRQ_TYPE_LEVEL_HIGH>,
                             <0 179 IRQ_TYPE_LEVEL_HIGH>,
                             <0 180 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp9_clks R7S72100_CLK_I2C2>;
                clock-frequency = <100000>;
                status = "disabled";
        };
@@ -196,10 +224,117 @@
                             <0 186 IRQ_TYPE_LEVEL_HIGH>,
                             <0 187 IRQ_TYPE_LEVEL_HIGH>,
                             <0 188 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp9_clks R7S72100_CLK_I2C3>;
                clock-frequency = <100000>;
                status = "disabled";
        };
 
+       mtu2: timer@fcff0000 {
+               compatible = "renesas,mtu2-r7s72100", "renesas,mtu2";
+               reg = <0xfcff0000 0x400>;
+               interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "tgi0a";
+               clocks = <&mstp3_clks R7S72100_CLK_MTU2>;
+               clock-names = "fck";
+               status = "disabled";
+       };
+
+       scif0: serial@e8007000 {
+               compatible = "renesas,scif-r7s72100", "renesas,scif";
+               reg = <0xe8007000 64>;
+               interrupts = <0 190 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 191 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 192 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 189 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp4_clks R7S72100_CLK_SCIF0>;
+               clock-names = "sci_ick";
+               status = "disabled";
+       };
+
+       scif1: serial@e8007800 {
+               compatible = "renesas,scif-r7s72100", "renesas,scif";
+               reg = <0xe8007800 64>;
+               interrupts = <0 194 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 195 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 196 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 193 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp4_clks R7S72100_CLK_SCIF1>;
+               clock-names = "sci_ick";
+               status = "disabled";
+       };
+
+       scif2: serial@e8008000 {
+               compatible = "renesas,scif-r7s72100", "renesas,scif";
+               reg = <0xe8008000 64>;
+               interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 199 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 200 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 197 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp4_clks R7S72100_CLK_SCIF2>;
+               clock-names = "sci_ick";
+               status = "disabled";
+       };
+
+       scif3: serial@e8008800 {
+               compatible = "renesas,scif-r7s72100", "renesas,scif";
+               reg = <0xe8008800 64>;
+               interrupts = <0 202 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 203 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 204 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 201 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp4_clks R7S72100_CLK_SCIF3>;
+               clock-names = "sci_ick";
+               status = "disabled";
+       };
+
+       scif4: serial@e8009000 {
+               compatible = "renesas,scif-r7s72100", "renesas,scif";
+               reg = <0xe8009000 64>;
+               interrupts = <0 206 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 207 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 208 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 205 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp4_clks R7S72100_CLK_SCIF4>;
+               clock-names = "sci_ick";
+               status = "disabled";
+       };
+
+       scif5: serial@e8009800 {
+               compatible = "renesas,scif-r7s72100", "renesas,scif";
+               reg = <0xe8009800 64>;
+               interrupts = <0 210 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 211 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 212 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 209 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp4_clks R7S72100_CLK_SCIF5>;
+               clock-names = "sci_ick";
+               status = "disabled";
+       };
+
+       scif6: serial@e800a000 {
+               compatible = "renesas,scif-r7s72100", "renesas,scif";
+               reg = <0xe800a000 64>;
+               interrupts = <0 214 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 215 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 216 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 213 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp4_clks R7S72100_CLK_SCIF6>;
+               clock-names = "sci_ick";
+               status = "disabled";
+       };
+
+       scif7: serial@e800a800 {
+               compatible = "renesas,scif-r7s72100", "renesas,scif";
+               reg = <0xe800a800 64>;
+               interrupts = <0 218 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 219 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 220 IRQ_TYPE_LEVEL_HIGH>,
+                            <0 217 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp4_clks R7S72100_CLK_SCIF7>;
+               clock-names = "sci_ick";
+               status = "disabled";
+       };
+
        spi0: spi@e800c800 {
                compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
                reg = <0xe800c800 0x24>;
@@ -207,6 +342,7 @@
                             <0 239 IRQ_TYPE_LEVEL_HIGH>,
                             <0 240 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "error", "rx", "tx";
+               clocks = <&mstp10_clks R7S72100_CLK_SPI0>;
                num-cs = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -220,6 +356,7 @@
                             <0 242 IRQ_TYPE_LEVEL_HIGH>,
                             <0 243 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "error", "rx", "tx";
+               clocks = <&mstp10_clks R7S72100_CLK_SPI1>;
                num-cs = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -233,6 +370,7 @@
                             <0 245 IRQ_TYPE_LEVEL_HIGH>,
                             <0 246 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "error", "rx", "tx";
+               clocks = <&mstp10_clks R7S72100_CLK_SPI2>;
                num-cs = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -246,6 +384,7 @@
                             <0 248 IRQ_TYPE_LEVEL_HIGH>,
                             <0 249 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "error", "rx", "tx";
+               clocks = <&mstp10_clks R7S72100_CLK_SPI3>;
                num-cs = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -259,6 +398,7 @@
                             <0 251 IRQ_TYPE_LEVEL_HIGH>,
                             <0 252 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "error", "rx", "tx";
+               clocks = <&mstp10_clks R7S72100_CLK_SPI4>;
                num-cs = <1>;
                #address-cells = <1>;
                #size-cells = <0>;