diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-10 18:32:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-10 18:32:51 -0500 |
| commit | d4185bbf62a5d8d777ee445db1581beb17882a07 (patch) | |
| tree | 024b0badbd7c970b1983be6d8c345cc4a290cb31 /Documentation/devicetree/bindings/pinctrl | |
| parent | c075b13098b399dc565b4d53f42047a8d40ed3ba (diff) | |
| parent | a375413311b39005ef281bfd71ae8f4e3df22e97 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net. Based upon a conflict resolution
patch posted by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl')
| -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, |