clk: imx8mp: Add DISP2 pixel clock
PATCH 1/1 clk: imx8mp: Add DISP2 pixel clock
Add pixel clock for second LCDIFv3 interface. Both LCDIFv3 interfaces use the same set of parent clock, so deduplicate imx8mp_media_disp1_pix_sels into common imx8mp_media_disp_pix_sels and use it for both.
Signed-off-by Marek Vasut <[email protected]>
Cc Abel Vesa <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
Cc Peng Fan <[email protected]>
Cc Shawn Guo <[email protected]>
--- drivers/clk/imx/clk-imx8mp.c | 5 +++-- include/dt-bindings/clock/imx8mp-clock.h | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/clk/imx/clk-imx8mp.c +3 -2
@@ -358,7 +358,7 @@ static const char * const imx8mp_media_mipi_phy1_ref_sels[] = {"osc_24m", "sys_p"clk_ext2" ,"audio_pll2_out" , "video_pll1_out", }; -static const char *const imx8mp_media_disp1_pix_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" , +static const char *const imx8mp_media_disp_pix_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , };
@@ -538,6 +538,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_AHB ] =imx8m_clk_hw_composite_bus_critical ("ahb_root" , imx8mp_ahb_sels, ccm_base +0x9000 ); hws[IMX8MP_CLK_AUDIO_AHB ] =imx8m_clk_hw_composite_bus ("audio_ahb" , imx8mp_audio_ahb_sels, ccm_base +0x9100 ); hws[IMX8MP_CLK_MIPI_DSI_ESC_RX ] =imx8m_clk_hw_composite_bus ("mipi_dsi_esc_rx" , imx8mp_mipi_dsi_esc_rx_sels, ccm_base +0x9200 ); + hws[IMX8MP_CLK_MEDIA_DISP2_PIX ] =imx8m_clk_hw_composite ("media_disp2_pix" , imx8mp_media_disp_pix_sels, ccm_base +0x9300 ); hws[IMX8MP_CLK_IPG_ROOT ] =imx_clk_hw_divider2 ("ipg_root" ,"ahb_root" , ccm_base +0x9080 ,0 ,1 );
@@ -600,7 +601,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_USDHC3 ] =imx8m_clk_hw_composite ("usdhc3" , imx8mp_usdhc3_sels, ccm_base +0xbc80 ); hws[IMX8MP_CLK_MEDIA_CAM1_PIX ] =imx8m_clk_hw_composite ("media_cam1_pix" , imx8mp_media_cam1_pix_sels, ccm_base +0xbd00 ); hws[IMX8MP_CLK_MEDIA_MIPI_PHY1_REF ] =imx8m_clk_hw_composite ("media_mipi_phy1_ref" , imx8mp_media_mipi_phy1_ref_sels, ccm_base +0xbd80 ); - hws[IMX8MP_CLK_MEDIA_DISP1_PIX ] =imx8m_clk_hw_composite ("media_disp1_pix" , imx8mp_media_disp1_pix_sels, ccm_base +0xbe00 ); + hws[IMX8MP_CLK_MEDIA_DISP1_PIX ] =imx8m_clk_hw_composite ("media_disp1_pix" , imx8mp_media_disp_pix_sels, ccm_base +0xbe00 ); hws[IMX8MP_CLK_MEDIA_CAM2_PIX ] =imx8m_clk_hw_composite ("media_cam2_pix" , imx8mp_media_cam2_pix_sels, ccm_base +0xbe80 ); hws[IMX8MP_CLK_MEDIA_LDB ] =imx8m_clk_hw_composite ("media_ldb" , imx8mp_media_ldb_sels, ccm_base +0xbf00 ); hws[IMX8MP_CLK_MEMREPAIR ] =imx8m_clk_hw_composite_critical ("mem_repair" , imx8mp_memrepair_sels, ccm_base +0xbf80 );
include/dt-bindings/clock/imx8mp-clock.h +3 -1
@@ -318,7 +318,9 @@#define IMX8MP_CLK_HSIO_AXI 311#define IMX8MP_CLK_MEDIA_ISP 312 -#define IMX8MP_CLK_END 313 +#define IMX8MP_CLK_MEDIA_DISP2_PIX 313 + +#define IMX8MP_CLK_END 314#define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1
Signature · 1 line
2.35.1
Quoted 10 lines · Marek Vasut
Add pixel clock for second LCDIFv3 interface. Both LCDIFv3 interfaces use the same set of parent clock, so deduplicate
imx8mp_media_disp1_pix_selsinto commonimx8mp_media_disp_pix_selsand use it for both.Signed-off-by Marek Vasut <[email protected]>Cc Abel Vesa <[email protected]>Cc Fabio Estevam <[email protected]>Cc NXP Linux Team <[email protected]>Cc Peng Fan <[email protected]>Cc Shawn Guo <[email protected]>
Looks OK to me.
Reviewed-by Abel Vesa <[email protected]>
Quoted 53 lines
--- drivers/clk/imx/clk-imx8mp.c | 5 +++-- include/dt-bindings/clock/imx8mp-clock.h | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-)drivers/clk/imx/clk-imx8mp.c +3
-2@@ -358,7 +358,7 @@ static const char * const imx8mp_media_mipi_phy1_ref_sels[] = {"osc_24m", "sys_p"clk_ext2" ,"audio_pll2_out" , "video_pll1_out", }; -static const char *const imx8mp_media_disp1_pix_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" , +static const char *const imx8mp_media_disp_pix_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , };@@ -538,6 +538,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_AHB ] =imx8m_clk_hw_composite_bus_critical ("ahb_root" , imx8mp_ahb_sels, ccm_base +0x9000 ); hws[IMX8MP_CLK_AUDIO_AHB ] =imx8m_clk_hw_composite_bus ("audio_ahb" , imx8mp_audio_ahb_sels, ccm_base +0x9100 ); hws[IMX8MP_CLK_MIPI_DSI_ESC_RX ] =imx8m_clk_hw_composite_bus ("mipi_dsi_esc_rx" , imx8mp_mipi_dsi_esc_rx_sels, ccm_base +0x9200 ); + hws[IMX8MP_CLK_MEDIA_DISP2_PIX ] =imx8m_clk_hw_composite ("media_disp2_pix" , imx8mp_media_disp_pix_sels, ccm_base +0x9300 ); hws[IMX8MP_CLK_IPG_ROOT ] =imx_clk_hw_divider2 ("ipg_root" ,"ahb_root" , ccm_base +0x9080 ,0 ,1 );@@ -600,7 +601,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_USDHC3 ] =imx8m_clk_hw_composite ("usdhc3" , imx8mp_usdhc3_sels, ccm_base +0xbc80 ); hws[IMX8MP_CLK_MEDIA_CAM1_PIX ] =imx8m_clk_hw_composite ("media_cam1_pix" , imx8mp_media_cam1_pix_sels, ccm_base +0xbd00 ); hws[IMX8MP_CLK_MEDIA_MIPI_PHY1_REF ] =imx8m_clk_hw_composite ("media_mipi_phy1_ref" , imx8mp_media_mipi_phy1_ref_sels, ccm_base +0xbd80 ); - hws[IMX8MP_CLK_MEDIA_DISP1_PIX ] =imx8m_clk_hw_composite ("media_disp1_pix" , imx8mp_media_disp1_pix_sels, ccm_base +0xbe00 ); + hws[IMX8MP_CLK_MEDIA_DISP1_PIX ] =imx8m_clk_hw_composite ("media_disp1_pix" , imx8mp_media_disp_pix_sels, ccm_base +0xbe00 ); hws[IMX8MP_CLK_MEDIA_CAM2_PIX ] =imx8m_clk_hw_composite ("media_cam2_pix" , imx8mp_media_cam2_pix_sels, ccm_base +0xbe80 ); hws[IMX8MP_CLK_MEDIA_LDB ] =imx8m_clk_hw_composite ("media_ldb" , imx8mp_media_ldb_sels, ccm_base +0xbf00 ); hws[IMX8MP_CLK_MEMREPAIR ] =imx8m_clk_hw_composite_critical ("mem_repair" , imx8mp_memrepair_sels, ccm_base +0xbf80 );include/dt-bindings/clock/imx8mp-clock.h +3
-2@@ -318,7 +318,9 @@#define IMX8MP_CLK_HSIO_AXI 311#define IMX8MP_CLK_MEDIA_ISP 312 -#define IMX8MP_CLK_END 313 +#define IMX8MP_CLK_MEDIA_DISP2_PIX 313 + +#define IMX8MP_CLK_END 314#define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1 --2.35.1
Abel Vesa
AppliedQuoted 10 lines · Marek Vasut
Add pixel clock for second LCDIFv3 interface. Both LCDIFv3 interfaces use the same set of parent clock, so deduplicate
imx8mp_media_disp1_pix_selsinto commonimx8mp_media_disp_pix_selsand use it for both.Signed-off-by Marek Vasut <[email protected]>Cc Abel Vesa <[email protected]>Cc Fabio Estevam <[email protected]>Cc NXP Linux Team <[email protected]>Cc Peng Fan <[email protected]>Cc Shawn Guo <[email protected]>
Applied, thanks!
Quoted 53 lines
--- drivers/clk/imx/clk-imx8mp.c | 5 +++-- include/dt-bindings/clock/imx8mp-clock.h | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-)drivers/clk/imx/clk-imx8mp.c +3
-2@@ -358,7 +358,7 @@ static const char * const imx8mp_media_mipi_phy1_ref_sels[] = {"osc_24m", "sys_p"clk_ext2" ,"audio_pll2_out" , "video_pll1_out", }; -static const char *const imx8mp_media_disp1_pix_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" , +static const char *const imx8mp_media_disp_pix_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , };@@ -538,6 +538,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_AHB ] =imx8m_clk_hw_composite_bus_critical ("ahb_root" , imx8mp_ahb_sels, ccm_base +0x9000 ); hws[IMX8MP_CLK_AUDIO_AHB ] =imx8m_clk_hw_composite_bus ("audio_ahb" , imx8mp_audio_ahb_sels, ccm_base +0x9100 ); hws[IMX8MP_CLK_MIPI_DSI_ESC_RX ] =imx8m_clk_hw_composite_bus ("mipi_dsi_esc_rx" , imx8mp_mipi_dsi_esc_rx_sels, ccm_base +0x9200 ); + hws[IMX8MP_CLK_MEDIA_DISP2_PIX ] =imx8m_clk_hw_composite ("media_disp2_pix" , imx8mp_media_disp_pix_sels, ccm_base +0x9300 ); hws[IMX8MP_CLK_IPG_ROOT ] =imx_clk_hw_divider2 ("ipg_root" ,"ahb_root" , ccm_base +0x9080 ,0 ,1 );@@ -600,7 +601,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_USDHC3 ] =imx8m_clk_hw_composite ("usdhc3" , imx8mp_usdhc3_sels, ccm_base +0xbc80 ); hws[IMX8MP_CLK_MEDIA_CAM1_PIX ] =imx8m_clk_hw_composite ("media_cam1_pix" , imx8mp_media_cam1_pix_sels, ccm_base +0xbd00 ); hws[IMX8MP_CLK_MEDIA_MIPI_PHY1_REF ] =imx8m_clk_hw_composite ("media_mipi_phy1_ref" , imx8mp_media_mipi_phy1_ref_sels, ccm_base +0xbd80 ); - hws[IMX8MP_CLK_MEDIA_DISP1_PIX ] =imx8m_clk_hw_composite ("media_disp1_pix" , imx8mp_media_disp1_pix_sels, ccm_base +0xbe00 ); + hws[IMX8MP_CLK_MEDIA_DISP1_PIX ] =imx8m_clk_hw_composite ("media_disp1_pix" , imx8mp_media_disp_pix_sels, ccm_base +0xbe00 ); hws[IMX8MP_CLK_MEDIA_CAM2_PIX ] =imx8m_clk_hw_composite ("media_cam2_pix" , imx8mp_media_cam2_pix_sels, ccm_base +0xbe80 ); hws[IMX8MP_CLK_MEDIA_LDB ] =imx8m_clk_hw_composite ("media_ldb" , imx8mp_media_ldb_sels, ccm_base +0xbf00 ); hws[IMX8MP_CLK_MEMREPAIR ] =imx8m_clk_hw_composite_critical ("mem_repair" , imx8mp_memrepair_sels, ccm_base +0xbf80 );include/dt-bindings/clock/imx8mp-clock.h +3
-2@@ -318,7 +318,9 @@#define IMX8MP_CLK_HSIO_AXI 311#define IMX8MP_CLK_MEDIA_ISP 312 -#define IMX8MP_CLK_END 313 +#define IMX8MP_CLK_MEDIA_DISP2_PIX 313 + +#define IMX8MP_CLK_END 314#define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1 --2.35.1