drm/nouveau/pbus: add a PBUS subdev that hands IRQs to the right subdevs

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / core / subdev / gpio / nv10.c

diff --git a/drivers/gpu/drm/nouveau/core/subdev/gpio/nv10.c b/drivers/gpu/drm/nouveau/core/subdev/gpio/nv10.c
index 168d16a9a8e9ebe8c9b876c20d0c79bfb12037dd..3bed67aac3067f1338306ecab8fcbad43768ffc2 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/gpio/nv10.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/gpio/nv10.c
@@ -141,8 +141,6 @@ nv10_gpio_init(struct nouveau_object *object)
        if (ret)
                return ret;
 
-       nv_wr32(priv, 0x001140, 0x00000000);
-       nv_wr32(priv, 0x001100, 0xffffffff);
        nv_wr32(priv, 0x001144, 0x00000000);
        nv_wr32(priv, 0x001104, 0xffffffff);
        return 0;
@@ -152,7 +150,6 @@ static int
 nv10_gpio_fini(struct nouveau_object *object, bool suspend)
 {
        struct nv10_gpio_priv *priv = (void *)object;
-       nv_wr32(priv, 0x001140, 0x00000000);
        nv_wr32(priv, 0x001144, 0x00000000);
        return nouveau_gpio_fini(&priv->base, suspend);
 }