From: Olof Johansson <olof@lixom.net>
Date: Tue, 25 Jun 2019 11:50:23 +0000 (-0700)
Subject: Merge tag 'pxa-dt-5.3' of https://github.com/rjarzmik/linux into arm/dt
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=276610709de1b24d44750f0e03b93563df9b9d78;p=linux.git

Merge tag 'pxa-dt-5.3' of https://github.com/rjarzmik/linux into arm/dt

This is the pxa devicetree changes for 5.3 cycle :
 - devicetree pinmux support for bias on pxa3xx
 - devicetree pinmux bias usage for raumfeld

* tag 'pxa-dt-5.3' of https://github.com/rjarzmik/linux:
  ARM: dts: pxa300-raumfeld-speaker-one: add channel output mapping for STA320
  ARM: pxa: raumfeld-common: fix comments in gpio_keys pinctrl node
  ARM: pxa: raumfeld-controller: add pinctrl for charger pins
  ARM: pxa: raumfeld-controller: fix 'dock detect' GPIO key
  ARM: pxa3xx: dts: Add defines for pinctrl-single,bias-pull{up,down}

Signed-off-by: Olof Johansson <olof@lixom.net>
---

276610709de1b24d44750f0e03b93563df9b9d78