Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9ab9dcd authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-4.8-dt-bindings' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents a7f856d6 7eb28ee0

Documentation/devicetree/bindings/arm/tegra.txt

+4 −0
Original line number Diff line number Diff line
@@ -32,7 +32,11 @@ board-specific compatible values: 
  nvidia,whistler

  toradex,apalis_t30

  toradex,apalis_t30-eval

  toradex,apalis-tk1

  toradex,apalis-tk1-eval

  toradex,colibri_t20-512

  toradex,colibri_t30

  toradex,colibri_t30-eval-v3

  toradex,iris



Trusted Foundations

Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ For Tegra124 and Tegra132, the list of valid PHY nodes is given below: 
  - functions: "usb3-ss", "sata"



For Tegra210, the list of valid PHY nodes is given below:

- utmi: utmi-0, utmi-1, utmi-2, utmi-3

- usb2: usb2-0, usb2-1, usb2-2, usb2-3

  - functions: "snps", "xusb", "uart"

- hsic: hsic-0, hsic-1

  - functions: "snps", "xusb"

Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt

+4 −4
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ Example: 


		nvidia,xusb-padctl = <&padctl>;



		phys = <&{/padctl@0,7009f000/pads/usb2/usb2-1}>, /* mini-PCIe USB */

		       <&{/padctl@0,7009f000/pads/usb2/usb2-2}>, /* USB A */

		       <&{/padctl@0,7009f000/pads/pcie/pcie-0}>; /* USB A */

		phy-names = "utmi-1", "utmi-2", "usb3-0";

		phys = <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-1}>, /* mini-PCIe USB */

		       <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-2}>, /* USB A */

		       <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-0}>; /* USB A */

		phy-names = "usb2-1", "usb2-2", "usb3-0";



		avddio-pex-supply = <&vdd_1v05_run>;

		dvddio-pex-supply = <&vdd_1v05_run>;