tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'tegra-for-4.8-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

dt-bindings: tegra: Updates for v4.8-rc1

A couple of fixes for the Tegra XUSB controller and Tegra XUSB pad
controller bindings, as well as the addition of some compatible strings
for Tegra-based boards.

* tag 'tegra-for-4.8-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
dt-bindings: tegra: Add Apalis TK1 device tree binding documentation
dt-bindings: tegra: Add Colibri T30 device tree binding documentation
dt-bindings: usb: Fix Tegra XUSB example
dt-bindings: phy: Fix description of Tegra210 PHY nodes

Signed-off-by: Olof Johansson <olof@lixom.net>

Olof Johansson b9ab9dcd a7f856d6

+9 -5
+4
Documentation/devicetree/bindings/arm/tegra.txt
··· 32 32 nvidia,whistler 33 33 toradex,apalis_t30 34 34 toradex,apalis_t30-eval 35 + toradex,apalis-tk1 36 + toradex,apalis-tk1-eval 35 37 toradex,colibri_t20-512 38 + toradex,colibri_t30 39 + toradex,colibri_t30-eval-v3 36 40 toradex,iris 37 41 38 42 Trusted Foundations
+1 -1
Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt
··· 124 124 - functions: "usb3-ss", "sata" 125 125 126 126 For Tegra210, the list of valid PHY nodes is given below: 127 - - utmi: utmi-0, utmi-1, utmi-2, utmi-3 127 + - usb2: usb2-0, usb2-1, usb2-2, usb2-3 128 128 - functions: "snps", "xusb", "uart" 129 129 - hsic: hsic-0, hsic-1 130 130 - functions: "snps", "xusb"
+4 -4
Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt
··· 104 104 105 105 nvidia,xusb-padctl = <&padctl>; 106 106 107 - phys = <&{/padctl@0,7009f000/pads/usb2/usb2-1}>, /* mini-PCIe USB */ 108 - <&{/padctl@0,7009f000/pads/usb2/usb2-2}>, /* USB A */ 109 - <&{/padctl@0,7009f000/pads/pcie/pcie-0}>; /* USB A */ 110 - phy-names = "utmi-1", "utmi-2", "usb3-0"; 107 + phys = <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-1}>, /* mini-PCIe USB */ 108 + <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-2}>, /* USB A */ 109 + <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-0}>; /* USB A */ 110 + phy-names = "usb2-1", "usb2-2", "usb3-0"; 111 111 112 112 avddio-pex-supply = <&vdd_1v05_run>; 113 113 dvddio-pex-supply = <&vdd_1v05_run>;