From cf6c3c480a839d9f47488e6de1f78761cd6a16fa Mon Sep 17 00:00:00 2001 From: Ranjani Vaidyanathan Date: Tue, 23 Jul 2019 15:50:06 -0500 Subject: [PATCH] MLK-22306-1 clks: imx8qxp: Fix clocks in the imaging subsystem. Remove clocks that dont exist in imx8qxp. Change clock names to match HW. Signed-off-by: Ranjani Vaidyanathan --- drivers/clk/imx/clk-imx8qxp.c | 4 +--- include/soc/imx8/imx8qxp/lpcg.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c index 424c706a5481..f998d6376816 100644 --- a/drivers/clk/imx/clk-imx8qxp.c +++ b/drivers/clk/imx/clk-imx8qxp.c @@ -561,10 +561,8 @@ static int imx8qxp_clk_probe(struct platform_device *pdev) clks[IMX8QXP_IMG_JPEG_DEC_IPG_CLK] = imx_clk_gate2_scu("img_jpeg_dec_ipg_clk", "ipg_img_clk_root", (void __iomem *)(IMG_JPEG_DEC_LPCG), 16, FUNCTION_NAME(PD_IMAGING_JPEG_DEC)); clks[IMX8QXP_IMG_JPEG_DEC_CLK] = imx_clk_gate2_scu("img_jpeg_dec_clk", "img_jpeg_dec_ipg_clk", (void __iomem *)(IMG_JPEG_DEC_LPCG), 0, FUNCTION_NAME(PD_IMAGING_JPEG_DEC)); clks[IMX8QXP_IMG_PXL_LINK_DC0_CLK] = imx_clk_gate2_scu("img_pxl_link_dc0_clk", "pxl_img_clk_root", (void __iomem *)(IMG_PXL_LINK_DC0_LPCG), 0, FUNCTION_NAME(PD_IMAGING)); - clks[IMX8QXP_IMG_PXL_LINK_DC1_CLK] = imx_clk_gate2_scu("img_pxl_link_dc1_clk", "pxl_img_clk_root", (void __iomem *)(IMG_PXL_LINK_DC1_LPCG), 0, FUNCTION_NAME(PD_IMAGING)); clks[IMX8QXP_IMG_PXL_LINK_CSI0_CLK] = imx_clk_gate2_scu("img_pxl_link_csi0_clk", "pxl_img_clk_root", (void __iomem *)(IMG_PXL_LINK_CSI0_LPCG), 0, FUNCTION_NAME(PD_IMAGING)); - clks[IMX8QXP_IMG_PXL_LINK_CSI1_CLK] = imx_clk_gate2_scu("img_pxl_link_csi1_clk", "pxl_img_clk_root", (void __iomem *)(IMG_PXL_LINK_CSI1_LPCG), 0, FUNCTION_NAME(PD_IMAGING)); - clks[IMX8QXP_IMG_PXL_LINK_HDMI_IN_CLK] = imx_clk_gate2_scu("img_pxl_link_hdmi_in_clk", "pxl_img_clk_root", (void __iomem *)(IMG_PXL_LINK_HDMI_LPCG), 0, FUNCTION_NAME(PD_HDMI_RX)); + clks[IMX8QXP_IMG_PXL_LINK_PI_0_CLK] = imx_clk_gate2_scu("img_pxl_link_pi_0_clk", "pxl_img_clk_root", (void __iomem *)(IMG_PXL_LINK_PI_0_LPCG), 0, FUNCTION_NAME(PD_IMAGING)); clks[IMX8QXP_IMG_PDMA_0_CLK] = imx_clk_gate2_scu("img_pdma0_clk", "pxl_img_clk_root", (void __iomem *)(IMG_PDMA_0_LPCG), 0, FUNCTION_NAME(PD_IMAGING_PDMA0)); clks[IMX8QXP_IMG_PDMA_1_CLK] = imx_clk_gate2_scu("img_pdma1_clk", "pxl_img_clk_root", (void __iomem *)(IMG_PDMA_1_LPCG), 0, FUNCTION_NAME(PD_IMAGING_PDMA1)); clks[IMX8QXP_IMG_PDMA_2_CLK] = imx_clk_gate2_scu("img_pdma2_clk", "pxl_img_clk_root", (void __iomem *)(IMG_PDMA_2_LPCG), 0, FUNCTION_NAME(PD_IMAGING_PDMA2)); diff --git a/include/soc/imx8/imx8qxp/lpcg.h b/include/soc/imx8/imx8qxp/lpcg.h index 79b774d825ba..c932e243c68f 100644 --- a/include/soc/imx8/imx8qxp/lpcg.h +++ b/include/soc/imx8/imx8qxp/lpcg.h @@ -110,7 +110,7 @@ #define IMG_JPEG_DEC_LPCG 0x585D0000 #define IMG_PXL_LINK_DC1_LPCG 0x585C0000 #define IMG_PXL_LINK_DC0_LPCG 0x585B0000 -#define IMG_PXL_LINK_HDMI_LPCG 0x585A0000 +#define IMG_PXL_LINK_PI_0_LPCG 0x585A0000 #define IMG_PXL_LINK_CSI1_LPCG 0x58590000 #define IMG_PXL_LINK_CSI0_LPCG 0x58580000 #define IMG_PDMA_7_LPCG 0x58570000 -- 2.17.1