diff options
author | Michal Simek <monstr@monstr.eu> | 2012-03-30 12:10:03 +0200 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2012-03-30 12:10:03 +0200 |
commit | 6a4770e335bd4df0a4577146f76e116ab6e23f40 (patch) | |
tree | 305056c20b6ccf3a4fed00e9e32f3a1dd039cd70 /arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | |
parent | microblaze: Fix stack usage in PAGE_SIZE copy_tofrom_user (diff) | |
parent | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
download | linux-6a4770e335bd4df0a4577146f76e116ab6e23f40.tar.xz linux-6a4770e335bd4df0a4577146f76e116ab6e23f40.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/p5020si-post.dtsi')
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi index 914074b91a85..64b6abea8464 100644 --- a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi @@ -339,12 +339,14 @@ /include/ "qoriq-gpio-0.dtsi" /include/ "qoriq-usb2-mph-0.dtsi" usb0: usb@210000 { + compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph"; phy_type = "utmi"; port0; }; /include/ "qoriq-usb2-dr-0.dtsi" usb1: usb@211000 { + compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr"; dr_mode = "host"; phy_type = "utmi"; }; |