ARM: dts: imx6: make gpt per clock can be from OSC

[karo-tx-linux.git] / arch / arm / boot / dts / imx6qdl.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index c701af9580067d287cc0bffbc0afe074c8ddab7d..9596ed5867e6d9a6b838d5c6880ab0d86b26bb4b 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -137,7 +137,9 @@
 
                pcie: pcie@0x01000000 {
                        compatible = "fsl,imx6q-pcie", "snps,dw-pcie";
-                       reg = <0x01ffc000 0x4000>; /* DBI */
+                       reg = <0x01ffc000 0x04000>,
+                             <0x01f00000 0x80000>;
+                       reg-names = "dbi", "config";
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
@@ -273,11 +275,14 @@
                                };
 
                                ssi1: ssi@02028000 {
+                                       #sound-dai-cells = <0>;
                                        compatible = "fsl,imx6q-ssi",
                                                        "fsl,imx51-ssi";
                                        reg = <0x02028000 0x4000>;
                                        interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
-                                       clocks = <&clks IMX6QDL_CLK_SSI1_IPG>;
+                                       clocks = <&clks IMX6QDL_CLK_SSI1_IPG>,
+                                                <&clks IMX6QDL_CLK_SSI1>;
+                                       clock-names = "ipg", "baud";
                                        dmas = <&sdma 37 1 0>,
                                               <&sdma 38 1 0>;
                                        dma-names = "rx", "tx";
@@ -286,11 +291,14 @@
                                };
 
                                ssi2: ssi@0202c000 {
+                                       #sound-dai-cells = <0>;
                                        compatible = "fsl,imx6q-ssi",
                                                        "fsl,imx51-ssi";
                                        reg = <0x0202c000 0x4000>;
                                        interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
-                                       clocks = <&clks IMX6QDL_CLK_SSI2_IPG>;
+                                       clocks = <&clks IMX6QDL_CLK_SSI2_IPG>,
+                                                <&clks IMX6QDL_CLK_SSI2>;
+                                       clock-names = "ipg", "baud";
                                        dmas = <&sdma 41 1 0>,
                                               <&sdma 42 1 0>;
                                        dma-names = "rx", "tx";
@@ -299,11 +307,14 @@
                                };
 
                                ssi3: ssi@02030000 {
+                                       #sound-dai-cells = <0>;
                                        compatible = "fsl,imx6q-ssi",
                                                        "fsl,imx51-ssi";
                                        reg = <0x02030000 0x4000>;
                                        interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
-                                       clocks = <&clks IMX6QDL_CLK_SSI3_IPG>;
+                                       clocks = <&clks IMX6QDL_CLK_SSI3_IPG>,
+                                                <&clks IMX6QDL_CLK_SSI3>;
+                                       clock-names = "ipg", "baud";
                                        dmas = <&sdma 45 1 0>,
                                               <&sdma 46 1 0>;
                                        dma-names = "rx", "tx";
@@ -396,8 +407,9 @@
                                reg = <0x02098000 0x4000>;
                                interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6QDL_CLK_GPT_IPG>,
-                                        <&clks IMX6QDL_CLK_GPT_IPG_PER>;
-                               clock-names = "ipg", "per";
+                                        <&clks IMX6QDL_CLK_GPT_IPG_PER>,
+                                        <&clks IMX6QDL_CLK_GPT_3M>;
+                               clock-names = "ipg", "per", "osc_per";
                        };
 
                        gpio1: gpio@0209c000 {