]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: imx7ulp: remove mipi pll clock node
authorFancy Fang <chen.fang@nxp.com>
Fri, 23 Aug 2019 00:37:30 +0000 (00:37 +0000)
committerShawn Guo <shawnguo@kernel.org>
Wed, 2 Oct 2019 01:09:49 +0000 (09:09 +0800)
According to the IMX7ULP reference manual, the mipi pll
clock comes from the MIPI PHY PLL output. So it should
not be defined as a fixed clock. So remove this clock
node and all the references to it.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx7ulp.dtsi

index 6859a3a83750ce4c811942e21a710022123e2768..a7e4004bf4283bafad2549f71587e66f39e4f88c 100644 (file)
@@ -87,13 +87,6 @@ upll: clock-upll {
                #clock-cells = <0>;
        };
 
-       mpll: clock-mpll {
-               compatible = "fixed-clock";
-               clock-frequency = <480000000>;
-               clock-output-names = "mpll";
-               #clock-cells = <0>;
-       };
-
        ahbbridge0: bus@40000000 {
                compatible = "simple-bus";
                #address-cells = <1>;
@@ -258,9 +251,9 @@ scg1: clock-controller@403e0000 {
                        compatible = "fsl,imx7ulp-scg1";
                        reg = <0x403e0000 0x10000>;
                        clocks = <&rosc>, <&sosc>, <&sirc>,
-                                <&firc>, <&upll>, <&mpll>;
+                                <&firc>, <&upll>;
                        clock-names = "rosc", "sosc", "sirc",
-                                     "firc", "upll", "mpll";
+                                     "firc", "upll";
                        #clock-cells = <1>;
                };
 
@@ -276,13 +269,12 @@ pcc2: clock-controller@403f0000 {
                                 <&scg1 IMX7ULP_CLK_APLL_PFD0>,
                                 <&scg1 IMX7ULP_CLK_UPLL>,
                                 <&scg1 IMX7ULP_CLK_SOSC_BUS_CLK>,
-                                <&scg1 IMX7ULP_CLK_MIPI_PLL>,
                                 <&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>,
                                 <&scg1 IMX7ULP_CLK_ROSC>,
                                 <&scg1 IMX7ULP_CLK_SPLL_BUS_CLK>;
                        clock-names = "nic1_bus_clk", "nic1_clk", "ddr_clk",
                                      "apll_pfd2", "apll_pfd1", "apll_pfd0",
-                                     "upll", "sosc_bus_clk", "mpll",
+                                     "upll", "sosc_bus_clk",
                                      "firc_bus_clk", "rosc", "spll_bus_clk";
                        assigned-clocks = <&pcc2 IMX7ULP_CLK_LPTPM5>;
                        assigned-clock-parents = <&scg1 IMX7ULP_CLK_SOSC_BUS_CLK>;
@@ -309,13 +301,12 @@ pcc3: clock-controller@40b30000 {
                                 <&scg1 IMX7ULP_CLK_APLL_PFD0>,
                                 <&scg1 IMX7ULP_CLK_UPLL>,
                                 <&scg1 IMX7ULP_CLK_SOSC_BUS_CLK>,
-                                <&scg1 IMX7ULP_CLK_MIPI_PLL>,
                                 <&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>,
                                 <&scg1 IMX7ULP_CLK_ROSC>,
                                 <&scg1 IMX7ULP_CLK_SPLL_BUS_CLK>;
                        clock-names = "nic1_bus_clk", "nic1_clk", "ddr_clk",
                                      "apll_pfd2", "apll_pfd1", "apll_pfd0",
-                                     "upll", "sosc_bus_clk", "mpll",
+                                     "upll", "sosc_bus_clk",
                                      "firc_bus_clk", "rosc", "spll_bus_clk";
                };
        };