diff options
| author | Stephen Warren <swarren@nvidia.com> | 2011-10-11 18:16:13 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-10-11 20:19:56 -0400 |
| commit | f62f548c1c04742f68c15e21f173712dd6633791 (patch) | |
| tree | b5117bfb47d7d839aa19bc768b56525897a199e2 | |
| parent | 940dd96fe9dec5b6ba4bb7ebc33212ff66db243c (diff) | |
arm/dt: Tegra: Add pinmux node to tegra20.dtsi
Add a pinmux node to tegra20.dtsi in order to instantiate the future
pinmux device.
v2: Specify reg property precisely; don't just point at the whole APB_MISC
register range.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt b/Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt new file mode 100644 index 000000000000..36f82dbdd14d --- /dev/null +++ b/Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | NVIDIA Tegra 2 pinmux controller | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | - compatible : "nvidia,tegra20-pinmux" | ||
| 5 | |||
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 5727595cde61..65d7e6a333eb 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi | |||
| @@ -77,6 +77,14 @@ | |||
| 77 | gpio-controller; | 77 | gpio-controller; |
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| 80 | pinmux: pinmux@70000000 { | ||
| 81 | compatible = "nvidia,tegra20-pinmux"; | ||
| 82 | reg = < 0x70000014 0x10 /* Tri-state registers */ | ||
| 83 | 0x70000080 0x20 /* Mux registers */ | ||
| 84 | 0x700000a0 0x14 /* Pull-up/down registers */ | ||
| 85 | 0x70000868 0xa8 >; /* Pad control registers */ | ||
| 86 | }; | ||
| 87 | |||
| 80 | serial@70006000 { | 88 | serial@70006000 { |
| 81 | compatible = "nvidia,tegra20-uart"; | 89 | compatible = "nvidia,tegra20-uart"; |
| 82 | reg = <0x70006000 0x40>; | 90 | reg = <0x70006000 0x40>; |
