aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-02-24 08:26:48 +1000
committerDave Airlie <airlied@redhat.com>2017-02-24 08:26:48 +1000
commit84f7174b4f793898aaeec0213c6c69ad300f4bc4 (patch)
treefd8b712cbba769b2fa61cbde45af05e297153724 /drivers
parentdrm/sti: fix build warnings in sti_drv.c and sti_vtg.c files (diff)
parentgpu: host1x: Set OF node for new host1x devices (diff)
downloadlinux-dev-84f7174b4f793898aaeec0213c6c69ad300f4bc4.tar.xz
linux-dev-84f7174b4f793898aaeec0213c6c69ad300f4bc4.zip
Merge tag 'drm/tegra/for-4.11-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/tegra: Changes for v4.11-rc1 Just a single change that hooks up the Tegra DRM parent device to the correct device tree node. * tag 'drm/tegra/for-4.11-rc1' of git://anongit.freedesktop.org/tegra/linux: gpu: host1x: Set OF node for new host1x devices
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/host1x/bus.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c
index c27858ae0552..eeb021fe6410 100644
--- a/drivers/gpu/host1x/bus.c
+++ b/drivers/gpu/host1x/bus.c
@@ -399,6 +399,7 @@ static int host1x_device_add(struct host1x *host1x,
dev_set_name(&device->dev, "%s", driver->driver.name);
of_dma_configure(&device->dev, host1x->dev->of_node);
device->dev.release = host1x_device_release;
+ device->dev.of_node = host1x->dev->of_node;
device->dev.bus = &host1x_bus_type;
device->dev.parent = host1x->dev;