Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / arch / arm64 / boot / dts / freescale / imx8mq.dtsi

diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index b4529773af51836107da4ff69d57c54b1850c741..3f3594d9485cec30c34730255595c76812621f3f 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -156,6 +156,7 @@
                        /* Industrial only */
                        opp-supported-hw = <0xf>, <0x4>;
                        clock-latency-ns = <150000>;
+                       opp-suspend;
                };
 
                opp-1000000000 {
@@ -164,21 +165,23 @@
                        /* Consumer only */
                        opp-supported-hw = <0xe>, <0x3>;
                        clock-latency-ns = <150000>;
+                       opp-suspend;
                };
 
                opp-1300000000 {
                        opp-hz = /bits/ 64 <1300000000>;
                        opp-microvolt = <1000000>;
-                       opp-supported-hw = <0xc>, <0x7>;
+                       opp-supported-hw = <0xc>, <0x4>;
                        clock-latency-ns = <150000>;
+                       opp-suspend;
                };
 
                opp-1500000000 {
                        opp-hz = /bits/ 64 <1500000000>;
                        opp-microvolt = <1000000>;
-                       /* Consumer only but rely on speed grading */
-                       opp-supported-hw = <0x8>, <0x7>;
+                       opp-supported-hw = <0x8>, <0x3>;
                        clock-latency-ns = <150000>;
+                       opp-suspend;
                };
        };
 
@@ -288,6 +291,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 10 30>;
                        };
 
                        gpio2: gpio@30210000 {
@@ -300,6 +304,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 40 21>;
                        };
 
                        gpio3: gpio@30220000 {
@@ -312,6 +317,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 61 26>;
                        };
 
                        gpio4: gpio@30230000 {
@@ -324,6 +330,7 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 87 32>;
                        };
 
                        gpio5: gpio@30240000 {
@@ -336,12 +343,14 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               gpio-ranges = <&iomuxc 0 119 30>;
                        };
 
                        tmu: tmu@30260000 {
                                compatible = "fsl,imx8mq-tmu";
                                reg = <0x30260000 0x10000>;
                                interrupt = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clk IMX8MQ_CLK_TMU_ROOT>;
                                little-endian;
                                fsl,tmu-range = <0xb0000 0xa0026 0x80048 0x70061>;
                                fsl,tmu-calibration = <0x00000000 0x00000023
@@ -431,8 +440,15 @@
                        };
 
                        iomuxc_gpr: syscon@30340000 {
-                               compatible = "fsl,imx8mq-iomuxc-gpr", "fsl,imx6q-iomuxc-gpr", "syscon";
+                               compatible = "fsl,imx8mq-iomuxc-gpr", "fsl,imx6q-iomuxc-gpr",
+                                            "syscon", "simple-mfd";
                                reg = <0x30340000 0x10000>;
+
+                               mux: mux-controller {
+                                       compatible = "mmio-mux";
+                                       #mux-control-cells = <1>;
+                                       mux-reg-masks = <0x34 0x00000004>; /* MIPI_MUX_SEL */
+                               };
                        };
 
                        ocotp: ocotp-ctrl@30350000 {
@@ -723,8 +739,7 @@
 
                        sai2: sai@308b0000 {
                                #sound-dai-cells = <0>;
-                               compatible = "fsl,imx8mq-sai",
-                                            "fsl,imx6sx-sai";
+                               compatible = "fsl,imx8mq-sai";
                                reg = <0x308b0000 0x10000>;
                                interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clk IMX8MQ_CLK_SAI2_IPG>,
@@ -736,6 +751,19 @@
                                status = "disabled";
                        };
 
+                       dphy: dphy@30a00300 {
+                               compatible = "fsl,imx8mq-mipi-dphy";
+                               reg = <0x30a00300 0x100>;
+                               clocks = <&clk IMX8MQ_CLK_DSI_PHY_REF>;
+                               clock-names = "phy_ref";
+                               assigned-clocks = <&clk IMX8MQ_CLK_DSI_PHY_REF>;
+                               assigned-clock-parents = <&clk IMX8MQ_VIDEO_PLL1_OUT>;
+                               assigned-clock-rates = <24000000>;
+                               #phy-cells = <0>;
+                               power-domains = <&pgc_mipi>;
+                               status = "disabled";
+                       };
+
                        i2c1: i2c@30a20000 {
                                compatible = "fsl,imx8mq-i2c", "fsl,imx21-i2c";
                                reg = <0x30a20000 0x10000>;
@@ -909,9 +937,9 @@
                usb_dwc3_0: usb@38100000 {
                        compatible = "fsl,imx8mq-dwc3", "snps,dwc3";
                        reg = <0x38100000 0x10000>;
-                       clocks = <&clk IMX8MQ_CLK_USB_BUS>,
+                       clocks = <&clk IMX8MQ_CLK_USB1_CTRL_ROOT>,
                                 <&clk IMX8MQ_CLK_USB_CORE_REF>,
-                                <&clk IMX8MQ_CLK_USB1_CTRL_ROOT>;
+                                <&clk IMX8MQ_CLK_32K>;
                        clock-names = "bus_early", "ref", "suspend";
                        assigned-clocks = <&clk IMX8MQ_CLK_USB_BUS>,
                                          <&clk IMX8MQ_CLK_USB_CORE_REF>;
@@ -941,9 +969,9 @@
                usb_dwc3_1: usb@38200000 {
                        compatible = "fsl,imx8mq-dwc3", "snps,dwc3";
                        reg = <0x38200000 0x10000>;
-                       clocks = <&clk IMX8MQ_CLK_USB_BUS>,
+                       clocks = <&clk IMX8MQ_CLK_USB2_CTRL_ROOT>,
                                 <&clk IMX8MQ_CLK_USB_CORE_REF>,
-                                <&clk IMX8MQ_CLK_USB2_CTRL_ROOT>;
+                                <&clk IMX8MQ_CLK_32K>;
                        clock-names = "bus_early", "ref", "suspend";
                        assigned-clocks = <&clk IMX8MQ_CLK_USB_BUS>,
                                          <&clk IMX8MQ_CLK_USB_CORE_REF>;
@@ -1041,5 +1069,12 @@
                        interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-parent = <&gic>;
                };
+
+               ddr-pmu@3d800000 {
+                       compatible = "fsl,imx8mq-ddr-pmu", "fsl,imx8m-ddr-pmu";
+                       reg = <0x3d800000 0x400000>;
+                       interrupt-parent = <&gic>;
+                       interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+               };
        };
 };