]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/blobdiff - arch/arm/boot/dts/r8a7794.dtsi
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[mirror_ubuntu-zesty-kernel.git] / arch / arm / boot / dts / r8a7794.dtsi
index 69e4f4fad89b23230c2e29053f4f3333b3db124f..fb576dba748cd97c5e7c253386bd0675ed6852ad 100644 (file)
                                  "ch12";
                clocks = <&mstp5_clks R8A7794_CLK_AUDIO_DMAC0>;
                clock-names = "fck";
-               power-domains = <&cpg_clocks>;
+               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
                #dma-cells = <1>;
                dma-channels = <13>;
        };
        scifb0: serial@e6c20000 {
                compatible = "renesas,scifb-r8a7794",
                             "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 R8A7794_CLK_SCIFB0>;
                clock-names = "fck";
        scifb1: serial@e6c30000 {
                compatible = "renesas,scifb-r8a7794",
                             "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 R8A7794_CLK_SCIFB1>;
                clock-names = "fck";
        scifb2: serial@e6ce0000 {
                compatible = "renesas,scifb-r8a7794",
                             "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 R8A7794_CLK_SCIFB2>;
                clock-names = "fck";
                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>;
                status = "disabled";
        };
                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>;
                status = "disabled";
        };
                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>;
                status = "disabled";
        };
                        clocks = <&extal_clk &usb_extal_clk>;
                        #clock-cells = <1>;
                        clock-output-names = "main", "pll0", "pll1", "pll3",
-                                            "lb", "qspi", "sdh", "sd0", "z",
-                                            "rcan";
+                                            "lb", "qspi", "sdh", "sd0", "rcan";
                        #power-domain-cells = <0>;
                };
                /* Variable factor clocks */
                mstp7_clks: mstp7_clks@e615014c {
                        compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
                        reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>;
-                       clocks = <&mp_clk>, <&mp_clk>,
+                       clocks = <&mp_clk>, <&hp_clk>,
                                 <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>,
                                 <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
                                 <&zx_clk>;
                reg = <0 0xe6160000 0 0x0100>;
        };
 
+       prr: chipid@ff000044 {
+               compatible = "renesas,prr";
+               reg = <0 0xff000044 0 4>;
+       };
+
        sysc: system-controller@e6180000 {
                compatible = "renesas,r8a7794-sysc";
                reg = <0 0xe6180000 0 0x0200>;
                              "mix.0", "mix.1",
                              "dvc.0", "dvc.1",
                              "clk_a", "clk_b", "clk_c", "clk_i";
-               power-domains = <&cpg_clocks>;
+               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
 
                status = "disabled";
 
                rcar_sound,dvc {
-                       dvc0: dvc@0 {
+                       dvc0: dvc-0 {
                                dmas = <&audma0 0xbc>;
                                dma-names = "tx";
                        };
-                       dvc1: dvc@1 {
+                       dvc1: dvc-1 {
                                dmas = <&audma0 0xbe>;
                                dma-names = "tx";
                        };
                };
 
                rcar_sound,mix {
-                       mix0: mix@0 { };
-                       mix1: mix@1 { };
+                       mix0: mix-0 { };
+                       mix1: mix-1 { };
                };
 
                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 { };
+                       ctu00: ctu-0 { };
+                       ctu01: ctu-1 { };
+                       ctu02: ctu-2 { };
+                       ctu03: ctu-3 { };
+                       ctu10: ctu-4 { };
+                       ctu11: ctu-5 { };
+                       ctu12: ctu-6 { };
+                       ctu13: ctu-7 { };
                };
 
                rcar_sound,src {
-                       src@0 {
+                       src-0 {
                                status = "disabled";
                        };
-                       src1: src@1 {
+                       src1: src-1 {
                                interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
                                dmas = <&audma0 0x87>, <&audma0 0x9c>;
                                dma-names = "rx", "tx";
                        };
-                       src2: src@2 {
+                       src2: src-2 {
                                interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
                                dmas = <&audma0 0x89>, <&audma0 0x9e>;
                                dma-names = "rx", "tx";
                        };
-                       src3: src@3 {
+                       src3: src-3 {
                                interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
                                dmas = <&audma0 0x8b>, <&audma0 0xa0>;
                                dma-names = "rx", "tx";
                        };
-                       src4: src@4 {
+                       src4: src-4 {
                                interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
                                dmas = <&audma0 0x8d>, <&audma0 0xb0>;
                                dma-names = "rx", "tx";
                        };
-                       src5: src@5 {
+                       src5: src-5 {
                                interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
                                dmas = <&audma0 0x8f>, <&audma0 0xb2>;
                                dma-names = "rx", "tx";
                        };
-                       src6: src@6 {
+                       src6: src-6 {
                                interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
                                dmas = <&audma0 0x91>, <&audma0 0xb4>;
                                dma-names = "rx", "tx";
                };
 
                rcar_sound,ssi {
-                       ssi0: ssi@0 {
+                       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 {
+                       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 {
+                       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 {
+                       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 {
+                       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 {
+                       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 {
+                       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 {
+                       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 {
+                       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 {
+                       ssi9: ssi-9 {
                                interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
                                dmas = <&audma0 0x13>, <&audma0 0x14>,
                                       <&audma0 0x7d>, <&audma0 0x7e>;