Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / arch / arm / boot / dts / tegra30.dtsi

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index aeae8c0..44a6dbb 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -6,6 +6,8 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/soc/tegra-pmc.h>
 
+#include "tegra30-peripherals-opp.dtsi"
+
 / {
        compatible = "nvidia,tegra30";
        interrupt-parent = <&lic>;
@@ -210,6 +212,17 @@
 
                        nvidia,head = <0>;
 
+                       interconnects = <&mc TEGRA30_MC_DISPLAY0A &emc>,
+                                       <&mc TEGRA30_MC_DISPLAY0B &emc>,
+                                       <&mc TEGRA30_MC_DISPLAY1B &emc>,
+                                       <&mc TEGRA30_MC_DISPLAY0C &emc>,
+                                       <&mc TEGRA30_MC_DISPLAYHC &emc>;
+                       interconnect-names = "wina",
+                                            "winb",
+                                            "winb-vfilter",
+                                            "winc",
+                                            "cursor";
+
                        rgb {
                                status = "disabled";
                        };
@@ -229,6 +242,17 @@
 
                        nvidia,head = <1>;
 
+                       interconnects = <&mc TEGRA30_MC_DISPLAY0AB &emc>,
+                                       <&mc TEGRA30_MC_DISPLAY0BB &emc>,
+                                       <&mc TEGRA30_MC_DISPLAY1BB &emc>,
+                                       <&mc TEGRA30_MC_DISPLAY0CB &emc>,
+                                       <&mc TEGRA30_MC_DISPLAYHCB &emc>;
+                       interconnect-names = "wina",
+                                            "winb",
+                                            "winb-vfilter",
+                                            "winc",
+                                            "cursor";
+
                        rgb {
                                status = "disabled";
                        };
@@ -395,6 +419,9 @@
                clock-names = "actmon", "emc";
                resets = <&tegra_car TEGRA30_CLK_ACTMON>;
                reset-names = "actmon";
+               operating-points-v2 = <&emc_bw_dfs_opp_table>;
+               interconnects = <&mc TEGRA30_MC_MPCORER &emc>;
+               interconnect-names = "cpu-read";
        };
 
        gpio: gpio@6000d000 {
@@ -748,15 +775,19 @@
 
                #iommu-cells = <1>;
                #reset-cells = <1>;
+               #interconnect-cells = <1>;
        };
 
-       memory-controller@7000f400 {
+       emc: memory-controller@7000f400 {
                compatible = "nvidia,tegra30-emc";
                reg = <0x7000f400 0x400>;
                interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&tegra_car TEGRA30_CLK_EMC>;
 
                nvidia,memory-controller = <&mc>;
+               operating-points-v2 = <&emc_icc_dvfs_opp_table>;
+
+               #interconnect-cells = <0>;
        };
 
        fuse@7000f800 {