diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-19 00:02:58 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-19 00:02:58 +0300 |
| commit | f928e1030bf818aa3ad25c4066be37eac69f687c (patch) | |
| tree | ced59d9b43d4e25b4178a04274765d912fcf8418 | |
| parent | fdccc4fc45141cf0542966ca80a076b3192dbf7d (diff) | |
| parent | e3ff43b6c991bc8cbfa7e926ef0f655b4bae3fee (diff) | |
| download | linux-f928e1030bf818aa3ad25c4066be37eac69f687c.tar.xz | |
Merge tag 'tegra-for-4.14-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
Pull "ARM: tegra: Device tree changes for v4.14-rc1" from Thierry Reding:
One fix for Tegra124 to hook the host1x device up with the SMMU.
The remainder of this enables USB device mode on a couple of boards
where the port is currently unused.
* tag 'tegra-for-4.14-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Enable UDC on AC100
ARM: tegra: Enable UDC on Jetson TK1
ARM: tegra: Enable UDC on Dalmore
ARM: tegra: Enable UDC on Beaver
ARM: tegra: Register host1x node with IOMMU binding on Tegra124
| -rw-r--r-- | arch/arm/boot/dts/tegra114-dalmore.dts | 10 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra124-jetson-tk1.dts | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra124.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-paz00.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30-beaver.dts | 10 |
5 files changed, 34 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts index 1444fbd543e7..5af4dd321952 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts @@ -1122,6 +1122,16 @@ non-removable; }; + usb@7d000000 { + compatible = "nvidia,tegra114-udc"; + status = "okay"; + dr_mode = "peripheral"; + }; + + usb-phy@7d000000 { + status = "okay"; + }; + usb@7d008000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts index 7bacb2954f58..61873d642a45 100644 --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts @@ -1722,7 +1722,7 @@ lanes { usb2-0 { - nvidia,function = "xusb"; + nvidia,function = "snps"; status = "okay"; }; @@ -1829,6 +1829,16 @@ }; }; + usb@7d000000 { + compatible = "nvidia,tegra124-udc"; + status = "okay"; + dr_mode = "peripheral"; + }; + + usb-phy@7d000000 { + status = "okay"; + }; + /* mini-PCIe USB */ usb@7d004000 { status = "okay"; diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index 1b10b14a6abd..8baf00b89efb 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -87,6 +87,7 @@ clocks = <&tegra_car TEGRA124_CLK_HOST1X>; resets = <&tegra_car 28>; reset-names = "host1x"; + iommus = <&mc TEGRA_SWGROUP_HC>; #address-cells = <2>; #size-cells = <2>; diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts index b4bfa5586c23..bfa9421fcf94 100644 --- a/arch/arm/boot/dts/tegra20-paz00.dts +++ b/arch/arm/boot/dts/tegra20-paz00.dts @@ -452,7 +452,9 @@ }; usb@c5000000 { + compatible = "nvidia,tegra20-udc"; status = "okay"; + dr_mode = "peripheral"; }; usb-phy@c5000000 { diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts index 4f41b18d9547..3e104ddeb220 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -1927,6 +1927,16 @@ non-removable; }; + usb@7d000000 { + compatible = "nvidia,tegra30-udc"; + status = "okay"; + dr_mode = "peripheral"; + }; + + usb-phy@7d000000 { + status = "okay"; + }; + usb@7d004000 { status = "okay"; }; |