Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm / boot / dts / artpec6.dtsi

diff --git a/arch/arm/boot/dts/artpec6.dtsi b/arch/arm/boot/dts/artpec6.dtsi
index 3fac4c4..3489019 100644 (file)
--- a/arch/arm/boot/dts/artpec6.dtsi
+++ b/arch/arm/boot/dts/artpec6.dtsi
@@ -41,6 +41,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/axis,artpec6-clkctrl.h>
 #include "skeleton.dtsi"
 
 / {
@@ -109,14 +110,14 @@
                compatible = "arm,cortex-a9-global-timer";
                reg = <0xfaf00200 0x20>;
                interrupts = <GIC_PPI 11 0xf01>;
-               clocks = <&clkctrl 1>;
+               clocks = <&clkctrl ARTPEC6_CLK_CPU_PERIPH>;
        };
 
        timer@faf00600 {
                compatible = "arm,cortex-a9-twd-timer";
                reg = <0xfaf00600 0x20>;
                interrupts = <GIC_PPI 13 0xf04>;
-               clocks = <&clkctrl 1>;
+               clocks = <&clkctrl ARTPEC6_CLK_CPU_PERIPH>;
                status = "disabled";
        };
 
@@ -136,12 +137,20 @@
                arm,data-latency = <1 1 1>;
                arm,tag-latency = <1 1 1>;
                arm,filter-ranges = <0x0 0x80000000>;
+               arm,double-linefill = <1>;
+               arm,double-linefill-incr = <0>;
+               arm,double-linefill-wrap = <0>;
+               prefetch-data = <1>;
+               prefetch-instr = <1>;
+               arm,prefetch-offset = <0>;
+               arm,prefetch-drop = <1>;
        };
 
        pmu {
                compatible = "arm,cortex-a9-pmu";
                interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
                        <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&cpu0>, <&cpu1>;
                interrupt-parent = <&intc>;
        };
 
@@ -157,7 +166,7 @@
                ethernet: ethernet@f8010000 {
                        clock-names = "phy_ref_clk", "apb_pclk";
                        clocks = <&eth_phy_ref_clk>,
-                               <&clkctrl 4>;
+                               <&clkctrl ARTPEC6_CLK_ETH_ACLK>;
                        compatible = "snps,dwc-qos-ethernet-4.10";
                        interrupt-parent = <&intc>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -175,8 +184,8 @@
                        compatible = "arm,pl011", "arm,primecell";
                        reg = <0xf8036000 0x1000>;
                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clkctrl 13>,
-                               <&clkctrl 12>;
+                       clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>,
+                               <&clkctrl ARTPEC6_CLK_UART_PCLK>;
                        clock-names = "uart_clk", "apb_pclk";
                        status = "disabled";
                };
@@ -184,8 +193,8 @@
                        compatible = "arm,pl011", "arm,primecell";
                        reg = <0xf8037000 0x1000>;
                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clkctrl 13>,
-                               <&clkctrl 12>;
+                       clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>,
+                               <&clkctrl ARTPEC6_CLK_UART_PCLK>;
                        clock-names = "uart_clk", "apb_pclk";
                        status = "disabled";
                };
@@ -193,8 +202,8 @@
                        compatible = "arm,pl011", "arm,primecell";
                        reg = <0xf8038000 0x1000>;
                        interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clkctrl 13>,
-                               <&clkctrl 12>;
+                       clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>,
+                               <&clkctrl ARTPEC6_CLK_UART_PCLK>;
                        clock-names = "uart_clk", "apb_pclk";
                        status = "disabled";
                };
@@ -202,8 +211,8 @@
                        compatible = "arm,pl011", "arm,primecell";
                        reg = <0xf8039000 0x1000>;
                        interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clkctrl 13>,
-                               <&clkctrl 12>;
+                       clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>,
+                               <&clkctrl ARTPEC6_CLK_UART_PCLK>;
                        clock-names = "uart_clk", "apb_pclk";
                        status = "disabled";
                };