diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 20:01:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 20:01:16 -0400 |
| commit | 99103f77489e6cf1473469261a003dcd2e44aac1 (patch) | |
| tree | 175dbc218b9e0fe9157bce67693262028e0bfd55 /Documentation | |
| parent | 206aa6a6c57a24d927e89071fbbf690208052caf (diff) | |
| parent | 38843e29217bc6b6fce80a5bf19d1636ee337c77 (diff) | |
Merge tag 'pinctrl-v3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pinctrl fixes from Linus Walleij:
"This fixes a few pinctrl problems seen since v3.7-rc1:
- Section tagging for init code
- Use proper pointers to lookup struct device * in the bcm2835
(a.k.a. Raspberry Pi)
- Remove duplicate #includes
- Fix bad return values in errorpath
- Remove extraneous pull function from the sirf driver causing build
errors
- Provide compilation stubs for the Nomadik pinctrl driver when used
with legacy systems without PRCMU units
- Various irqdomain fixes in the Nomadik driver as predicted
- Various smallish bugs in the Tegra driver, most also targeted for
stable
- Removed a deadlocking mutex in the groups debugfs show function"
* tag 'pinctrl-v3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl/nomadik: pass DT node to the irqdomain
pinctrl/nomadik: use zero as default irq_start
pinctrl: fix missing unlock on error in pinctrl_groups_show()
pinctrl/nomadik: use irq_create_mapping()
pinctrl: remove mutex lock in groups show
pinctrl: tegra: correct bank for pingroup and drv pingroup
pinctrl: tegra: set low power mode bank width to 2
dt: Document: correct tegra20/30 pinctrl slew-rate name
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt index c8e578263ce2..683fde93c4fb 100644 --- a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt +++ b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt | |||
| @@ -93,7 +93,7 @@ Valid values for pin and group names are: | |||
| 93 | 93 | ||
| 94 | With some exceptions, these support nvidia,high-speed-mode, | 94 | With some exceptions, these support nvidia,high-speed-mode, |
| 95 | nvidia,schmitt, nvidia,low-power-mode, nvidia,pull-down-strength, | 95 | nvidia,schmitt, nvidia,low-power-mode, nvidia,pull-down-strength, |
| 96 | nvidia,pull-up-strength, nvidia,slew_rate-rising, nvidia,slew_rate-falling. | 96 | nvidia,pull-up-strength, nvidia,slew-rate-rising, nvidia,slew-rate-falling. |
| 97 | 97 | ||
| 98 | drive_ao1, drive_ao2, drive_at1, drive_at2, drive_cdev1, drive_cdev2, | 98 | drive_ao1, drive_ao2, drive_at1, drive_at2, drive_cdev1, drive_cdev2, |
| 99 | drive_csus, drive_dap1, drive_dap2, drive_dap3, drive_dap4, drive_dbg, | 99 | drive_csus, drive_dap1, drive_dap2, drive_dap3, drive_dap4, drive_dbg, |
diff --git a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt index c275b70349c1..6f426ed7009e 100644 --- a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt +++ b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt | |||
| @@ -83,7 +83,7 @@ Valid values for pin and group names are: | |||
| 83 | drive groups: | 83 | drive groups: |
| 84 | 84 | ||
| 85 | These all support nvidia,pull-down-strength, nvidia,pull-up-strength, | 85 | These all support nvidia,pull-down-strength, nvidia,pull-up-strength, |
| 86 | nvidia,slew_rate-rising, nvidia,slew_rate-falling. Most but not all | 86 | nvidia,slew-rate-rising, nvidia,slew-rate-falling. Most but not all |
| 87 | support nvidia,high-speed-mode, nvidia,schmitt, nvidia,low-power-mode. | 87 | support nvidia,high-speed-mode, nvidia,schmitt, nvidia,low-power-mode. |
| 88 | 88 | ||
| 89 | ao1, ao2, at1, at2, at3, at4, at5, cdev1, cdev2, cec, crt, csus, dap1, | 89 | ao1, ao2, at1, at2, at3, at4, at5, cdev1, cdev2, cec, crt, csus, dap1, |