diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-06 16:24:21 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-06 16:24:21 +0300 |
commit | 4fda87df09bee2b1bf236aba408c3236d4f1fbca (patch) | |
tree | f1ec4a5b8696c89141bcdc25b6920b3caf5c9f97 /arch/arm/boot/dts/dra72-evm.dts | |
parent | 70658b99490dd86cfdbf4fca117bbe2ef9a80d03 (diff) | |
parent | 3b8f4a70b840cff298010481d39404e9c39030d1 (diff) | |
download | linux-4fda87df09bee2b1bf236aba408c3236d4f1fbca.tar.xz |
Merge tag 'asoc-fix-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.0
A few driver specific fixes here, none of them earth shattering in
themselves, that have accumliated since the opening of the merge window.
Diffstat (limited to 'arch/arm/boot/dts/dra72-evm.dts')
-rw-r--r-- | arch/arm/boot/dts/dra72-evm.dts | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts index 4d8711713610..e0264d0bf7b9 100644 --- a/arch/arm/boot/dts/dra72-evm.dts +++ b/arch/arm/boot/dts/dra72-evm.dts @@ -380,14 +380,6 @@ phy-supply = <&ldo4_reg>; }; -&omap_dwc3_1 { - extcon = <&extcon_usb1>; -}; - -&omap_dwc3_2 { - extcon = <&extcon_usb2>; -}; - &usb1 { dr_mode = "peripheral"; pinctrl-names = "default"; |