Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344255
b: refs/heads/master
c: 4aa935a
h: refs/heads/master
i:
  344253: 3ad313b
  344251: 07eab17
  344247: 7d61e9a
  344239: fef72b8
  344223: d579bdd
  344191: f2aeb19
v: v3
  • Loading branch information
Thomas Petazzoni committed Nov 20, 2012
1 parent 16a34d4 commit 67f3fc5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23f4f6020edca3d44f13df95738996cf7b622e13
refs/heads/master: 4aa935a2cfd164362680eb4a7919c89a4b8ddb48
2 changes: 2 additions & 0 deletions trunk/arch/arm/boot/dts/armada-370-xp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,15 @@
compatible = "marvell,armada-370-neta";
reg = <0xd0070000 0x2500>;
interrupts = <8>;
clocks = <&gateclk 4>;
status = "disabled";
};

ethernet@d0074000 {
compatible = "marvell,armada-370-neta";
reg = <0xd0074000 0x2500>;
interrupts = <10>;
clocks = <&gateclk 3>;
status = "disabled";
};
};
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/boot/dts/armada-xp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,15 @@
compatible = "marvell,armada-370-neta";
reg = <0xd0030000 0x2500>;
interrupts = <12>;
clocks = <&gateclk 2>;
status = "disabled";
};

ethernet@d0034000 {
compatible = "marvell,armada-370-neta";
reg = <0xd0034000 0x2500>;
interrupts = <14>;
clocks = <&gateclk 1>;
status = "disabled";
};
};
Expand Down

0 comments on commit 67f3fc5

Please sign in to comment.