This is the bulk of pin control changes for the v3.16
development cycle:

- Antoine Tenart made the get_group_pins() vtable entry
  optional.

- Antoine also provides an entirely new driver for the
  Marvell Berlin SoC. This is unrelated to the existing
  MVEBU hardware driver and warrants its own separate
  driver.

- Reflected from the GPIO subsystem there is a number of
  refactorings to make pin control drivers with gpiochips
  use the new gpiolib irqchip helpers. The following
  drivers were converted to use the new infrastructure:

  - ST Microelectronics STiH416 and friends

  - The Atmel AT91

  - The CSR SiRF (Prima2)

  - The Qualcomm MSM series

- Massive improvements in the Qualcomm MSM driver from
  Bjorn Andersson, Andy Gross and Kumar Gala. Among those
  new support for the IPQ8064 and MSM8x74 SoC variants.

- Support for the Freescale i.MX6 SoloX SoC variant.

- Massive improvements in the Allwinner sunxi driver from
  Boris Brezillon, Maxime Ripard and Chen-Yu Tsai.

- Renesas PFC updates from Laurent Pinchart, Kuninori
  Morimoto, Wolfram Sang and Magnus Damm.

- Cleanups and refactorings of the nVidia Tegra driver from
  Stepgen Warren.

- The Exynos driver now supports the Exynos3250 SoC.

- Intel BayTrail updates from Jin Yao, Mika Westerberg.

- The MVEBU driver now supports the Orion5x SoC
  variants, which is part of the effort of getting rid of
  the old Marvell kludges in arch/arm/mach-orion5x

- Rockchip driver updates from Heiko Stuebner.

- A ton of cleanups and janitorial patches from Axel Lin.

- Some minor fixes and improvements here and there.
pinctrl: sirf: fix a bad conflict resolution

Commit 294d1351ff47726f0f110b88e816cbafe89512fb
"pinctrl: sirf: switch to using allocated state container"
caused a build conflict due to a bad conflict resolution
when cherry-picking the patch. Fix it up.

Cc: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 file changed