diff options
| author | Tom Rini <[email protected]> | 2021-07-31 08:18:14 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-07-31 08:18:14 -0400 |
| commit | 85769006fce951d0ebf61585ae0ab6b7d880735d (patch) | |
| tree | 12a2b59bf6475489ce9d20ba79b65dc26286b1fa /doc | |
| parent | 15f7e0dc01d8a851fb1bfbf0e47eab5b67ed26b3 (diff) | |
| parent | 2cc4be280c259ac1e8e74c643c72e0331266056f (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- kwboot / kwbimage improvements reducing image size (Pali & Marek)
- a37xx: pinctrl: Correct PWM pins definitions (Marek)
- Convert the Dreamplug Ethernet and SATA to Driver Model (Tony)
- serial: a37xx: DEBUG_UART improvements / fixes (Pali)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/device-tree-bindings/pinctrl/marvell,armada-37xx-pinctrl.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/device-tree-bindings/pinctrl/marvell,armada-37xx-pinctrl.txt b/doc/device-tree-bindings/pinctrl/marvell,armada-37xx-pinctrl.txt index 86ec11361c1..3139a99fa97 100644 --- a/doc/device-tree-bindings/pinctrl/marvell,armada-37xx-pinctrl.txt +++ b/doc/device-tree-bindings/pinctrl/marvell,armada-37xx-pinctrl.txt @@ -38,19 +38,19 @@ group emmc_nb group pwm0 - pin 11 (GPIO1-11) - - functions pwm, gpio + - functions pwm, led, gpio group pwm1 - pin 12 - - functions pwm, gpio + - functions pwm, led, gpio group pwm2 - pin 13 - - functions pwm, gpio + - functions pwm, led, gpio group pwm3 - pin 14 - - functions pwm, gpio + - functions pwm, led, gpio group pmic1 - pin 7 |