ASoC: atmel: mchp-i2s-mcc: Improve clock and IRQ handling
cover ASoC: atmel: mchp-i2s-mcc: Improve clock and IRQ handling
From: bui duc phuc <[email protected]>
Hi all,
This series simplifies clock management using devm APIs and ensures the peripheral clock is enabled before requesting the IRQ.
Compile-tested only.
Best regards,
Phuc
bui duc phuc (3):
ASoC: atmel: mchp-i2s-mcc: Use devm_clk_get_optional() for gclk
ASoC: atmel: mchp-i2s-mcc: Use devm_clk_get_enabled() for pclk
ASoC: atmel: mchp-i2s-mcc: Request IRQ after enabling pclk
sound/soc/atmel/mchp-i2s-mcc.c | 46 ++++++++-------------------------- 1 file changed, 11 insertions(+), 35 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/3 ASoC: atmel: mchp-i2s-mcc: Use devm_clk_get_optional() for gclk
From: bui duc phuc <[email protected]>
The current code is unnecessarily verbose for handling an optional clock. Use devm_clk_get_optional() to simplify it.
--- sound/soc/atmel/mchp-i2s-mcc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
sound/soc/atmel/mchp-i2s-mcc.c +4 -8
@@ -1073,14 +1073,10 @@ static int mchp_i2s_mcc_probe(struct platform_device *pdev) }/* Get the optional generated clock */ - dev->gclk =devm_clk_get (&pdev->dev,"gclk" ); -if (IS_ERR (dev->gclk)) { -if (PTR_ERR (dev->gclk) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; -dev_warn (&pdev->dev, -"generated clock not found: %d\n" , err); - dev->gclk =NULL ; - } + dev->gclk =devm_clk_get_optional (&pdev->dev,"gclk" ); +if (IS_ERR (dev->gclk)) +return dev_err_probe (&pdev->dev,PTR_ERR (dev->gclk), +"failed to get the generated clock\n" ); dev->soc =of_device_get_match_data (&pdev->dev); err =mchp_i2s_mcc_soc_data_parse (pdev, dev);
Signature · 1 line
2.43.0
PATCH 2/3 ASoC: atmel: mchp-i2s-mcc: Use devm_clk_get_enabled() for pclk
In reply to [email protected]From: bui duc phuc <[email protected]>
The peripheral clock is enabled once during probe and disabled during remove. Use devm_clk_get_enabled() to automate clock management and remove the unnecessary remove callback.
--- sound/soc/atmel/mchp-i2s-mcc.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-)
sound/soc/atmel/mchp-i2s-mcc.c +4 -24
@@ -1064,13 +1064,10 @@ static int mchp_i2s_mcc_probe(struct platform_device *pdev)if (err)return err; - dev->pclk =devm_clk_get (&pdev->dev,"pclk" ); -if (IS_ERR (dev->pclk)) { - err =PTR_ERR (dev->pclk); -dev_err (&pdev->dev, -"failed to get the peripheral clock: %d\n" , err); -return err; - } + dev->pclk =devm_clk_get_enabled (&pdev->dev,"pclk" ); +if (IS_ERR (dev->pclk)) +return dev_err_probe (&pdev->dev,PTR_ERR (dev->pclk), +"failed to get/enable the peripheral clock\n" );/* Get the optional generated clock */ dev->gclk =devm_clk_get_optional (&pdev->dev,"gclk" );
@@ -1087,19 +1084,11 @@ static int mchp_i2s_mcc_probe(struct platform_device *pdev) dev->regmap = regmap;platform_set_drvdata (pdev, dev); - err =clk_prepare_enable (dev->pclk); -if (err) { -dev_err (&pdev->dev, -"failed to enable the peripheral clock: %d\n" , err); -return err; - } - err =devm_snd_soc_register_component (&pdev->dev, &mchp_i2s_mcc_component, &mchp_i2s_mcc_dai,1 );if (err) {dev_err (&pdev->dev,"failed to register DAI: %d\n" , err); -clk_disable_unprepare (dev->pclk);return err; }
@@ -1109,7 +1098,6 @@ static int mchp_i2s_mcc_probe(struct platform_device *pdev) err =devm_snd_dmaengine_pcm_register (&pdev->dev,NULL ,0 );if (err) {dev_err (&pdev->dev,"failed to register PCM: %d\n" , err); -clk_disable_unprepare (dev->pclk);return err; }
@@ -1121,20 +1109,12 @@ static int mchp_i2s_mcc_probe(struct platform_device *pdev)return 0 ; } -static void mchp_i2s_mcc_remove (struct platform_device *pdev) -{ -struct mchp_i2s_mcc_dev *dev =platform_get_drvdata (pdev); - -clk_disable_unprepare (dev->pclk); -} -static struct platform_driver mchp_i2s_mcc_driver = { .driver = { .name ="mchp_i2s_mcc" , .of_match_table = mchp_i2s_mcc_dt_ids, }, .probe = mchp_i2s_mcc_probe, - .remove = mchp_i2s_mcc_remove, };module_platform_driver (mchp_i2s_mcc_driver);
Signature · 1 line
2.43.0
PATCH 3/3 ASoC: atmel: mchp-i2s-mcc: Request IRQ after enabling pclk
In reply to [email protected]From: bui duc phuc <[email protected]>
Request the IRQ after enabling the peripheral clock to ensure the clock is available when the interrupt handler accesses hardware registers.
This also ensures proper resource cleanup ordering, with the IRQ being released before the clock is disabled.
--- sound/soc/atmel/mchp-i2s-mcc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/atmel/mchp-i2s-mcc.c +5 -5
@@ -1059,11 +1059,6 @@ static int mchp_i2s_mcc_probe(struct platform_device *pdev)if (irq <0 )return irq; - err =devm_request_irq (&pdev->dev, irq, mchp_i2s_mcc_interrupt,0 , -dev_name (&pdev->dev), dev); -if (err) -return err; - dev->pclk =devm_clk_get_enabled (&pdev->dev,"pclk" );if (IS_ERR (dev->pclk)) return dev_err_probe(&pdev->dev, PTR_ERR(dev->pclk),
@@ -1084,6 +1079,11 @@ static int mchp_i2s_mcc_probe(struct platform_device *pdev) dev->regmap = regmap;platform_set_drvdata (pdev, dev); + err =devm_request_irq (&pdev->dev, irq, mchp_i2s_mcc_interrupt,0 , +dev_name (&pdev->dev), dev); +if (err) +return err; + err =devm_snd_soc_register_component (&pdev->dev, &mchp_i2s_mcc_component, &mchp_i2s_mcc_dai,1 );
Signature · 1 line
2.43.0