kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
..
..
@@ -297,7 +297,7 @@
297
297
 {
298
298
 	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
299
299
 
300
-	if (dai->active)
300
+	if (snd_soc_dai_active(dai))
301
301
 		return 0;
302
302
 
303
303
 	regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,
..
..
@@ -310,7 +310,7 @@
310
310
 {
311
311
 	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
312
312
 
313
-	if (dai->active)
313
+	if (snd_soc_dai_active(dai))
314
314
 		return;
315
315
 
316
316
 	mt8173_afe_set_i2s_enable(afe, false);
..
..
@@ -347,7 +347,7 @@
347
347
 	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
348
348
 	struct mt8173_afe_private *afe_priv = afe->platform_priv;
349
349
 
350
-	if (dai->active)
350
+	if (snd_soc_dai_active(dai))
351
351
 		return 0;
352
352
 
353
353
 	mt8173_afe_dais_enable_clks(afe, afe_priv->clocks[MT8173_CLK_I2S3_M],
..
..
@@ -361,7 +361,7 @@
361
361
 	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
362
362
 	struct mt8173_afe_private *afe_priv = afe->platform_priv;
363
363
 
364
-	if (dai->active)
364
+	if (snd_soc_dai_active(dai))
365
365
 		return;
366
366
 
367
367
 	mt8173_afe_dais_disable_clks(afe, afe_priv->clocks[MT8173_CLK_I2S3_M],
..
..
@@ -482,10 +482,10 @@
482
482
 static int mt8173_memif_fs(struct snd_pcm_substream *substream,
483
483
 			   unsigned int rate)
484
484
 {
485
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
485
+	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
486
486
 	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);
487
487
 	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
488
-	struct mtk_base_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];
488
+	struct mtk_base_afe_memif *memif = &afe->memif[asoc_rtd_to_cpu(rtd, 0)->id];
489
489
 	int fs;
490
490
 
491
491
 	if (memif->data->id == MT8173_AFE_MEMIF_DAI ||
..
..
@@ -533,8 +533,6 @@
533
533
 	{
534
534
 		.name = "DL1", /* downlink 1 */
535
535
 		.id = MT8173_AFE_MEMIF_DL1,
536
-		.suspend = mtk_afe_dai_suspend,
537
-		.resume = mtk_afe_dai_resume,
538
536
 		.playback = {
539
537
 			.stream_name = "DL1",
540
538
 			.channels_min = 1,
..
..
@@ -546,8 +544,6 @@
546
544
 	}, {
547
545
 		.name = "VUL", /* voice uplink */
548
546
 		.id = MT8173_AFE_MEMIF_VUL,
549
-		.suspend = mtk_afe_dai_suspend,
550
-		.resume = mtk_afe_dai_resume,
551
547
 		.capture = {
552
548
 			.stream_name = "VUL",
553
549
 			.channels_min = 1,
..
..
@@ -584,8 +580,6 @@
584
580
 	{
585
581
 		.name = "HDMI",
586
582
 		.id = MT8173_AFE_MEMIF_HDMI,
587
-		.suspend = mtk_afe_dai_suspend,
588
-		.resume = mtk_afe_dai_resume,
589
583
 		.playback = {
590
584
 			.stream_name = "HDMI",
591
585
 			.channels_min = 2,
..
..
@@ -681,12 +675,16 @@
681
675
 	.num_dapm_widgets = ARRAY_SIZE(mt8173_afe_pcm_widgets),
682
676
 	.dapm_routes = mt8173_afe_pcm_routes,
683
677
 	.num_dapm_routes = ARRAY_SIZE(mt8173_afe_pcm_routes),
678
+	.suspend = mtk_afe_suspend,
679
+	.resume = mtk_afe_resume,
684
680
 };
685
681
 
686
682
 static const struct snd_soc_component_driver mt8173_afe_hdmi_dai_component = {
687
683
 	.name = "mt8173-afe-hdmi-dai",
688
684
 	.dapm_routes = mt8173_afe_hdmi_routes,
689
685
 	.num_dapm_routes = ARRAY_SIZE(mt8173_afe_hdmi_routes),
686
+	.suspend = mtk_afe_suspend,
687
+	.resume = mtk_afe_resume,
690
688
 };
691
689
 
692
690
 static const char *aud_clks[MT8173_CLK_NUM] = {
..
..
@@ -714,13 +712,11 @@
714
712
 		.mono_reg = AFE_DAC_CON1,
715
713
 		.mono_shift = 21,
716
714
 		.hd_reg = -1,
717
-		.hd_shift = -1,
718
715
 		.enable_reg = AFE_DAC_CON0,
719
716
 		.enable_shift = 1,
720
717
 		.msb_reg = AFE_MEMIF_MSB,
721
718
 		.msb_shift = 0,
722
719
 		.agent_disable_reg = -1,
723
-		.agent_disable_shift = -1,
724
720
 	}, {
725
721
 		.name = "DL2",
726
722
 		.id = MT8173_AFE_MEMIF_DL2,
..
..
@@ -732,13 +728,11 @@
732
728
 		.mono_reg = AFE_DAC_CON1,
733
729
 		.mono_shift = 22,
734
730
 		.hd_reg = -1,
735
-		.hd_shift = -1,
736
731
 		.enable_reg = AFE_DAC_CON0,
737
732
 		.enable_shift = 2,
738
733
 		.msb_reg = AFE_MEMIF_MSB,
739
734
 		.msb_shift = 1,
740
735
 		.agent_disable_reg = -1,
741
-		.agent_disable_shift = -1,
742
736
 	}, {
743
737
 		.name = "VUL",
744
738
 		.id = MT8173_AFE_MEMIF_VUL,
..
..
@@ -750,13 +744,11 @@
750
744
 		.mono_reg = AFE_DAC_CON1,
751
745
 		.mono_shift = 27,
752
746
 		.hd_reg = -1,
753
-		.hd_shift = -1,
754
747
 		.enable_reg = AFE_DAC_CON0,
755
748
 		.enable_shift = 3,
756
749
 		.msb_reg = AFE_MEMIF_MSB,
757
750
 		.msb_shift = 6,
758
751
 		.agent_disable_reg = -1,
759
-		.agent_disable_shift = -1,
760
752
 	}, {
761
753
 		.name = "DAI",
762
754
 		.id = MT8173_AFE_MEMIF_DAI,
..
..
@@ -768,13 +760,11 @@
768
760
 		.mono_reg = -1,
769
761
 		.mono_shift = -1,
770
762
 		.hd_reg = -1,
771
-		.hd_shift = -1,
772
763
 		.enable_reg = AFE_DAC_CON0,
773
764
 		.enable_shift = 4,
774
765
 		.msb_reg = AFE_MEMIF_MSB,
775
766
 		.msb_shift = 5,
776
767
 		.agent_disable_reg = -1,
777
-		.agent_disable_shift = -1,
778
768
 	}, {
779
769
 		.name = "AWB",
780
770
 		.id = MT8173_AFE_MEMIF_AWB,
..
..
@@ -786,13 +776,11 @@
786
776
 		.mono_reg = AFE_DAC_CON1,
787
777
 		.mono_shift = 24,
788
778
 		.hd_reg = -1,
789
-		.hd_shift = -1,
790
779
 		.enable_reg = AFE_DAC_CON0,
791
780
 		.enable_shift = 6,
792
781
 		.msb_reg = AFE_MEMIF_MSB,
793
782
 		.msb_shift = 3,
794
783
 		.agent_disable_reg = -1,
795
-		.agent_disable_shift = -1,
796
784
 	}, {
797
785
 		.name = "MOD_DAI",
798
786
 		.id = MT8173_AFE_MEMIF_MOD_DAI,
..
..
@@ -804,13 +792,11 @@
804
792
 		.mono_reg = AFE_DAC_CON1,
805
793
 		.mono_shift = 30,
806
794
 		.hd_reg = -1,
807
-		.hd_shift = -1,
808
795
 		.enable_reg = AFE_DAC_CON0,
809
796
 		.enable_shift = 7,
810
797
 		.msb_reg = AFE_MEMIF_MSB,
811
798
 		.msb_shift = 4,
812
799
 		.agent_disable_reg = -1,
813
-		.agent_disable_shift = -1,
814
800
 	}, {
815
801
 		.name = "HDMI",
816
802
 		.id = MT8173_AFE_MEMIF_HDMI,
..
..
@@ -822,13 +808,10 @@
822
808
 		.mono_reg = -1,
823
809
 		.mono_shift = -1,
824
810
 		.hd_reg = -1,
825
-		.hd_shift = -1,
826
811
 		.enable_reg = -1,
827
-		.enable_shift = -1,
828
812
 		.msb_reg = AFE_MEMIF_MSB,
829
813
 		.msb_shift = 8,
830
814
 		.agent_disable_reg = -1,
831
-		.agent_disable_shift = -1,
832
815
 	},
833
816
 };
834
817
 
..
..
@@ -914,7 +897,6 @@
914
897
 		.irq_en_reg = AFE_IRQ_MCU_CON,
915
898
 		.irq_en_shift = 12,
916
899
 		.irq_fs_reg = -1,
917
-		.irq_fs_shift = -1,
918
900
 		.irq_fs_maskbit = -1,
919
901
 		.irq_clr_reg = AFE_IRQ_CLR,
920
902
 		.irq_clr_shift = 4,
..
..
@@ -1072,7 +1054,6 @@
1072
1054
 	int irq_id;
1073
1055
 	struct mtk_base_afe *afe;
1074
1056
 	struct mt8173_afe_private *afe_priv;
1075
-	struct resource *res;
1076
1057
 
1077
1058
 	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(33));
1078
1059
 	if (ret)
..
..
@@ -1091,10 +1072,8 @@
1091
1072
 	afe->dev = &pdev->dev;
1092
1073
 
1093
1074
 	irq_id = platform_get_irq(pdev, 0);
1094
-	if (irq_id <= 0) {
1095
-		dev_err(afe->dev, "np %s no irq\n", afe->dev->of_node->name);
1075
+	if (irq_id <= 0)
1096
1076
 		return irq_id < 0 ? irq_id : -ENXIO;
1097
-	}
1098
1077
 	ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler,
1099
1078
 			       0, "Afe_ISR_Handle", (void *)afe);
1100
1079
 	if (ret) {
..
..
@@ -1102,8 +1081,7 @@
1102
1081
 		return ret;
1103
1082
 	}
1104
1083
 
1105
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1106
-	afe->base_addr = devm_ioremap_resource(&pdev->dev, res);
1084
+	afe->base_addr = devm_platform_ioremap_resource(pdev, 0);
1107
1085
 	if (IS_ERR(afe->base_addr))
1108
1086
 		return PTR_ERR(afe->base_addr);
1109
1087