]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
iommu/mediatek: Add bclk can be supported optionally
authorYong Wu <yong.wu@mediatek.com>
Sat, 24 Aug 2019 03:01:56 +0000 (11:01 +0800)
committerJoerg Roedel <jroedel@suse.de>
Fri, 30 Aug 2019 13:57:26 +0000 (15:57 +0200)
In some SoCs, M4U doesn't have its "bclk", it will use the EMI
clock instead which has always been enabled when entering kernel.

Currently mt2712 and mt8173 have this bclk while mt8183 doesn't.

This also is a preparing patch for mt8183.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/mtk_iommu.c
drivers/iommu/mtk_iommu.h

index b5a40a4b40c53de735488fed00d8a105d58ee468..4df3cb430b43bc178fdfbf8605bdbb9f2e09870f 100644 (file)
@@ -633,9 +633,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
        if (data->irq < 0)
                return data->irq;
 
-       data->bclk = devm_clk_get(dev, "bclk");
-       if (IS_ERR(data->bclk))
-               return PTR_ERR(data->bclk);
+       if (data->plat_data->has_bclk) {
+               data->bclk = devm_clk_get(dev, "bclk");
+               if (IS_ERR(data->bclk))
+                       return PTR_ERR(data->bclk);
+       }
 
        larb_nr = of_count_phandle_with_args(dev->of_node,
                                             "mediatek,larbs", NULL);
@@ -763,11 +765,13 @@ static const struct dev_pm_ops mtk_iommu_pm_ops = {
 static const struct mtk_iommu_plat_data mt2712_data = {
        .m4u_plat     = M4U_MT2712,
        .has_4gb_mode = true,
+       .has_bclk     = true,
 };
 
 static const struct mtk_iommu_plat_data mt8173_data = {
        .m4u_plat     = M4U_MT8173,
        .has_4gb_mode = true,
+       .has_bclk     = true,
 };
 
 static const struct of_device_id mtk_iommu_of_ids[] = {
index c281c01b2d5b8187b87ba76b7bb5e7c0a2b214da..821172bd6c525989a2c5e0d0bd1ef162fc855727 100644 (file)
@@ -35,6 +35,9 @@ enum mtk_iommu_plat {
 struct mtk_iommu_plat_data {
        enum mtk_iommu_plat m4u_plat;
        bool                has_4gb_mode;
+
+       /* HW will use the EMI clock if there isn't the "bclk". */
+       bool                has_bclk;
 };
 
 struct mtk_iommu_domain;