diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 14:16:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 14:16:58 -0400 |
commit | d4e1f5a14e17d4f0e8034c0967511884bcb12fba (patch) | |
tree | 8f35e6e4b7925c1aa6981b691aa51b1bfa1b4fa8 /Documentation/devicetree/bindings/pinctrl | |
parent | 231bf80f7f14107f7ecfa2e0a2b0c56e6a793284 (diff) | |
parent | 8850e0ba5721c2e2db34bc38290722db1b402be5 (diff) |
Merge tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC device-tree changes from Olof Johansson:
"Unlike the board branch, this keeps having large sets of changes for
every release, but that's quite expected and is so far working well.
Most of this is plumbing for various device bindings and new
platforms, but there's also a bit of cleanup and code removal for
things that are moved from platform code to DT contents (some OMAP
clock code in particular).
There's also a pinctrl driver for tegra here (appropriately acked),
that's introduced this way to make it more bisectable.
I'm happy to say that there were no conflicts at all with this branch
this release, which means that changes are flowing through our tree as
expected instead of merged through driver maintainers (or at least not
done with conflicts).
There are several new boards added, and a couple of SoCs. In no
particular order:
- Rockchip RK3288 SoC support, including DTS for a dev board that
they have seeded with some community developers.
- Better support for Hardkernel Exynos4-based ODROID boards.
- CCF conversions (and dtsi contents) for several Renesas platforms.
- Gumstix Pepper (TI AM335x) board support
- TI eval board support for AM437x
- Allwinner A23 SoC, very similar to existing ones which mostly has
resulted in DT changes for support. Also includes support for an
Ippo tablet with the chipset.
- Allwinner A31 Hummingbird board support, not to be confused with
the SolidRun i.MX-based Hummingboard.
- Tegra30 Apalis board support"
* tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (334 commits)
ARM: dts: Enable USB host0 (EHCI) on rk3288-evb
ARM: dts: add rk3288 ehci usb devices
ARM: dts: Turn on USB host vbus on rk3288-evb
ARM: tegra: apalis t30: fix device tree compatible node
ARM: tegra: paz00: Fix some indentation inconsistencies
ARM: zynq: DT: Clarify Xilinx Zynq platform
ARM: dts: rockchip: add watchdog node
ARM: dts: rockchip: remove pinctrl setting from radxarock uart2
ARM: dts: Add missing pinctrl for uart0/1 for exynos3250
ARM: dts: Remove duplicate 'interrput-parent' property for exynos3250
ARM: dts: Add TMU dt node to monitor the temperature for exynos3250
ARM: dts: Specify MAX77686 pmic interrupt for exynos5250-smdk5250
ARM: dts: cypress,cyapa trackpad is exynos5250-Snow only
ARM: dts: max77686 is exynos5250-snow only
ARM: zynq: DT: Remove DMA from board DTs
ARM: zynq: DT: Add CAN node
ARM: EXYNOS: Add exynos5260 PMU compatible string to DT match table
ARM: dts: Add PMU DT node for exynos5260 SoC
ARM: EXYNOS: Add support for Exynos5410 PMU
ARM: dts: Add PMU to exynos5410
...
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl')
-rw-r--r-- | Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt | 127 |
1 files changed, 127 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt new file mode 100644 index 000000000000..2f9c0bd66457 --- /dev/null +++ b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt | |||
@@ -0,0 +1,127 @@ | |||
1 | Device tree binding for NVIDIA Tegra XUSB pad controller | ||
2 | ======================================================== | ||
3 | |||
4 | The Tegra XUSB pad controller manages a set of lanes, each of which can be | ||
5 | assigned to one out of a set of different pads. Some of these pads have an | ||
6 | associated PHY that must be powered up before the pad can be used. | ||
7 | |||
8 | This document defines the device-specific binding for the XUSB pad controller. | ||
9 | |||
10 | Refer to pinctrl-bindings.txt in this directory for generic information about | ||
11 | pin controller device tree bindings and ../phy/phy-bindings.txt for details on | ||
12 | how to describe and reference PHYs in device trees. | ||
13 | |||
14 | Required properties: | ||
15 | -------------------- | ||
16 | - compatible: should be "nvidia,tegra124-xusb-padctl" | ||
17 | - reg: Physical base address and length of the controller's registers. | ||
18 | - resets: Must contain an entry for each entry in reset-names. | ||
19 | See ../reset/reset.txt for details. | ||
20 | - reset-names: Must include the following entries: | ||
21 | - padctl | ||
22 | - #phy-cells: Should be 1. The specifier is the index of the PHY to reference. | ||
23 | See <dt-bindings/pinctrl/pinctrl-tegra-xusb.h> for the list of valid values. | ||
24 | |||
25 | Lane muxing: | ||
26 | ------------ | ||
27 | |||
28 | Child nodes contain the pinmux configurations following the conventions from | ||
29 | the pinctrl-bindings.txt document. Typically a single, static configuration is | ||
30 | given and applied at boot time. | ||
31 | |||
32 | Each subnode describes groups of lanes along with parameters and pads that | ||
33 | they should be assigned to. The name of these subnodes is not important. All | ||
34 | subnodes should be parsed solely based on their content. | ||
35 | |||
36 | Each subnode only applies the parameters that are explicitly listed. In other | ||
37 | words, if a subnode that lists a function but no pin configuration parameters | ||
38 | implies no information about any pin configuration parameters. Similarly, a | ||
39 | subnode that describes only an IDDQ parameter implies no information about | ||
40 | what function the pins are assigned to. For this reason even seemingly boolean | ||
41 | values are actually tristates in this binding: unspecified, off or on. | ||
42 | Unspecified is represented as an absent property, and off/on are represented | ||
43 | as integer values 0 and 1. | ||
44 | |||
45 | Required properties: | ||
46 | - nvidia,lanes: An array of strings. Each string is the name of a lane. | ||
47 | |||
48 | Optional properties: | ||
49 | - nvidia,function: A string that is the name of the function (pad) that the | ||
50 | pin or group should be assigned to. Valid values for function names are | ||
51 | listed below. | ||
52 | - nvidia,iddq: Enables IDDQ mode of the lane. (0: no, 1: yes) | ||
53 | |||
54 | Note that not all of these properties are valid for all lanes. Lanes can be | ||
55 | divided into three groups: | ||
56 | |||
57 | - otg-0, otg-1, otg-2: | ||
58 | |||
59 | Valid functions for this group are: "snps", "xusb", "uart", "rsvd". | ||
60 | |||
61 | The nvidia,iddq property does not apply to this group. | ||
62 | |||
63 | - ulpi-0, hsic-0, hsic-1: | ||
64 | |||
65 | Valid functions for this group are: "snps", "xusb". | ||
66 | |||
67 | The nvidia,iddq property does not apply to this group. | ||
68 | |||
69 | - pcie-0, pcie-1, pcie-2, pcie-3, pcie-4, sata-0: | ||
70 | |||
71 | Valid functions for this group are: "pcie", "usb3", "sata", "rsvd". | ||
72 | |||
73 | |||
74 | Example: | ||
75 | ======== | ||
76 | |||
77 | SoC file extract: | ||
78 | ----------------- | ||
79 | |||
80 | padctl@0,7009f000 { | ||
81 | compatible = "nvidia,tegra124-xusb-padctl"; | ||
82 | reg = <0x0 0x7009f000 0x0 0x1000>; | ||
83 | resets = <&tegra_car 142>; | ||
84 | reset-names = "padctl"; | ||
85 | |||
86 | #phy-cells = <1>; | ||
87 | }; | ||
88 | |||
89 | Board file extract: | ||
90 | ------------------- | ||
91 | |||
92 | pcie-controller@0,01003000 { | ||
93 | ... | ||
94 | |||
95 | phys = <&padctl 0>; | ||
96 | phy-names = "pcie"; | ||
97 | |||
98 | ... | ||
99 | }; | ||
100 | |||
101 | ... | ||
102 | |||
103 | padctl: padctl@0,7009f000 { | ||
104 | pinctrl-0 = <&padctl_default>; | ||
105 | pinctrl-names = "default"; | ||
106 | |||
107 | padctl_default: pinmux { | ||
108 | usb3 { | ||
109 | nvidia,lanes = "pcie-0", "pcie-1"; | ||
110 | nvidia,function = "usb3"; | ||
111 | nvidia,iddq = <0>; | ||
112 | }; | ||
113 | |||
114 | pcie { | ||
115 | nvidia,lanes = "pcie-2", "pcie-3", | ||
116 | "pcie-4"; | ||
117 | nvidia,function = "pcie"; | ||
118 | nvidia,iddq = <0>; | ||
119 | }; | ||
120 | |||
121 | sata { | ||
122 | nvidia,lanes = "sata-0"; | ||
123 | nvidia,function = "sata"; | ||
124 | nvidia,iddq = <0>; | ||
125 | }; | ||
126 | }; | ||
127 | }; | ||