mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-09 10:11:52 -04:00
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
This commit is contained in:
@@ -1122,6 +1122,16 @@ sdhci@78000600 {
|
||||
non-removable;
|
||||
};
|
||||
|
||||
usb@7d000000 {
|
||||
compatible = "nvidia,tegra114-udc";
|
||||
status = "okay";
|
||||
dr_mode = "peripheral";
|
||||
};
|
||||
|
||||
usb-phy@7d000000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usb@7d008000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -1722,7 +1722,7 @@ usb2 {
|
||||
|
||||
lanes {
|
||||
usb2-0 {
|
||||
nvidia,function = "xusb";
|
||||
nvidia,function = "snps";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -1829,6 +1829,16 @@ i2s@70301100 {
|
||||
};
|
||||
};
|
||||
|
||||
usb@7d000000 {
|
||||
compatible = "nvidia,tegra124-udc";
|
||||
status = "okay";
|
||||
dr_mode = "peripheral";
|
||||
};
|
||||
|
||||
usb-phy@7d000000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
/* mini-PCIe USB */
|
||||
usb@7d004000 {
|
||||
status = "okay";
|
||||
|
||||
@@ -87,6 +87,7 @@ host1x@50000000 {
|
||||
clocks = <&tegra_car TEGRA124_CLK_HOST1X>;
|
||||
resets = <&tegra_car 28>;
|
||||
reset-names = "host1x";
|
||||
iommus = <&mc TEGRA_SWGROUP_HC>;
|
||||
|
||||
#address-cells = <2>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@@ -452,7 +452,9 @@ pmc@7000e400 {
|
||||
};
|
||||
|
||||
usb@c5000000 {
|
||||
compatible = "nvidia,tegra20-udc";
|
||||
status = "okay";
|
||||
dr_mode = "peripheral";
|
||||
};
|
||||
|
||||
usb-phy@c5000000 {
|
||||
|
||||
@@ -1927,6 +1927,16 @@ sdhci@78000600 {
|
||||
non-removable;
|
||||
};
|
||||
|
||||
usb@7d000000 {
|
||||
compatible = "nvidia,tegra30-udc";
|
||||
status = "okay";
|
||||
dr_mode = "peripheral";
|
||||
};
|
||||
|
||||
usb-phy@7d000000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usb@7d004000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user