]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - arch/arm/boot/dts/r8a7790.dtsi
Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[karo-tx-linux.git] / arch / arm / boot / dts / r8a7790.dtsi
index 38b706399a6b1ced5586c5e11820005319eddd80..935064fe7b13497bcc2a7e5f59e3831d02d2dfcd 100644 (file)
                clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
                dmas = <&dmac1 0xcd>, <&dmac1 0xce>;
                dma-names = "tx", "rx";
+               max-frequency = <195000000>;
                power-domains = <&cpg_clocks>;
                status = "disabled";
        };
                clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
                dmas = <&dmac1 0xc9>, <&dmac1 0xca>;
                dma-names = "tx", "rx";
+               max-frequency = <195000000>;
                power-domains = <&cpg_clocks>;
                status = "disabled";
        };
                clocks = <&mstp3_clks R8A7790_CLK_SDHI2>;
                dmas = <&dmac1 0xc1>, <&dmac1 0xc2>;
                dma-names = "tx", "rx";
+               max-frequency = <97500000>;
                power-domains = <&cpg_clocks>;
                status = "disabled";
        };
                clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
                dmas = <&dmac1 0xd3>, <&dmac1 0xd4>;
                dma-names = "tx", "rx";
+               max-frequency = <97500000>;
                power-domains = <&cpg_clocks>;
                status = "disabled";
        };
                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 = <&mstp3_clks R8A7790_CLK_SCIF2>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
+               dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
+               dma-names = "tx", "rx";
+               power-domains = <&cpg_clocks>;
+               status = "disabled";
+       };
+
        hscif0: serial@e62c0000 {
                compatible = "renesas,hscif-r8a7790",
                             "renesas,rcar-gen2-hscif", "renesas,hscif";
        };
 
        can0: can@e6e80000 {
-               compatible = "renesas,can-r8a7790";
+               compatible = "renesas,can-r8a7790", "renesas,rcar-gen2-can";
                reg = <0 0xe6e80000 0 0x1000>;
                interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp9_clks R8A7790_CLK_RCAN0>,
        };
 
        can1: can@e6e88000 {
-               compatible = "renesas,can-r8a7790";
+               compatible = "renesas,can-r8a7790", "renesas,rcar-gen2-can";
                reg = <0 0xe6e88000 0 0x1000>;
                interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp9_clks R8A7790_CLK_RCAN1>,
        };
 
        jpu: jpeg-codec@fe980000 {
-               compatible = "renesas,jpu-r8a7790";
+               compatible = "renesas,jpu-r8a7790", "renesas,rcar-gen2-jpu";
                reg = <0 0xfe980000 0 0x10300>;
                interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp1_clks R8A7790_CLK_JPU>;
                ranges;
 
                /* External root clock */
-               extal_clk: extal_clk {
+               extal_clk: extal {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
                        /* This value must be overriden by the board. */
                        clock-frequency = <0>;
-                       clock-output-names = "extal";
                };
 
                /* External PCIe clock - can be overridden by the board */
-               pcie_bus_clk: pcie_bus_clk {
+               pcie_bus_clk: pcie_bus {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
-                       clock-frequency = <100000000>;
-                       clock-output-names = "pcie_bus";
-                       status = "disabled";
+                       clock-frequency = <0>;
                };
 
                /*
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
                        clock-frequency = <0>;
-                       clock-output-names = "audio_clk_a";
                };
                audio_clk_b: audio_clk_b {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
                        clock-frequency = <0>;
-                       clock-output-names = "audio_clk_b";
                };
                audio_clk_c: audio_clk_c {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
                        clock-frequency = <0>;
-                       clock-output-names = "audio_clk_c";
                };
 
                /* External SCIF clock */
                        #clock-cells = <0>;
                        /* This value must be overridden by the board. */
                        clock-frequency = <0>;
-                       status = "disabled";
                };
 
                /* External USB clock - can be overridden by the board */
-               usb_extal_clk: usb_extal_clk {
+               usb_extal_clk: usb_extal {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
                        clock-frequency = <48000000>;
-                       clock-output-names = "usb_extal";
                };
 
                /* External CAN clock */
                        #clock-cells = <0>;
                        /* This value must be overridden by the board. */
                        clock-frequency = <0>;
-                       clock-output-names = "can_clk";
-                       status = "disabled";
                };
 
                /* Special CPG clocks */
                };
 
                /* Variable factor clocks */
-               sd2_clk: sd2_clk@e6150078 {
+               sd2_clk: sd2@e6150078 {
                        compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
                        reg = <0 0xe6150078 0 4>;
                        clocks = <&pll1_div2_clk>;
                        #clock-cells = <0>;
-                       clock-output-names = "sd2";
                };
-               sd3_clk: sd3_clk@e615026c {
+               sd3_clk: sd3@e615026c {
                        compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
                        reg = <0 0xe615026c 0 4>;
                        clocks = <&pll1_div2_clk>;
                        #clock-cells = <0>;
-                       clock-output-names = "sd3";
                };
-               mmc0_clk: mmc0_clk@e6150240 {
+               mmc0_clk: mmc0@e6150240 {
                        compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
                        reg = <0 0xe6150240 0 4>;
                        clocks = <&pll1_div2_clk>;
                        #clock-cells = <0>;
-                       clock-output-names = "mmc0";
                };
-               mmc1_clk: mmc1_clk@e6150244 {
+               mmc1_clk: mmc1@e6150244 {
                        compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
                        reg = <0 0xe6150244 0 4>;
                        clocks = <&pll1_div2_clk>;
                        #clock-cells = <0>;
-                       clock-output-names = "mmc1";
                };
-               ssp_clk: ssp_clk@e6150248 {
+               ssp_clk: ssp@e6150248 {
                        compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
                        reg = <0 0xe6150248 0 4>;
                        clocks = <&pll1_div2_clk>;
                        #clock-cells = <0>;
-                       clock-output-names = "ssp";
                };
-               ssprs_clk: ssprs_clk@e615024c {
+               ssprs_clk: ssprs@e615024c {
                        compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
                        reg = <0 0xe615024c 0 4>;
                        clocks = <&pll1_div2_clk>;
                        #clock-cells = <0>;
-                       clock-output-names = "ssprs";
                };
 
                /* Fixed factor clocks */
-               pll1_div2_clk: pll1_div2_clk {
+               pll1_div2_clk: pll1_div2 {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <2>;
                        clock-mult = <1>;
-                       clock-output-names = "pll1_div2";
                };
-               z2_clk: z2_clk {
+               z2_clk: z2 {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <2>;
                        clock-mult = <1>;
-                       clock-output-names = "z2";
                };
-               zg_clk: zg_clk {
+               zg_clk: zg {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <3>;
                        clock-mult = <1>;
-                       clock-output-names = "zg";
                };
-               zx_clk: zx_clk {
+               zx_clk: zx {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <3>;
                        clock-mult = <1>;
-                       clock-output-names = "zx";
                };
-               zs_clk: zs_clk {
+               zs_clk: zs {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <6>;
                        clock-mult = <1>;
-                       clock-output-names = "zs";
                };
-               hp_clk: hp_clk {
+               hp_clk: hp {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <12>;
                        clock-mult = <1>;
-                       clock-output-names = "hp";
                };
-               i_clk: i_clk {
+               i_clk: i {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <2>;
                        clock-mult = <1>;
-                       clock-output-names = "i";
                };
-               b_clk: b_clk {
+               b_clk: b {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <12>;
                        clock-mult = <1>;
-                       clock-output-names = "b";
                };
-               p_clk: p_clk {
+               p_clk: p {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <24>;
                        clock-mult = <1>;
-                       clock-output-names = "p";
                };
-               cl_clk: cl_clk {
+               cl_clk: cl {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <48>;
                        clock-mult = <1>;
-                       clock-output-names = "cl";
                };
-               m2_clk: m2_clk {
+               m2_clk: m2 {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <8>;
                        clock-mult = <1>;
-                       clock-output-names = "m2";
                };
-               imp_clk: imp_clk {
+               imp_clk: imp {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <4>;
                        clock-mult = <1>;
-                       clock-output-names = "imp";
                };
-               rclk_clk: rclk_clk {
+               rclk_clk: rclk {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <(48 * 1024)>;
                        clock-mult = <1>;
-                       clock-output-names = "rclk";
                };
-               oscclk_clk: oscclk_clk {
+               oscclk_clk: oscclk {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
                        #clock-cells = <0>;
                        clock-div = <(12 * 1024)>;
                        clock-mult = <1>;
-                       clock-output-names = "oscclk";
                };
-               zb3_clk: zb3_clk {
+               zb3_clk: zb3 {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL3>;
                        #clock-cells = <0>;
                        clock-div = <4>;
                        clock-mult = <1>;
-                       clock-output-names = "zb3";
                };
-               zb3d2_clk: zb3d2_clk {
+               zb3d2_clk: zb3d2 {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL3>;
                        #clock-cells = <0>;
                        clock-div = <8>;
                        clock-mult = <1>;
-                       clock-output-names = "zb3d2";
                };
-               ddr_clk: ddr_clk {
+               ddr_clk: ddr {
                        compatible = "fixed-factor-clock";
                        clocks = <&cpg_clocks R8A7790_CLK_PLL3>;
                        #clock-cells = <0>;
                        clock-div = <8>;
                        clock-mult = <1>;
-                       clock-output-names = "ddr";
                };
-               mp_clk: mp_clk {
+               mp_clk: mp {
                        compatible = "fixed-factor-clock";
                        clocks = <&pll1_div2_clk>;
                        #clock-cells = <0>;
                        clock-div = <15>;
                        clock-mult = <1>;
-                       clock-output-names = "mp";
                };
-               cp_clk: cp_clk {
+               cp_clk: cp {
                        compatible = "fixed-factor-clock";
                        clocks = <&extal_clk>;
                        #clock-cells = <0>;
                        clock-div = <2>;
                        clock-mult = <1>;
-                       clock-output-names = "cp";
                };
 
                /* Gate clocks */
                mstp3_clks: mstp3_clks@e615013c {
                        compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
                        reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
-                       clocks = <&hp_clk>, <&cp_clk>, <&mmc1_clk>, <&sd3_clk>,
+                       clocks = <&hp_clk>, <&cp_clk>, <&mmc1_clk>, <&p_clk>, <&sd3_clk>,
                                 <&sd2_clk>, <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>, <&mmc0_clk>,
                                 <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>,
                                 <&hp_clk>, <&hp_clk>;
                        #clock-cells = <1>;
                        clock-indices = <
-                               R8A7790_CLK_IIC2 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
+                               R8A7790_CLK_IIC2 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SCIF2 R8A7790_CLK_SDHI3
                                R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 R8A7790_CLK_MMCIF0
                                R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1
                                R8A7790_CLK_USBDMAC0 R8A7790_CLK_USBDMAC1
                        >;
                        clock-output-names =
-                               "iic2", "tpu0", "mmcif1", "sdhi3",
+                               "iic2", "tpu0", "mmcif1", "scif2", "sdhi3",
                                "sdhi2", "sdhi1", "sdhi0", "mmcif0",
                                "iic0", "pciec", "iic1", "ssusb", "cmt1",
                                "usbdmac0", "usbdmac1";
        };
 
        xhci: usb@ee000000 {
-               compatible = "renesas,xhci-r8a7790";
+               compatible = "renesas,xhci-r8a7790", "renesas,rcar-gen2-xhci";
                reg = <0 0xee000000 0 0xc00>;
                interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp3_clks R8A7790_CLK_SSUSB>;