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

Schrempf Frieder
2020-03-16T13:23:19Z

On 06.02.20 11:37, Frieder Schrempf wrote:
> On 06.02.20 11:34, Schrempf Frieder wrote:
>> Hi,
>>
>> On 09.07.19 16:20, Abel Vesa wrote:
>>> 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.
>>>
>>> Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
>>> Acked-by: Stephen Boyd <sboyd@kernel.org>
>>
>> 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?

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

Thanks,
Frieder

>
> Sorry forgot the link:
>
> [1]: https://lore.kernel.org/patchwork/patch/1086459/
>
>>
>>> ---
>>>
>>> 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(-)
>>>
>>> diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
>>> index 6b8e75d..7a8e713 100644
>>> --- a/drivers/clk/imx/clk-imx8mm.c
>>> +++ b/drivers/clk/imx/clk-imx8mm.c
>>> @@ -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);
>>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>