ARM: dts: imx7ulp: remove mipi pll clock node
PATCH 1/2 ARM: dts: imx7ulp: remove mipi pll clock node
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.
--- arch/arm/boot/dts/imx7ulp.dtsi | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
arch/arm/boot/dts/imx7ulp.dtsi +4 -13
@@ -87,13 +87,6 @@ #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 @@ 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 @@ <&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 @@ <&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"; }; };
Signature · 1 line
2.17.1
PATCH 2/2 clk: imx7ulp: remove IMX7ULP_CLK_MIPI_PLL clock
The mipi pll clock comes from the MIPI PHY PLL output, so it should not be a fixed clock.
MIPI PHY PLL is in the MIPI DSI space, and it is used as the bit clock for transferring the pixel data out and its output clock is configured according to the display mode.
So it should be used only for MIPI DSI and not be exported out for other usages.
--- .../devicetree/bindings/clock/imx7ulp-clock.txt | 1 - drivers/clk/imx/clk-imx7ulp.c | 3 +-- include/dt-bindings/clock/imx7ulp-clock.h | 15 +++++++-------- 3 files changed, 8 insertions(+), 11 deletions(-)
Documentation/devicetree/bindings/clock/imx7ulp-clock.txt +0 -1
@@ -82,7 +82,6 @@ pcc2: pcc2@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>;
drivers/clk/imx/clk-imx7ulp.c +1 -2
@@ -28,7 +28,7 @@ static const char * const scs_sels[] = { "dummy", "sosc", "sirc", "firc", "dummstatic const char *const ddr_sels[] = {"apll_pfd_sel" ,"upll" , };static const char *const nic_sels[] = {"firc" ,"ddr_clk" , };static const char *const periph_plat_sels[] = {"dummy" ,"nic1_bus_clk" ,"nic1_clk" ,"ddr_clk" ,"apll_pfd2" ,"apll_pfd1" ,"apll_pfd0" ,"upll" , }; -static const char *const periph_bus_sels[] = {"dummy" ,"sosc_bus_clk" ,"mpll" ,"firc_bus_clk" ,"rosc" ,"nic1_bus_clk" ,"nic1_clk" ,"spll_bus_clk" , }; +static const char *const periph_bus_sels[] = {"dummy" ,"sosc_bus_clk" ,"dummy" ,"firc_bus_clk" ,"rosc" ,"nic1_bus_clk" ,"nic1_clk" ,"spll_bus_clk" , };static const char *const arm_sels[] = {"divcore" ,"dummy" ,"dummy" ,"hsrun_divcore" , };/* used by sosc/sirc/firc/ddr/spll/apll dividers */
@@ -75,7 +75,6 @@ static void __init imx7ulp_clk_scg1_init(struct device_node *np) clks[IMX7ULP_CLK_SOSC ] =imx_obtain_fixed_clk_hw (np,"sosc" ); clks[IMX7ULP_CLK_SIRC ] =imx_obtain_fixed_clk_hw (np,"sirc" ); clks[IMX7ULP_CLK_FIRC ] =imx_obtain_fixed_clk_hw (np,"firc" ); - clks[IMX7ULP_CLK_MIPI_PLL ] =imx_obtain_fixed_clk_hw (np,"mpll" ); clks[IMX7ULP_CLK_UPLL ] =imx_obtain_fixed_clk_hw (np,"upll" );/* SCG1 */
include/dt-bindings/clock/imx7ulp-clock.h +7 -8
@@ -49,15 +49,14 @@#define IMX7ULP_CLK_NIC1_DIV 36#define IMX7ULP_CLK_NIC1_BUS_DIV 37#define IMX7ULP_CLK_NIC1_EXT_DIV 38 -#define IMX7ULP_CLK_MIPI_PLL 39 -#define IMX7ULP_CLK_SIRC 40 -#define IMX7ULP_CLK_SOSC_BUS_CLK 41 -#define IMX7ULP_CLK_FIRC_BUS_CLK 42 -#define IMX7ULP_CLK_SPLL_BUS_CLK 43 -#define IMX7ULP_CLK_HSRUN_SYS_SEL 44 -#define IMX7ULP_CLK_HSRUN_CORE_DIV 45 +#define IMX7ULP_CLK_SIRC 39 +#define IMX7ULP_CLK_SOSC_BUS_CLK 40 +#define IMX7ULP_CLK_FIRC_BUS_CLK 41 +#define IMX7ULP_CLK_SPLL_BUS_CLK 42 +#define IMX7ULP_CLK_HSRUN_SYS_SEL 43 +#define IMX7ULP_CLK_HSRUN_CORE_DIV 44 -#define IMX7ULP_CLK_SCG1_END 46 +#define IMX7ULP_CLK_SCG1_END 45/* PCC2 */ #define IMX7ULP_CLK_DMA1 0
Signature · 1 line
2.17.1
Re: [PATCH 2/2] clk: imx7ulp: remove IMX7ULP_CLK_MIPI_PLL clock
Quoted 61 lines · Fancy Fang
The mipi pll clock comes from the MIPI PHY PLL output, so it should not be a fixed clock.
MIPI PHY PLL is in the MIPI DSI space, and it is used as the bit clock for transferring the pixel data out and its output clock is configured according to the display mode.
So it should be used only for MIPI DSI and not be exported out for other usages.
Signed-off-by Fancy Fang <[email protected]>--- .../devicetree/bindings/clock/imx7ulp-clock.txt | 1 - drivers/clk/imx/clk-imx7ulp.c | 3 +-- include/dt-bindings/clock/imx7ulp-clock.h | 15 +++++++-------- 3 files changed, 8 insertions(+), 11 deletions(-)Documentation/devicetree/bindings/clock/imx7ulp-clock.txt +0
-1@@ -82,7 +82,6 @@ pcc2: pcc2@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>;drivers/clk/imx/clk-imx7ulp.c +1
-2@@ -28,7 +28,7 @@ static const char * const scs_sels[] = { "dummy", "sosc", "sirc", "firc", "dummstatic const char *const ddr_sels[] = {"apll_pfd_sel" ,"upll" , };static const char *const nic_sels[] = {"firc" ,"ddr_clk" , };static const char *const periph_plat_sels[] = {"dummy" ,"nic1_bus_clk" ,"nic1_clk" ,"ddr_clk" ,"apll_pfd2" ,"apll_pfd1" ,"apll_pfd0" ,"upll" , }; -static const char *const periph_bus_sels[] = {"dummy" ,"sosc_bus_clk" ,"mpll" ,"firc_bus_clk" ,"rosc" ,"nic1_bus_clk" ,"nic1_clk" ,"spll_bus_clk" , }; +static const char *const periph_bus_sels[] = {"dummy" ,"sosc_bus_clk" ,"dummy" ,"firc_bus_clk" ,"rosc" ,"nic1_bus_clk" ,"nic1_clk" ,"spll_bus_clk" , };static const char *const arm_sels[] = {"divcore" ,"dummy" ,"dummy" ,"hsrun_divcore" , };/* used by sosc/sirc/firc/ddr/spll/apll dividers */ @@ -75,7 +75,6 @@ static void __init imx7ulp_clk_scg1_init(struct device_node *np) clks[IMX7ULP_CLK_SOSC ] =imx_obtain_fixed_clk_hw (np,"sosc" ); clks[IMX7ULP_CLK_SIRC ] =imx_obtain_fixed_clk_hw (np,"sirc" ); clks[IMX7ULP_CLK_FIRC ] =imx_obtain_fixed_clk_hw (np,"firc" ); - clks[IMX7ULP_CLK_MIPI_PLL ] =imx_obtain_fixed_clk_hw (np,"mpll" ); clks[IMX7ULP_CLK_UPLL ] =imx_obtain_fixed_clk_hw (np,"upll" );/* SCG1 */ include/dt-bindings/clock/imx7ulp-clock.h +0
-3@@ -49,15 +49,14 @@#define IMX7ULP_CLK_NIC1_DIV 36#define IMX7ULP_CLK_NIC1_BUS_DIV 37#define IMX7ULP_CLK_NIC1_EXT_DIV 38 -#define IMX7ULP_CLK_MIPI_PLL 39 -#define IMX7ULP_CLK_SIRC 40 -#define IMX7ULP_CLK_SOSC_BUS_CLK 41
include/dt-bindings/clock/imx7ulp-clock.h line 57
Quoted 10 lines
include/dt-bindings/clock/imx7ulp-clock.h +6
-4-#define IMX7ULP_CLK_FIRC_BUS_CLK 42 -#define IMX7ULP_CLK_SPLL_BUS_CLK 43 -#define IMX7ULP_CLK_HSRUN_SYS_SEL 44 -#define IMX7ULP_CLK_HSRUN_CORE_DIV 45 +#define IMX7ULP_CLK_SIRC 39 +#define IMX7ULP_CLK_SOSC_BUS_CLK 40 +#define IMX7ULP_CLK_FIRC_BUS_CLK 41 +#define IMX7ULP_CLK_SPLL_BUS_CLK 42 +#define IMX7ULP_CLK_HSRUN_SYS_SEL 43 +#define IMX7ULP_CLK_HSRUN_CORE_DIV 44
No. These clock IDs need to be stable, as they are referred by DT. If you want to remove an ID, just remove it, keep others unchanged.
Shawn
Quoted 9 lines
include/dt-bindings/clock/imx7ulp-clock.h +1
-1-#define IMX7ULP_CLK_SCG1_END 46 +#define IMX7ULP_CLK_SCG1_END 45/* PCC2 */ #define IMX7ULP_CLK_DMA1 0Signature · 1 line
2.17.1
Shawn Guo
AppliedQuoted 6 lines · Fancy Fang
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 <[email protected]>
Applied, thanks.