Skip to content

Commit 962dbc5

Browse files
author
Da Xue
committed
Revert "iommu: rockchip: Ignore device_link for vop"
This reverts commit 3460316.
1 parent 6c48876 commit 962dbc5

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

drivers/iommu/rockchip-iommu.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ struct rk_iommu {
110110
struct clk_bulk_data *clocks;
111111
int num_clocks;
112112
bool reset_disabled;
113-
bool dlr_disable; /* avoid access iommu when runtime ops called */
114113
struct iommu_device iommu;
115114
struct list_head node; /* entry in rk_iommu_domain.iommus */
116115
struct iommu_domain *domain; /* domain to which iommu is attached */
@@ -1256,8 +1255,6 @@ static int rk_iommu_probe(struct platform_device *pdev)
12561255

12571256
iommu->reset_disabled = device_property_read_bool(dev,
12581257
"rockchip,disable-mmu-reset");
1259-
iommu->dlr_disable = device_property_read_bool(dev,
1260-
"rockchip,disable-device-link-resume");
12611258

12621259
iommu->num_clocks = ARRAY_SIZE(rk_iommu_clocks);
12631260
iommu->clocks = devm_kcalloc(iommu->dev, iommu->num_clocks,
@@ -1356,9 +1353,6 @@ static int __maybe_unused rk_iommu_suspend(struct device *dev)
13561353
if (iommu->domain == &rk_identity_domain)
13571354
return 0;
13581355

1359-
if (iommu->dlr_disable)
1360-
return 0;
1361-
13621356
rk_iommu_disable(iommu);
13631357
return 0;
13641358
}
@@ -1370,9 +1364,6 @@ static int __maybe_unused rk_iommu_resume(struct device *dev)
13701364
if (iommu->domain == &rk_identity_domain)
13711365
return 0;
13721366

1373-
if (iommu->dlr_disable)
1374-
return 0;
1375-
13761367
return rk_iommu_enable(iommu);
13771368
}
13781369

0 commit comments

Comments
 (0)