diff options
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/dts/p1020rdb.dtsi | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/powerpc/boot/dts/p1020rdb.dtsi b/arch/powerpc/boot/dts/p1020rdb.dtsi index b5bd86f4baf2..17559c4dc5d8 100644 --- a/arch/powerpc/boot/dts/p1020rdb.dtsi +++ b/arch/powerpc/boot/dts/p1020rdb.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * P1020 RDB Device Tree Source stub (no addresses or top-level ranges) | 2 | * P1020 RDB Device Tree Source stub (no addresses or top-level ranges) |
3 | * | 3 | * |
4 | * Copyright 2011 Freescale Semiconductor Inc. | 4 | * Copyright 2011-2012 Freescale Semiconductor Inc. |
5 | * | 5 | * |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without |
7 | * modification, are permitted provided that the following conditions are met: | 7 | * modification, are permitted provided that the following conditions are met: |
@@ -192,15 +192,12 @@ | |||
192 | phy_type = "ulpi"; | 192 | phy_type = "ulpi"; |
193 | }; | 193 | }; |
194 | 194 | ||
195 | /* USB2 is shared with localbus, so it must be disabled | 195 | /* USB2 is shared with localbus. It is used |
196 | by default. We can't put 'status = "disabled";' here | 196 | only in case of SPI and SD boot after |
197 | since U-Boot doesn't clear the status property when | 197 | appropriate device-tree fixup done by uboot */ |
198 | it enables USB2. OTOH, U-Boot does create a new node | ||
199 | when there isn't any. So, just comment it out. | ||
200 | usb@23000 { | 198 | usb@23000 { |
201 | phy_type = "ulpi"; | 199 | phy_type = "ulpi"; |
202 | }; | 200 | }; |
203 | */ | ||
204 | 201 | ||
205 | mdio@24000 { | 202 | mdio@24000 { |
206 | phy0: ethernet-phy@0 { | 203 | phy0: ethernet-phy@0 { |