Skip to contentSkip to conversation

clk: imx8mm: Switch to platform driver

PATCH Applied Abel Vesa 5 participants 9 messages Jul 9, 2019 – Mar 17, 2020

Subsystems (4)
lore
Share & tools
lore

Abel Vesa

author
#0 lore raw

PATCH v2 1/1 clk: imx8mm: Switch to platform driver

There is no strong reason for this to use CLK_OF_DECLARE instead of being a platform driver. Plus, this will now be aligned with the other i.MX8M clock drivers which are platform drivers.

In order to make the clock provider a platform driver all the data and code needs to be outside of .init section.

---

Changes since v1:
* Switched to platform driver memory mapping API
* Removed extra newline
* Added an explanation of why this change is done in the commit message

 drivers/clk/imx/clk-imx8mm.c | 57 ++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 21 deletions(-)
drivers/clk/imx/clk-imx8mm.c +36 -21
index 6b8e75d..7a8e713 100644
@@ -68,43 +68,43 @@ static const struct imx_pll14xx_rate_table imx8mm_drampll_tbl[] = {
 	PLL_1443X_RATE(650000000U, 325, 3, 2, 0),
 };
 
-static struct imx_pll14xx_clk imx8mm_audio_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_audio_pll = {
 		.type = PLL_1443X,
 		.rate_table = imx8mm_audiopll_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_audiopll_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_video_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_video_pll = {
 		.type = PLL_1443X,
 		.rate_table = imx8mm_videopll_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_videopll_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_dram_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_dram_pll = {
 		.type = PLL_1443X,
 		.rate_table = imx8mm_drampll_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_drampll_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_arm_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_arm_pll = {
 		.type = PLL_1416X,
 		.rate_table = imx8mm_pll1416x_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_gpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_gpu_pll = {
 		.type = PLL_1416X,
 		.rate_table = imx8mm_pll1416x_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_vpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_vpu_pll = {
 		.type = PLL_1416X,
 		.rate_table = imx8mm_pll1416x_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_sys_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_sys_pll = {
 		.type = PLL_1416X,
 		.rate_table = imx8mm_pll1416x_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
@@ -374,7 +374,7 @@ static const char *imx8mm_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "osc_27m",
 static struct clk *clks[IMX8MM_CLK_END];
 static struct clk_onecell_data clk_data;
 
-static struct clk ** const uart_clks[] __initconst = {
+static struct clk ** const uart_clks[] = {
 	&clks[IMX8MM_CLK_UART1_ROOT],
 	&clks[IMX8MM_CLK_UART2_ROOT],
 	&clks[IMX8MM_CLK_UART3_ROOT],
@@ -382,19 +382,20 @@ static struct clk ** const uart_clks[] __initconst = {
 	NULL
 };
 
-static int __init imx8mm_clocks_init(struct device_node *ccm_node)
+static int imx8mm_clocks_probe(struct platform_device *pdev)
 {
-	struct device_node *np;
+	struct device *dev = &pdev->dev;
+	struct device_node *np = dev->of_node;
 	void __iomem *base;
 	int ret;
 
 	clks[IMX8MM_CLK_DUMMY] = imx_clk_fixed("dummy", 0);
-	clks[IMX8MM_CLK_24M] = of_clk_get_by_name(ccm_node, "osc_24m");
-	clks[IMX8MM_CLK_32K] = of_clk_get_by_name(ccm_node, "osc_32k");
-	clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(ccm_node, "clk_ext1");
-	clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(ccm_node, "clk_ext2");
-	clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(ccm_node, "clk_ext3");
-	clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(ccm_node, "clk_ext4");
+	clks[IMX8MM_CLK_24M] = of_clk_get_by_name(np, "osc_24m");
+	clks[IMX8MM_CLK_32K] = of_clk_get_by_name(np, "osc_32k");
+	clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(np, "clk_ext1");
+	clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(np, "clk_ext2");
+	clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(np, "clk_ext3");
+	clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(np, "clk_ext4");
 
 	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-anatop");
 	base = of_iomap(np, 0);
@@ -480,10 +481,10 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
 	clks[IMX8MM_SYS_PLL2_500M] = imx_clk_fixed_factor("sys_pll2_500m", "sys_pll2_out", 1, 2);
 	clks[IMX8MM_SYS_PLL2_1000M] = imx_clk_fixed_factor("sys_pll2_1000m", "sys_pll2_out", 1, 1);
 
-	np = ccm_node;
-	base = of_iomap(np, 0);
-	if (WARN_ON(!base))
-		return -ENOMEM;
+	np = dev->of_node;
+	base = devm_platform_ioremap_resource(pdev, 0);
+	if (WARN_ON(IS_ERR(base)))
+		return PTR_ERR(base);
 
 	/* Core Slice */
 	clks[IMX8MM_CLK_A53_SRC] = imx_clk_mux2("arm_a53_src", base + 0x8000, 24, 3, imx8mm_a53_sels, ARRAY_SIZE(imx8mm_a53_sels));
@@ -682,4 +683,18 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
 
 	return 0;
 }
-CLK_OF_DECLARE_DRIVER(imx8mm, "fsl,imx8mm-ccm", imx8mm_clocks_init);
+
+static const struct of_device_id imx8mm_clk_of_match[] = {
+	{ .compatible = "fsl,imx8mm-ccm" },
+	{ /* Sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, imx8mm_clk_of_match);
+
+static struct platform_driver imx8mm_clk_driver = {
+	.probe = imx8mm_clocks_probe,
+	.driver = {
+		.name = "imx8mm-ccm",
+		.of_match_table = of_match_ptr(imx8mm_clk_of_match),
+	},
+};
+module_platform_driver(imx8mm_clk_driver);
Signature · 1 line
2.7.4
#1 lore raw
Quoted 7 lines · Abel Vesa

There is no strong reason for this to use CLK_OF_DECLARE instead of being a platform driver. Plus, this will now be aligned with the other i.MX8M clock drivers which are platform drivers.

In order to make the clock provider a platform driver all the data and code needs to be outside of .init section.

Quoted 8 lines

---

Changes since v1:
* Switched to platform driver memory mapping API
* Removed extra newline
* Added an explanation of why this change is done in the commit message

Hi Stephen,

Are you fine with this version?

Shawn

Quoted 135 lines
 drivers/clk/imx/clk-imx8mm.c | 57 ++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 21 deletions(-)
drivers/clk/imx/clk-imx8mm.c +36 -21
index 6b8e75d..7a8e713 100644
@@ -68,43 +68,43 @@ static const struct imx_pll14xx_rate_table imx8mm_drampll_tbl[] = {
 	PLL_1443X_RATE(650000000U, 325, 3, 2, 0),
 };
 
-static struct imx_pll14xx_clk imx8mm_audio_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_audio_pll = {
 		.type = PLL_1443X,
 		.rate_table = imx8mm_audiopll_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_audiopll_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_video_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_video_pll = {
 		.type = PLL_1443X,
 		.rate_table = imx8mm_videopll_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_videopll_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_dram_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_dram_pll = {
 		.type = PLL_1443X,
 		.rate_table = imx8mm_drampll_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_drampll_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_arm_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_arm_pll = {
 		.type = PLL_1416X,
 		.rate_table = imx8mm_pll1416x_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_gpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_gpu_pll = {
 		.type = PLL_1416X,
 		.rate_table = imx8mm_pll1416x_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_vpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_vpu_pll = {
 		.type = PLL_1416X,
 		.rate_table = imx8mm_pll1416x_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
 };
 
-static struct imx_pll14xx_clk imx8mm_sys_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_sys_pll = {
 		.type = PLL_1416X,
 		.rate_table = imx8mm_pll1416x_tbl,
 		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
@@ -374,7 +374,7 @@ static const char *imx8mm_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "osc_27m",
 static struct clk *clks[IMX8MM_CLK_END];
 static struct clk_onecell_data clk_data;
 
-static struct clk ** const uart_clks[] __initconst = {
+static struct clk ** const uart_clks[] = {
 	&clks[IMX8MM_CLK_UART1_ROOT],
 	&clks[IMX8MM_CLK_UART2_ROOT],
 	&clks[IMX8MM_CLK_UART3_ROOT],
@@ -382,19 +382,20 @@ static struct clk ** const uart_clks[] __initconst = {
 	NULL
 };
 
-static int __init imx8mm_clocks_init(struct device_node *ccm_node)
+static int imx8mm_clocks_probe(struct platform_device *pdev)
 {
-	struct device_node *np;
+	struct device *dev = &pdev->dev;
+	struct device_node *np = dev->of_node;
 	void __iomem *base;
 	int ret;
 
 	clks[IMX8MM_CLK_DUMMY] = imx_clk_fixed("dummy", 0);
-	clks[IMX8MM_CLK_24M] = of_clk_get_by_name(ccm_node, "osc_24m");
-	clks[IMX8MM_CLK_32K] = of_clk_get_by_name(ccm_node, "osc_32k");
-	clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(ccm_node, "clk_ext1");
-	clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(ccm_node, "clk_ext2");
-	clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(ccm_node, "clk_ext3");
-	clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(ccm_node, "clk_ext4");
+	clks[IMX8MM_CLK_24M] = of_clk_get_by_name(np, "osc_24m");
+	clks[IMX8MM_CLK_32K] = of_clk_get_by_name(np, "osc_32k");
+	clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(np, "clk_ext1");
+	clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(np, "clk_ext2");
+	clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(np, "clk_ext3");
+	clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(np, "clk_ext4");
 
 	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-anatop");
 	base = of_iomap(np, 0);
@@ -480,10 +481,10 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
 	clks[IMX8MM_SYS_PLL2_500M] = imx_clk_fixed_factor("sys_pll2_500m", "sys_pll2_out", 1, 2);
 	clks[IMX8MM_SYS_PLL2_1000M] = imx_clk_fixed_factor("sys_pll2_1000m", "sys_pll2_out", 1, 1);
 
-	np = ccm_node;
-	base = of_iomap(np, 0);
-	if (WARN_ON(!base))
-		return -ENOMEM;
+	np = dev->of_node;
+	base = devm_platform_ioremap_resource(pdev, 0);
+	if (WARN_ON(IS_ERR(base)))
+		return PTR_ERR(base);
 
 	/* Core Slice */
 	clks[IMX8MM_CLK_A53_SRC] = imx_clk_mux2("arm_a53_src", base + 0x8000, 24, 3, imx8mm_a53_sels, ARRAY_SIZE(imx8mm_a53_sels));
@@ -682,4 +683,18 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
 
 	return 0;
 }
-CLK_OF_DECLARE_DRIVER(imx8mm, "fsl,imx8mm-ccm", imx8mm_clocks_init);
+
+static const struct of_device_id imx8mm_clk_of_match[] = {
+	{ .compatible = "fsl,imx8mm-ccm" },
+	{ /* Sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, imx8mm_clk_of_match);
+
+static struct platform_driver imx8mm_clk_driver = {
+	.probe = imx8mm_clocks_probe,
+	.driver = {
+		.name = "imx8mm-ccm",
+		.of_match_table = of_match_ptr(imx8mm_clk_of_match),
+	},
+};
+module_platform_driver(imx8mm_clk_driver);
Signature · 1 line
2.7.4
maintainer Acked-by
#2 lore raw

Quoting Shawn Guo (2019-07-22 23:09:06)

Quoted 17 lines · Abel Vesa
Quoted 7 lines

There is no strong reason for this to use CLK_OF_DECLARE instead of being a platform driver. Plus, this will now be aligned with the other i.MX8M clock drivers which are platform drivers.

In order to make the clock provider a platform driver all the data and code needs to be outside of .init section.

Quoted 8 lines

---

Changes since v1:
* Switched to platform driver memory mapping API
* Removed extra newline
* Added an explanation of why this change is done in the commit message

Quoted 4 lines

Hi Stephen,

Are you fine with this version?

Sure.

Applied
#3 lore raw
In reply to Abel Vesa
Quoted 8 lines · Abel Vesa

There is no strong reason for this to use CLK_OF_DECLARE instead of being a platform driver. Plus, this will now be aligned with the other i.MX8M clock drivers which are platform drivers.

In order to make the clock provider a platform driver all the data and code needs to be outside of .init section.

Applied, thanks.

#4 lore raw
In reply to Abel Vesa

Hi,

Quoted 9 lines · Abel Vesa

There is no strong reason for this to use CLK_OF_DECLARE instead of being a platform driver. Plus, this will now be aligned with the other i.MX8M clock drivers which are platform drivers.

In order to make the clock provider a platform driver all the data and code needs to be outside of .init section.

This has been upstream for quite some time now, but somehow I have an issue with SPI on the i.MX8MM that gets resolved when I revert this patch.

When I try to probe an SPI NOR flash with latest 5.4 or even 5.5:

	spi_imx 30820000.spi: dma setup error -19, use pio
	spi-nor spi0.0: unrecognized JEDEC id bytes: 00 00 00 00 00 00
	spi_imx 30820000.spi: probed

When I revert this patch:

	spi_imx 30820000.spi: dma setup error -19, use pio
	spi-nor spi0.0: mx25r1635f (2048 Kbytes)
	spi_imx 30820000.spi: probed

Please note, that in both cases I have disabled DMA, as this causes even more trouble (see [1]). But even with DMA enabled and ignoring the DMA errors, the issue described above occurs.

Does someone have an idea what's wrong?
Am I the only user of SPI on i.MX8MM as this issue seems to exist upstream since v5.4-rc1?

Thanks,
Frieder

Quoted 140 lines

---

Changes since v1:
* Switched to platform driver memory mapping API
* Removed extra newline
* Added an explanation of why this change is done in the commit message

  drivers/clk/imx/clk-imx8mm.c | 57 ++++++++++++++++++++++++++++----------------
  1 file changed, 36 insertions(+), 21 deletions(-)
drivers/clk/imx/clk-imx8mm.c +36 -21
index 6b8e75d..7a8e713 100644
@@ -68,43 +68,43 @@ static const struct imx_pll14xx_rate_table imx8mm_drampll_tbl[] = {
  	PLL_1443X_RATE(650000000U, 325, 3, 2, 0),
  };
 
-static struct imx_pll14xx_clk imx8mm_audio_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_audio_pll = {
  		.type = PLL_1443X,
  		.rate_table = imx8mm_audiopll_tbl,
  		.rate_count = ARRAY_SIZE(imx8mm_audiopll_tbl),
  };
 
-static struct imx_pll14xx_clk imx8mm_video_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_video_pll = {
  		.type = PLL_1443X,
  		.rate_table = imx8mm_videopll_tbl,
  		.rate_count = ARRAY_SIZE(imx8mm_videopll_tbl),
  };
 
-static struct imx_pll14xx_clk imx8mm_dram_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_dram_pll = {
  		.type = PLL_1443X,
  		.rate_table = imx8mm_drampll_tbl,
  		.rate_count = ARRAY_SIZE(imx8mm_drampll_tbl),
  };
 
-static struct imx_pll14xx_clk imx8mm_arm_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_arm_pll = {
  		.type = PLL_1416X,
  		.rate_table = imx8mm_pll1416x_tbl,
  		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
  };
 
-static struct imx_pll14xx_clk imx8mm_gpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_gpu_pll = {
  		.type = PLL_1416X,
  		.rate_table = imx8mm_pll1416x_tbl,
  		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
  };
 
-static struct imx_pll14xx_clk imx8mm_vpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_vpu_pll = {
  		.type = PLL_1416X,
  		.rate_table = imx8mm_pll1416x_tbl,
  		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
  };
 
-static struct imx_pll14xx_clk imx8mm_sys_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_sys_pll = {
  		.type = PLL_1416X,
  		.rate_table = imx8mm_pll1416x_tbl,
  		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
@@ -374,7 +374,7 @@ static const char *imx8mm_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "osc_27m",
  static struct clk *clks[IMX8MM_CLK_END];
  static struct clk_onecell_data clk_data;
 
-static struct clk ** const uart_clks[] __initconst = {
+static struct clk ** const uart_clks[] = {
  	&clks[IMX8MM_CLK_UART1_ROOT],
  	&clks[IMX8MM_CLK_UART2_ROOT],
  	&clks[IMX8MM_CLK_UART3_ROOT],
@@ -382,19 +382,20 @@ static struct clk ** const uart_clks[] __initconst = {
  	NULL
  };
 
-static int __init imx8mm_clocks_init(struct device_node *ccm_node)
+static int imx8mm_clocks_probe(struct platform_device *pdev)
  {
-	struct device_node *np;
+	struct device *dev = &pdev->dev;
+	struct device_node *np = dev->of_node;
  	void __iomem *base;
  	int ret;
 
  	clks[IMX8MM_CLK_DUMMY] = imx_clk_fixed("dummy", 0);
-	clks[IMX8MM_CLK_24M] = of_clk_get_by_name(ccm_node, "osc_24m");
-	clks[IMX8MM_CLK_32K] = of_clk_get_by_name(ccm_node, "osc_32k");
-	clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(ccm_node, "clk_ext1");
-	clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(ccm_node, "clk_ext2");
-	clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(ccm_node, "clk_ext3");
-	clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(ccm_node, "clk_ext4");
+	clks[IMX8MM_CLK_24M] = of_clk_get_by_name(np, "osc_24m");
+	clks[IMX8MM_CLK_32K] = of_clk_get_by_name(np, "osc_32k");
+	clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(np, "clk_ext1");
+	clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(np, "clk_ext2");
+	clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(np, "clk_ext3");
+	clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(np, "clk_ext4");
 
  	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-anatop");
  	base = of_iomap(np, 0);
@@ -480,10 +481,10 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
  	clks[IMX8MM_SYS_PLL2_500M] = imx_clk_fixed_factor("sys_pll2_500m", "sys_pll2_out", 1, 2);
  	clks[IMX8MM_SYS_PLL2_1000M] = imx_clk_fixed_factor("sys_pll2_1000m", "sys_pll2_out", 1, 1);
 
-	np = ccm_node;
-	base = of_iomap(np, 0);
-	if (WARN_ON(!base))
-		return -ENOMEM;
+	np = dev->of_node;
+	base = devm_platform_ioremap_resource(pdev, 0);
+	if (WARN_ON(IS_ERR(base)))
+		return PTR_ERR(base);
 
  	/* Core Slice */
  	clks[IMX8MM_CLK_A53_SRC] = imx_clk_mux2("arm_a53_src", base + 0x8000, 24, 3, imx8mm_a53_sels, ARRAY_SIZE(imx8mm_a53_sels));
@@ -682,4 +683,18 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
 
  	return 0;
  }
-CLK_OF_DECLARE_DRIVER(imx8mm, "fsl,imx8mm-ccm", imx8mm_clocks_init);
+
+static const struct of_device_id imx8mm_clk_of_match[] = {
+	{ .compatible = "fsl,imx8mm-ccm" },
+	{ /* Sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, imx8mm_clk_of_match);
+
+static struct platform_driver imx8mm_clk_driver = {
+	.probe = imx8mm_clocks_probe,
+	.driver = {
+		.name = "imx8mm-ccm",
+		.of_match_table = of_match_ptr(imx8mm_clk_of_match),
+	},
+};
+module_platform_driver(imx8mm_clk_driver);
#5 lore raw
Quoted 32 lines · Schrempf Frieder

Hi,

Quoted 9 lines · Abel Vesa

There is no strong reason for this to use CLK_OF_DECLARE instead of being a platform driver. Plus, this will now be aligned with the other i.MX8M clock drivers which are platform drivers.

In order to make the clock provider a platform driver all the data and code needs to be outside of .init section.

This has been upstream for quite some time now, but somehow I have an issue with SPI on the i.MX8MM that gets resolved when I revert this patch.

When I try to probe an SPI NOR flash with latest 5.4 or even 5.5:

	spi_imx 30820000.spi: dma setup error -19, use pio
	spi-nor spi0.0: unrecognized JEDEC id bytes: 00 00 00 00 00 00
	spi_imx 30820000.spi: probed

When I revert this patch:

	spi_imx 30820000.spi: dma setup error -19, use pio
	spi-nor spi0.0: mx25r1635f (2048 Kbytes)
	spi_imx 30820000.spi: probed

Please note, that in both cases I have disabled DMA, as this causes even more trouble (see [1]). But even with DMA enabled and ignoring the DMA errors, the issue described above occurs.

Quoted 6 lines

Does someone have an idea what's wrong?
Am I the only user of SPI on i.MX8MM as this issue seems to exist upstream since v5.4-rc1?

Thanks,
Frieder

Sorry forgot the link:

[1]: https://lore.kernel.org/patchwork/patch/1086459/

Quoted 146 lines
Quoted 131 lines

---

Changes since v1:
* Switched to platform driver memory mapping API
* Removed extra newline
* Added an explanation of why this change is done in the commit message

   drivers/clk/imx/clk-imx8mm.c | 57 ++++++++++++++++++++++++++++----------------
   1 file changed, 36 insertions(+), 21 deletions(-)
drivers/clk/imx/clk-imx8mm.c +26 -21
index 6b8e75d..7a8e713 100644
@@ -68,43 +68,43 @@ static const struct imx_pll14xx_rate_table imx8mm_drampll_tbl[] = {
   	PLL_1443X_RATE(650000000U, 325, 3, 2, 0),
   };
 
-static struct imx_pll14xx_clk imx8mm_audio_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_audio_pll = {
   		.type = PLL_1443X,
   		.rate_table = imx8mm_audiopll_tbl,
   		.rate_count = ARRAY_SIZE(imx8mm_audiopll_tbl),
   };
 
-static struct imx_pll14xx_clk imx8mm_video_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_video_pll = {
   		.type = PLL_1443X,
   		.rate_table = imx8mm_videopll_tbl,
   		.rate_count = ARRAY_SIZE(imx8mm_videopll_tbl),
   };
 
-static struct imx_pll14xx_clk imx8mm_dram_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_dram_pll = {
   		.type = PLL_1443X,
   		.rate_table = imx8mm_drampll_tbl,
   		.rate_count = ARRAY_SIZE(imx8mm_drampll_tbl),
   };
 
-static struct imx_pll14xx_clk imx8mm_arm_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_arm_pll = {
   		.type = PLL_1416X,
   		.rate_table = imx8mm_pll1416x_tbl,
   		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
   };
 
-static struct imx_pll14xx_clk imx8mm_gpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_gpu_pll = {
   		.type = PLL_1416X,
   		.rate_table = imx8mm_pll1416x_tbl,
   		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
   };
 
-static struct imx_pll14xx_clk imx8mm_vpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_vpu_pll = {
   		.type = PLL_1416X,
   		.rate_table = imx8mm_pll1416x_tbl,
   		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
   };
 
-static struct imx_pll14xx_clk imx8mm_sys_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_sys_pll = {
   		.type = PLL_1416X,
   		.rate_table = imx8mm_pll1416x_tbl,
   		.rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
@@ -374,7 +374,7 @@ static const char *imx8mm_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "osc_27m",
   static struct clk *clks[IMX8MM_CLK_END];
   static struct clk_onecell_data clk_data;
 
-static struct clk ** const uart_clks[] __initconst = {
+static struct clk ** const uart_clks[] = {
   	&clks[IMX8MM_CLK_UART1_ROOT],
   	&clks[IMX8MM_CLK_UART2_ROOT],
   	&clks[IMX8MM_CLK_UART3_ROOT],
@@ -382,19 +382,20 @@ static struct clk ** const uart_clks[] __initconst = {
   	NULL
   };
 
-static int __init imx8mm_clocks_init(struct device_node *ccm_node)
+static int imx8mm_clocks_probe(struct platform_device *pdev)
   {
-	struct device_node *np;
+	struct device *dev = &pdev->dev;
+	struct device_node *np = dev->of_node;
   	void __iomem *base;
   	int ret;
 
   	clks[IMX8MM_CLK_DUMMY] = imx_clk_fixed("dummy", 0);
-	clks[IMX8MM_CLK_24M] = of_clk_get_by_name(ccm_node, "osc_24m");
-	clks[IMX8MM_CLK_32K] = of_clk_get_by_name(ccm_node, "osc_32k");
-	clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(ccm_node, "clk_ext1");
-	clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(ccm_node, "clk_ext2");
-	clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(ccm_node, "clk_ext3");
-	clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(ccm_node, "clk_ext4");
+	clks[IMX8MM_CLK_24M] = of_clk_get_by_name(np, "osc_24m");
+	clks[IMX8MM_CLK_32K] = of_clk_get_by_name(np, "osc_32k");
+	clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(np, "clk_ext1");
+	clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(np, "clk_ext2");
+	clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(np, "clk_ext3");
+	clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(np, "clk_ext4");
 
   	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-anatop");
   	base = of_iomap(np, 0);
@@ -480,10 +481,10 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
   	clks[IMX8MM_SYS_PLL2_500M] = imx_clk_fixed_factor("sys_pll2_500m", "sys_pll2_out", 1, 2);
   	clks[IMX8MM_SYS_PLL2_1000M] = imx_clk_fixed_factor("sys_pll2_1000m", "sys_pll2_out", 1, 1);
 
-	np = ccm_node;
-	base = of_iomap(np, 0);
-	if (WARN_ON(!base))
-		return -ENOMEM;
+	np = dev->of_node;
+	base = devm_platform_ioremap_resource(pdev, 0);
+	if (WARN_ON(IS_ERR(base)))
+		return PTR_ERR(base);
 
   	/* Core Slice */
   	clks[IMX8MM_CLK_A53_SRC] = imx_clk_mux2("arm_a53_src", base + 0x8000, 24, 3, imx8mm_a53_sels, ARRAY_SIZE(imx8mm_a53_sels));
@@ -682,4 +683,18 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
 
   	return 0;
   }
-CLK_OF_DECLARE_DRIVER(imx8mm, "fsl,imx8mm-ccm", imx8mm_clocks_init);
+
+static const struct of_device_id imx8mm_clk_of_match[] = {
+	{ .compatible = "fsl,imx8mm-ccm" },
+	{ /* Sentinel */ },
+};

drivers/clk/imx/clk-imx8mm.c static int __init imx8mm_clocks_init(struct device_node *ccm_node) · line 700

Quoted 10 lines
drivers/clk/imx/clk-imx8mm.c +10 -0
+MODULE_DEVICE_TABLE(of, imx8mm_clk_of_match);
+
+static struct platform_driver imx8mm_clk_driver = {
+	.probe = imx8mm_clocks_probe,
+	.driver = {
+		.name = "imx8mm-ccm",
+		.of_match_table = of_match_ptr(imx8mm_clk_of_match),
+	},
+};
+module_platform_driver(imx8mm_clk_driver);

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#6 lore raw
Quoted 30 lines · Frieder Schrempf
Quoted 29 lines · Schrempf Frieder

Hi,

Quoted 9 lines · Abel Vesa

There is no strong reason for this to use CLK_OF_DECLARE instead of being a platform driver. Plus, this will now be aligned with the other i.MX8M clock drivers which are platform drivers.

In order to make the clock provider a platform driver all the data and code needs to be outside of .init section.

This has been upstream for quite some time now, but somehow I have an issue with SPI on the i.MX8MM that gets resolved when I revert this patch.

When I try to probe an SPI NOR flash with latest 5.4 or even 5.5:

    spi_imx 30820000.spi: dma setup error -19, use pio spi-nor spi0.0: unrecognized JEDEC id bytes: 00 00 00 00 00 00 spi_imx 30820000.spi: probed

When I revert this patch:

    spi_imx 30820000.spi: dma setup error -19, use pio spi-nor spi0.0: mx25r1635f (2048 Kbytes) spi_imx 30820000.spi: probed

Quoted 7 lines
Quoted 7 lines

Please note, that in both cases I have disabled DMA, as this causes even more trouble (see [1]). But even with DMA enabled and ignoring the DMA errors, the issue described above occurs.

Does someone have an idea what's wrong?
Am I the only user of SPI on i.MX8MM as this issue seems to exist upstream since v5.4-rc1?

This issue still persists in v5.6-rc6. Can someone please have a look?

Thanks,
Frieder

Quoted 146 lines

Sorry forgot the link:

[1]: https://lore.kernel.org/patchwork/patch/1086459/

Quoted 141 lines
Quoted 126 lines

---

Changes since v1:
   * Switched to platform driver memory mapping API
   * Removed extra newline
   * Added an explanation of why this change is done in the commit message

   drivers/clk/imx/clk-imx8mm.c | 57
++++++++++++++++++++++++++++----------------

   1 file changed, 36 insertions(+), 21 deletions(-)
drivers/clk/imx/clk-imx8mm.c +8 -8
index 6b8e75d..7a8e713 100644
@@ -68,43 +68,43 @@ static const struct imx_pll14xx_rate_table 
 imx8mm_drampll_tbl[] = {
        PLL_1443X_RATE(650000000U, 325, 3, 2, 0),
    };
-static struct imx_pll14xx_clk imx8mm_audio_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_audio_pll = {
            .type = PLL_1443X,
            .rate_table = imx8mm_audiopll_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_audiopll_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_video_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_video_pll = {
            .type = PLL_1443X,
            .rate_table = imx8mm_videopll_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_videopll_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_dram_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_dram_pll = {
            .type = PLL_1443X,
            .rate_table = imx8mm_drampll_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_drampll_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_arm_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_arm_pll = {
            .type = PLL_1416X,
            .rate_table = imx8mm_pll1416x_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_gpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_gpu_pll = {
            .type = PLL_1416X,
            .rate_table = imx8mm_pll1416x_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_vpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_vpu_pll = {
            .type = PLL_1416X,
            .rate_table = imx8mm_pll1416x_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_sys_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_sys_pll = {
            .type = PLL_1416X,
            .rate_table = imx8mm_pll1416x_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
@@ -374,7 +374,7 @@ static const char *imx8mm_clko1_sels[] = 
 {"osc_24m", "sys_pll1_800m", "osc_27m",
    static struct clk *clks[IMX8MM_CLK_END];
    static struct clk_onecell_data clk_data;
-static struct clk ** const uart_clks[] __initconst = {
+static struct clk ** const uart_clks[] = {
        &clks[IMX8MM_CLK_UART1_ROOT],
        &clks[IMX8MM_CLK_UART2_ROOT],
        &clks[IMX8MM_CLK_UART3_ROOT],
@@ -382,19 +382,20 @@ static struct clk ** const uart_clks[] 
 __initconst = {

       NULL
   };

drivers/clk/imx/clk-imx8mm.c +1 -1
-static int __init imx8mm_clocks_init(struct device_node *ccm_node)
+static int imx8mm_clocks_probe(struct platform_device *pdev)

   {
-    struct device_node *np;
+    struct device *dev = &pdev->dev;
+    struct device_node *np = dev->of_node;
       void __iomem *base;
       int ret;
       clks[IMX8MM_CLK_DUMMY] = imx_clk_fixed("dummy", 0); -    clks[IMX8MM_CLK_24M] = of_clk_get_by_name(ccm_node, "osc_24m"); -    clks[IMX8MM_CLK_32K] = of_clk_get_by_name(ccm_node, "osc_32k"); -    clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(ccm_node, "clk_ext1"); -    clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(ccm_node, "clk_ext2"); -    clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(ccm_node, "clk_ext3"); -    clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(ccm_node, "clk_ext4"); +    clks[IMX8MM_CLK_24M] = of_clk_get_by_name(np, "osc_24m"); +    clks[IMX8MM_CLK_32K] = of_clk_get_by_name(np, "osc_32k"); +    clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(np, "clk_ext1"); +    clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(np, "clk_ext2"); +    clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(np, "clk_ext3"); +    clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(np, "clk_ext4"); np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-anatop"); base = of_iomap(np, 0);

drivers/clk/imx/clk-imx8mm.c +0 -0
@@ -480,10 +481,10 @@ static int __init imx8mm_clocks_init(struct 
 device_node *ccm_node)

       clks[IMX8MM_SYS_PLL2_500M] = imx_clk_fixed_factor("sys_pll2_500m", "sys_pll2_out", 1, 2); clks[IMX8MM_SYS_PLL2_1000M] = imx_clk_fixed_factor("sys_pll2_1000m", "sys_pll2_out", 1, 1); -    np = ccm_node;
-    base = of_iomap(np, 0);
-    if (WARN_ON(!base))
-        return -ENOMEM;
+    np = dev->of_node;
+    base = devm_platform_ioremap_resource(pdev, 0);
+    if (WARN_ON(IS_ERR(base)))
+        return PTR_ERR(base);
       /* Core Slice */
       clks[IMX8MM_CLK_A53_SRC] = imx_clk_mux2("arm_a53_src", base + 0x8000, 24, 3, imx8mm_a53_sels, ARRAY_SIZE(imx8mm_a53_sels));

drivers/clk/imx/clk-imx8mm.c +5 -1
@@ -682,4 +683,18 @@ static int __init imx8mm_clocks_init(struct 
 device_node *ccm_node)
        return 0;
    }
-CLK_OF_DECLARE_DRIVER(imx8mm, "fsl,imx8mm-ccm", imx8mm_clocks_init);
+
+static const struct of_device_id imx8mm_clk_of_match[] = {
+    { .compatible = "fsl,imx8mm-ccm" },
+    { /* Sentinel */ },
+};

drivers/clk/imx/clk-imx8mm.c static int __init imx8mm_clocks_init(struct · line 700

Quoted 10 lines
drivers/clk/imx/clk-imx8mm.c +10 -0
+MODULE_DEVICE_TABLE(of, imx8mm_clk_of_match);
+
+static struct platform_driver imx8mm_clk_driver = {
+    .probe = imx8mm_clocks_probe,
+    .driver = {
+        .name = "imx8mm-ccm",
+        .of_match_table = of_match_ptr(imx8mm_clk_of_match),
+    },
+};
+module_platform_driver(imx8mm_clk_driver);

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

reviewer
#7 lore raw
Quoted 37 lines

Subject: Re: [PATCH v2] clk: imx8mm: Switch to platform driver

Quoted 34 lines · Frieder Schrempf
Quoted 33 lines · Schrempf Frieder

Hi,

Quoted 9 lines · Abel Vesa

There is no strong reason for this to use CLK_OF_DECLARE instead of being a platform driver. Plus, this will now be aligned with the other i.MX8M clock drivers which are platform drivers.

In order to make the clock provider a platform driver all the data and code needs to be outside of .init section.

This has been upstream for quite some time now, but somehow I have an issue with SPI on the i.MX8MM that gets resolved when I revert this patch.

When I try to probe an SPI NOR flash with latest 5.4 or even 5.5:

    spi_imx 30820000.spi: dma setup error -19, use pio spi-nor spi0.0: unrecognized JEDEC id bytes: 00 00 00 00 00 00 spi_imx 30820000.spi: probed

When I revert this patch:

    spi_imx 30820000.spi: dma setup error -19, use pio spi-nor spi0.0: mx25r1635f (2048 Kbytes) spi_imx 30820000.spi: probed

Please note, that in both cases I have disabled DMA, as this causes even more trouble (see [1]). But even with DMA enabled and ignoring the DMA errors, the issue described above occurs.

Quoted 5 lines
Quoted 3 lines
Quoted 3 lines

Does someone have an idea what's wrong?
Am I the only user of SPI on i.MX8MM as this issue seems to exist upstream since v5.4-rc1?

This issue still persists in v5.6-rc6. Can someone please have a look?

Would you post your full boot log somewhere?

With success/fail case, are there any differences in spi controller registers? I suppose no.

Did you measure the signal saying data in when cs is low?

Anyway it is a bit wired since this patch just delayed the probe for a while.

Regards,
Peng.

Quoted 181 lines

Thanks,
Frieder

Quoted 6 lines

Sorry forgot the link:

[1]:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore
.kernel.org%2Fpatchwork%2Fpatch%2F1086459%2F&data=02%7C01%

7Cpeng.f

Quoted 1 line

an%40nxp.com%7C2317765357144c4b8a7e08d7c9ad2e7e%7C686ea1d3bc2 b4c6fa92c

Quoted 1 line

d99c5c301635%7C0%7C0%7C637199617967685983&sdata=p2zTgZph6 %2F6ULb%2

Quoted 56 lines

F8ACJv4x0%2Bov09ZtLLbvoadhsRiI8%3D&reserved=0

Quoted 54 lines
Quoted 54 lines

---

Changes since v1:
   * Switched to platform driver memory mapping API
   * Removed extra newline
   * Added an explanation of why this change is done in the commit message

   drivers/clk/imx/clk-imx8mm.c | 57
++++++++++++++++++++++++++++----------------

   1 file changed, 36 insertions(+), 21 deletions(-)
(quoted diff) +0 -0

b/drivers/clk/imx/clk-imx8mm.c index 6b8e75d..7a8e713 100644

drivers/clk/imx/clk-imx8mm.c +6 -6
@@ -68,43 +68,43 @@ static const struct imx_pll14xx_rate_table
 imx8mm_drampll_tbl[] = {
        PLL_1443X_RATE(650000000U, 325, 3, 2, 0),
    };
-static struct imx_pll14xx_clk imx8mm_audio_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_audio_pll = {
            .type = PLL_1443X,
            .rate_table = imx8mm_audiopll_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_audiopll_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_video_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_video_pll = {
            .type = PLL_1443X,
            .rate_table = imx8mm_videopll_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_videopll_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_dram_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_dram_pll = {
            .type = PLL_1443X,
            .rate_table = imx8mm_drampll_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_drampll_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_arm_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_arm_pll = {
            .type = PLL_1416X,
            .rate_table = imx8mm_pll1416x_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_gpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_gpu_pll = {
            .type = PLL_1416X,
            .rate_table = imx8mm_pll1416x_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_vpu_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_vpu_pll = {
            .type = PLL_1416X,
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/clk/imx/clk-imx8mm.c +1 -1
            .rate_table = imx8mm_pll1416x_tbl,
            .rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl),
    };
-static struct imx_pll14xx_clk imx8mm_sys_pll __initdata = {
+static struct imx_pll14xx_clk imx8mm_sys_pll = {
            .type = PLL_1416X,
            .rate_table = imx8mm_pll1416x_tbl,

           .rate_count = ARRAY_SIZE(imx8mm_pll1416x_tbl), @@

-374,7

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

+374,7 @@ static const char *imx8mm_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "osc_27m",
   static struct clk *clks[IMX8MM_CLK_END];
   static struct clk_onecell_data clk_data; -static struct clk ** const uart_clks[] __initconst = {
+static struct clk ** const uart_clks[] = { &clks[IMX8MM_CLK_UART1_ROOT], &clks[IMX8MM_CLK_UART2_ROOT], &clks[IMX8MM_CLK_UART3_ROOT], @@ -382,19 +382,20

@@ static

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

struct clk ** const uart_clks[] __initconst = {
       NULL
   };

drivers/clk/imx/clk-imx8mm.c +1 -1
-static int __init imx8mm_clocks_init(struct device_node *ccm_node)
+static int imx8mm_clocks_probe(struct platform_device *pdev)
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

   {
-    struct device_node *np;
+    struct device *dev = &pdev->dev;
+    struct device_node *np = dev->of_node;
       void __iomem *base;
       int ret;
       clks[IMX8MM_CLK_DUMMY] = imx_clk_fixed("dummy", 0); -    clks[IMX8MM_CLK_24M] = of_clk_get_by_name(ccm_node,

"osc_24m");

Quoted 1 line
Quoted 1 line
Quoted 1 line

-    clks[IMX8MM_CLK_32K] = of_clk_get_by_name(ccm_node,

"osc_32k");

Quoted 25 lines
Quoted 25 lines
Quoted 25 lines

-    clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(ccm_node, "clk_ext1");
-    clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(ccm_node, "clk_ext2");
-    clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(ccm_node, "clk_ext3");
-    clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(ccm_node, "clk_ext4");
+    clks[IMX8MM_CLK_24M] = of_clk_get_by_name(np, "osc_24m"); +    clks[IMX8MM_CLK_32K] = of_clk_get_by_name(np, "osc_32k"); +    clks[IMX8MM_CLK_EXT1] = of_clk_get_by_name(np, "clk_ext1"); +    clks[IMX8MM_CLK_EXT2] = of_clk_get_by_name(np, "clk_ext2"); +    clks[IMX8MM_CLK_EXT3] = of_clk_get_by_name(np, "clk_ext3"); +    clks[IMX8MM_CLK_EXT4] = of_clk_get_by_name(np, "clk_ext4"); np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-anatop");
       base = of_iomap(np, 0);

drivers/clk/imx/clk-imx8mm.c +0 -0
@@ -480,10 +481,10 @@ static int __init imx8mm_clocks_init(struct
 device_node *ccm_node)

       clks[IMX8MM_SYS_PLL2_500M] = imx_clk_fixed_factor("sys_pll2_500m", "sys_pll2_out", 1, 2); clks[IMX8MM_SYS_PLL2_1000M] = imx_clk_fixed_factor("sys_pll2_1000m", "sys_pll2_out", 1, 1); -    np = ccm_node;
-    base = of_iomap(np, 0);

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

-    if (WARN_ON(!base))
-        return -ENOMEM;
+    np = dev->of_node;
+    base = devm_platform_ioremap_resource(pdev, 0); +    if (WARN_ON(IS_ERR(base)))
+        return PTR_ERR(base);
       /* Core Slice */ clks[IMX8MM_CLK_A53_SRC] =

imx_clk_mux2("arm_a53_src", base +

Quoted 20 lines
Quoted 20 lines
Quoted 20 lines

0x8000, 24, 3, imx8mm_a53_sels, ARRAY_SIZE(imx8mm_a53_sels)); @@ -682,4 +683,18 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
       return 0;
   }
-CLK_OF_DECLARE_DRIVER(imx8mm, "fsl,imx8mm-ccm", imx8mm_clocks_init);

drivers/clk/imx/clk-imx8mm.c +13 -0
+
+static const struct of_device_id imx8mm_clk_of_match[] = {
+    { .compatible = "fsl,imx8mm-ccm" },
+    { /* Sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, imx8mm_clk_of_match);
+
+static struct platform_driver imx8mm_clk_driver = {
+    .probe = imx8mm_clocks_probe,
+    .driver = {
+        .name = "imx8mm-ccm",
+        .of_match_table = of_match_ptr(imx8mm_clk_of_match),
+    },
Quoted 8 lines
Quoted 8 lines

drivers/clk/imx/clk-imx8mm.c

Quoted 3 lines
drivers/clk/imx/clk-imx8mm.c +2 -0
+};
+module_platform_driver(imx8mm_clk_driver);

_______________________________________________
linux-arm-kernel mailing list
[email protected]
https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flist

s.infradead.org%2Fmailman%2Flistinfo%2Flinux-arm-kernel&data=02%7

Quoted 1 line
Quoted 1 line

C01%7Cpeng.fan%40nxp.com%7C2317765357144c4b8a7e08d7c9ad2e7e%7 C686ea1d

Quoted 1 line
Quoted 1 line

3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637199617967685983&sd ata=PmRi

Quoted 1 line
Quoted 1 line

GsJKcmN59MpWWQWoA%2BWo5rX7XLoaiChV5%2FOGvVI%3D&reserv ed=0

Quoted 1 line
Quoted 1 line
#8 lore raw

Hi Peng,

Quoted 37 lines · Peng Fan
Quoted 37 lines

Subject: Re: [PATCH v2] clk: imx8mm: Switch to platform driver

Quoted 34 lines · Frieder Schrempf
Quoted 33 lines · Schrempf Frieder

Hi,

Quoted 9 lines · Abel Vesa

There is no strong reason for this to use CLK_OF_DECLARE instead of being a platform driver. Plus, this will now be aligned with the other i.MX8M clock drivers which are platform drivers.

In order to make the clock provider a platform driver all the data and code needs to be outside of .init section.

This has been upstream for quite some time now, but somehow I have an issue with SPI on the i.MX8MM that gets resolved when I revert this patch.

When I try to probe an SPI NOR flash with latest 5.4 or even 5.5:

    spi_imx 30820000.spi: dma setup error -19, use pio spi-nor spi0.0: unrecognized JEDEC id bytes: 00 00 00 00 00 00 spi_imx 30820000.spi: probed

When I revert this patch:

    spi_imx 30820000.spi: dma setup error -19, use pio spi-nor spi0.0: mx25r1635f (2048 Kbytes) spi_imx 30820000.spi: probed

Please note, that in both cases I have disabled DMA, as this causes even more trouble (see [1]). But even with DMA enabled and ignoring the DMA errors, the issue described above occurs.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 3 lines

Does someone have an idea what's wrong?
Am I the only user of SPI on i.MX8MM as this issue seems to exist upstream since v5.4-rc1?

This issue still persists in v5.6-rc6. Can someone please have a look?

Would you post your full boot log somewhere?

Sure, the two bootlogs are here: https://paste.ee/p/8uDwd.
The only difference is that in the OK case this patch is applied:
https://paste.ee/p/xUBrO

Quoted 3 lines

With success/fail case, are there any differences in spi controller registers? I suppose no.

No, they are the same, except for BURST_LENGTH in ECSPI1_CONREG, which is 0x2F in case of failure and 0x3F in case it is working. But I guess that's a result of the failed/successful transfers.

Quoted 2 lines

Did you measure the signal saying data in when cs is low?

It's a bit difficult to access the signals on the board so I didn't check the signals, yet.

Quoted 2 lines

Anyway it is a bit wired since this patch just delayed the probe for a while.

Yes, it's really weird and it's very unfortunate that the EVK does not have a SPI device onboard. I guess that would have helped to prevent regressions due to better testing.

If you have any suggestions, please let me know.

Thanks,
Frieder