Merge remote branch 'anholt/drm-intel-next' into drm-next

* anholt/drm-intel-next: (515 commits)
  drm/i915: Fix out of tree builds
  drm/i915: move fence lru to struct drm_i915_fence_reg
  drm/i915: don't allow tiling changes on pinned buffers v2
  drm/i915: Be extra careful about A/D matching for multifunction SDVO
  drm/i915: Fix DDC bus selection for multifunction SDVO
  drm/i915: cleanup mode setting before unmapping registers
  drm/i915: Make fbc control wrapper functions
  drm/i915: Wait for the GPU whilst shrinking, if truly desperate.
  drm/i915: Use spatio-temporal dithering on PCH
  [MTD] Remove zero-length files mtdbdi.c and internal.ho
  pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs
  libata: Fix several inaccuracies in developer's guide
  slub: Fix bad boundary check in init_kmem_cache_nodes()
  raid6: fix recovery performance regression
  KEYS: call_sbin_request_key() must write lock keyrings before modifying them
  KEYS: Use RCU dereference wrappers in keyring key type code
  KEYS: find_keyring_by_name() can gain access to a freed keyring
  ALSA: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice)
  ALSA: hda - Add quirk for Dell Inspiron 19T using a Conexant CX20582
  ALSA: take tu->qlock with irqs disabled
  ...

1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
index 5ad8f778ced4..105701a1f05b 100644
--- a/drivers/gpio/pl061.c
+++ b/drivers/gpio/pl061.c
@@ -91,6 +91,12 @@ static int pl061_direction_output(struct gpio_chip *gc, unsigned offset,
         gpiodir = readb(chip->base + GPIODIR);
         gpiodir |= 1 << offset;
         writeb(gpiodir, chip->base + GPIODIR);
+
+        /*
+         * gpio value is set again, because pl061 doesn't allow to set value of
+         * a gpio pin before configuring it in OUT mode.
+         */
+        writeb(!!value << offset, chip->base + (1 << (offset + 2)));
         spin_unlock_irqrestore(&chip->lock, flags);
 
         return 0;
@@ -183,7 +189,7 @@ static int pl061_irq_type(unsigned irq, unsigned trigger)
                 gpioibe &= ~(1 << offset);
                 if (trigger & IRQ_TYPE_EDGE_RISING)
                         gpioiev |= 1 << offset;
-                else
+                else if (trigger & IRQ_TYPE_EDGE_FALLING)
                         gpioiev &= ~(1 << offset);
         }
         writeb(gpioibe, chip->base + GPIOIBE);
@@ -204,7 +210,7 @@ static struct irq_chip pl061_irqchip = {
 
 static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
 {
-        struct list_head *chip_list = get_irq_chip_data(irq);
+        struct list_head *chip_list = get_irq_data(irq);
         struct list_head *ptr;
         struct pl061_gpio *chip;
 
@@ -297,9 +303,9 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
                         goto iounmap;
                 }
                 INIT_LIST_HEAD(chip_list);
-                set_irq_chip_data(irq, chip_list);
+                set_irq_data(irq, chip_list);
         } else
-                chip_list = get_irq_chip_data(irq);
+                chip_list = get_irq_data(irq);
         list_add(&chip->list, chip_list);
 
         for (i = 0; i < PL061_GPIO_NR; i++) {