diff options
| author | Olof Johansson <olof@lixom.net> | 2019-06-25 14:50:23 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-06-25 14:50:23 +0300 |
| commit | 276610709de1b24d44750f0e03b93563df9b9d78 (patch) | |
| tree | 9d7ed2daa0c74bc0525dbb344c3336811a55ea53 /drivers/fpga/fpga-mgr.c | |
| parent | 28705661dd1f95d398c15f76ab3b306624b304ca (diff) | |
| parent | bea8754e784ef894a7aaf1821a1e8b700cc70f32 (diff) | |
| download | linux-276610709de1b24d44750f0e03b93563df9b9d78.tar.xz | |
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>
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions