diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-24 20:27:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-24 20:27:34 -0500 |
commit | 4d8880a0ee5b3cdf7927c6cf59a164f352e4f436 (patch) | |
tree | b11c4af3b283f4850da11f4be856b7a432375720 /arch/arm/boot/dts/dove.dtsi | |
parent | 8e585a6c4abdef8562308f3f307aeea6cf168e8b (diff) | |
parent | e48ca29d30a10556eb7abd8d91980b8a57dabf10 (diff) |
Merge tag 'devicetree-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring:
- Add new documents with guidelines for DT binding stability and review
process. This is one of the outcomes of Kernel Summit DT discussions
- Remove a bunch of device_type usage which is only for OF and
deprecated with FDT
- Fix a long standing issue with compatible string match ordering
- Various minor binding documentation updates
* tag 'devicetree-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: add rockchip vendor prefix
serial: vt8500: Add missing binding document for arch-vt8500 serial driver.
dt/bindings: submitting patches and ABI documents
DT: Add vendor prefix for Emerging Display Technologies
of: add vendor prefixe for EPFL
of: add vendor prefix for Gumstix
of: add vendor prefix for Ka-Ro electronics GmbH
devicetree: macb: Document clock properties
dts: bindings: trivial clock bindings doc fixes
of: Fix __of_device_is_available check
dt/bindings: Remove device_type "serial" from marvell,mv64360-mpsc
dt/bindings: remove device_type "network" references
dt/bindings: remove users of device_type "mdio"
dt/bindings: Remove references to linux,phandle properties
dt/bindings: Remove all references to device_type "ethernet-phy"
of: irq: Ignore disabled intc's when searching map
of: irq: Ignore disabled interrupt controllers
OF: base: match each node compatible against all given matches first
dt-bindings: add GIC-400 binding
Diffstat (limited to 'arch/arm/boot/dts/dove.dtsi')
-rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 8de1031233ae..2b76524f4aa7 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi | |||
@@ -296,7 +296,6 @@ | |||
296 | status = "disabled"; | 296 | status = "disabled"; |
297 | 297 | ||
298 | ethernet-port@0 { | 298 | ethernet-port@0 { |
299 | device_type = "network"; | ||
300 | compatible = "marvell,orion-eth-port"; | 299 | compatible = "marvell,orion-eth-port"; |
301 | reg = <0>; | 300 | reg = <0>; |
302 | interrupts = <29>; | 301 | interrupts = <29>; |
@@ -316,7 +315,6 @@ | |||
316 | status = "disabled"; | 315 | status = "disabled"; |
317 | 316 | ||
318 | ethphy: ethernet-phy { | 317 | ethphy: ethernet-phy { |
319 | device_type = "ethernet-phy"; | ||
320 | /* set phy address in board file */ | 318 | /* set phy address in board file */ |
321 | }; | 319 | }; |
322 | }; | 320 | }; |