From: Stephen Warren Date: Mon, 15 Aug 2016 17:31:31 +0000 (-0600) Subject: ARM: tegra: Fix Tegra114 USB compatible values X-Git-Tag: v4.9-rc1~76^2~16^2~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a70cb07bb397fce6675d7ab055fb447519fc7c76;p=linux.git ARM: tegra: Fix Tegra114 USB compatible values DT compatible values should always include an entry for the specific chip in addition to any earlier generations that the HW is backwards- compatible with. This doesn't affect the kernel at all given current driver code, but U-Boot needs to distinguish between Tegra114 and Tegra30 for this HW, and I'd like to synchronize the DT content. Signed-off-by: Stephen Warren Signed-off-by: Thierry Reding --- diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index cb9393a53422..8932ea3afd5f 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -672,7 +672,7 @@ sdhci@78000600 { }; usb@7d000000 { - compatible = "nvidia,tegra30-ehci", "usb-ehci"; + compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci"; reg = <0x7d000000 0x4000>; interrupts = ; phy_type = "utmi"; @@ -684,7 +684,7 @@ usb@7d000000 { }; phy1: usb-phy@7d000000 { - compatible = "nvidia,tegra30-usb-phy"; + compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy"; reg = <0x7d000000 0x4000 0x7d000000 0x4000>; phy_type = "utmi"; clocks = <&tegra_car TEGRA114_CLK_USBD>, @@ -708,7 +708,7 @@ phy1: usb-phy@7d000000 { }; usb@7d008000 { - compatible = "nvidia,tegra30-ehci", "usb-ehci"; + compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci"; reg = <0x7d008000 0x4000>; interrupts = ; phy_type = "utmi"; @@ -720,7 +720,7 @@ usb@7d008000 { }; phy3: usb-phy@7d008000 { - compatible = "nvidia,tegra30-usb-phy"; + compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy"; reg = <0x7d008000 0x4000 0x7d000000 0x4000>; phy_type = "utmi"; clocks = <&tegra_car TEGRA114_CLK_USB3>,