Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / r8a7790.dtsi

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 6d10450de6d7b97fcd287ba965cd3f331e66dc85..99269aaca6fc953eccc3218cf78487d0a9c156d3 100644 (file)
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -129,17 +129,15 @@
                        next-level-cache = <&L2_CA7>;
                };
 
-               L2_CA15: cache-controller@0 {
+               L2_CA15: cache-controller-0 {
                        compatible = "cache";
-                       reg = <0>;
                        power-domains = <&sysc R8A7790_PD_CA15_SCU>;
                        cache-unified;
                        cache-level = <2>;
                };
 
-               L2_CA7: cache-controller@100 {
+               L2_CA7: cache-controller-1 {
                        compatible = "cache";
-                       reg = <0x100>;
                        power-domains = <&sysc R8A7790_PD_CA7_SCU>;
                        cache-unified;
                        cache-level = <2>;
@@ -187,6 +185,9 @@
                        <0 0xf1004000 0 0x2000>,
                        <0 0xf1006000 0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+               clocks = <&mstp4_clks R8A7790_CLK_INTC_SYS>;
+               clock-names = "clk";
+               power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
        };
 
        gpio0: gpio@e6050000 {
@@ -1100,7 +1101,7 @@
                };
 
                /* External CAN clock */
-               can_clk: can_clk {
+               can_clk: can {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
                        /* This value must be overridden by the board. */
@@ -1366,10 +1367,10 @@
                mstp4_clks: mstp4_clks@e6150140 {
                        compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
                        reg = <0 0xe6150140 0 4>, <0 0xe615004c 0 4>;
-                       clocks = <&cp_clk>;
+                       clocks = <&cp_clk>, <&zs_clk>;
                        #clock-cells = <1>;
-                       clock-indices = <R8A7790_CLK_IRQC>;
-                       clock-output-names = "irqc";
+                       clock-indices = <R8A7790_CLK_IRQC R8A7790_CLK_INTC_SYS>;
+                       clock-output-names = "irqc", "intc-sys";
                };
                mstp5_clks: mstp5_clks@e6150144 {
                        compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
@@ -1442,8 +1443,11 @@
                        compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
                        reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>;
                        clocks = <&p_clk>,
-                               <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
-                               <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
+                               <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>,
+                               <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>,
+                               <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>,
+                               <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>,
+                               <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>,
                                <&p_clk>,
                                <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
                                <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
@@ -1740,11 +1744,11 @@
 
                rcar_sound,dvc {
                        dvc0: dvc-0 {
-                               dmas = <&audma0 0xbc>;
+                               dmas = <&audma1 0xbc>;
                                dma-names = "tx";
                        };
                        dvc1: dvc-1 {
-                               dmas = <&audma0 0xbe>;
+                               dmas = <&audma1 0xbe>;
                                dma-names = "tx";
                        };
                };