diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-06-04 09:21:50 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-06-04 12:12:32 +0200 |
| commit | 6c02ed79cabf55115e611d19fd823ab35bcd58a8 (patch) | |
| tree | 886c4e36a83c4b5abade244bc87e6e689f63f6ba | |
| parent | 992d3b4292e891c3d36a6fe3ad6e8d6b59cd0ecb (diff) | |
HACK: Disable IOMMU for now
| -rw-r--r-- | arch/arm/boot/dts/tegra124.dtsi | 3 | ||||
| -rw-r--r-- | drivers/base/dd.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index 56f5a05741f..6892812a59e 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -552,7 +552,8 @@ 0x0 0x70019a88 0x0 0x24>; nvidia,#asids = <128>; dma-window = <0x0 0x0 0x0 0x40000000>; - iommu-cells = <2>; + iommu-cells = <1>; + status = "disabled"; }; memory-controller@0,70019000 { diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 34ef56539be..10ac8c1687a 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -288,9 +288,11 @@ static int really_probe(struct device *dev, struct device_driver *drv) dev->driver = drv; + /* ret = of_iommu_attach(dev); if (ret) goto probe_failed; + */ /* If using pinctrl, bind pins now before probing */ ret = pinctrl_bind_pins(dev); |