Merge tag 'v4.4-rc6' into devel

Linux 4.4-rc6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpio/gpio-ath79.c
Simple merge

diff --cc drivers/gpio/gpio-generic.c
Simple merge

diff --cc drivers/gpio/gpio-omap.c
Simple merge

diff --cc drivers/gpio/gpio-palmas.c
Simple merge

diff --cc drivers/gpio/gpio-syscon.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/pinctrl/bcm/pinctrl-bcm2835.c
index 0bc1abcedbae9dfa50559e1c52b46f560a05ad34,2e6ca69635aa001531d2b9aca128d001b97d9aca..595f87028b19207b8c08bc1769b53b72b0a3ba59
--- 1/drivers/pinctrl/bcm/pinctrl-bcm2835.c
--- 2/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@@ -342,22 -342,23 +342,23 @@@ static int bcm2835_gpio_get(struct gpio
        return bcm2835_gpio_get_bit(pc, GPLEV0, offset);
  }
  
- static int bcm2835_gpio_direction_output(struct gpio_chip *chip,
-               unsigned offset, int value)
- {
-       return pinctrl_gpio_direction_output(chip->base + offset);
- }
- 
  static void bcm2835_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
  {
 -      struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev);
 +      struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->parent);
  
        bcm2835_gpio_set_bit(pc, value ? GPSET0 : GPCLR0, offset);
  }
  
+ static int bcm2835_gpio_direction_output(struct gpio_chip *chip,
+               unsigned offset, int value)
+ {
+       bcm2835_gpio_set(chip, offset, value);
+       return pinctrl_gpio_direction_output(chip->base + offset);
+ }
+ 
  static int bcm2835_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
  {
 -      struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev);
 +      struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->parent);
  
        return irq_linear_revmap(pc->irq_domain, offset);
  }

diff --cc drivers/pinctrl/intel/pinctrl-intel.c
Simple merge

diff --cc drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index a71f68362967f2050571acf0c1d3430ed358e782,5c717275a7fa805f370cdd68815e64f8982b142b..9ddba444e12760f4b8ad7bceae2345e874e5d069
--- 1/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
--- 2/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@@ -755,14 -755,10 +755,10 @@@ static int mtk_gpio_get(struct gpio_chi
        unsigned int reg_addr;
        unsigned int bit;
        unsigned int read_val = 0;
 -      struct mtk_pinctrl *pctl = dev_get_drvdata(chip->dev);
 +      struct mtk_pinctrl *pctl = dev_get_drvdata(chip->parent);
  
-       if (mtk_gpio_get_direction(chip, offset))
-               reg_addr = mtk_get_port(pctl, offset) +
-                       pctl->devdata->dout_offset;
-       else
-               reg_addr = mtk_get_port(pctl, offset) +
-                       pctl->devdata->din_offset;
+       reg_addr = mtk_get_port(pctl, offset) +
+               pctl->devdata->din_offset;
  
        bit = BIT(offset & 0xf);
        regmap_read(pctl->regmap1, reg_addr, &read_val);

diff --cc drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
Simple merge

diff --cc drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
Simple merge

diff --cc sound/soc/codecs/rt5677.c
Simple merge

diff --cc sound/soc/codecs/wm8962.c
Simple merge