Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313146
b: refs/heads/master
c: cb85a9e
h: refs/heads/master
v: v3
  • Loading branch information
Roland Stigge committed Jun 14, 2012
1 parent 088ae38 commit 35bce5f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a6e29c913d25eae0e232926fd9f7ceaf5306dc2
refs/heads/master: cb85a9e50817aec997d3cb7488614dac1f27465d
14 changes: 7 additions & 7 deletions trunk/arch/arm/boot/dts/lpc32xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
slc: flash@20020000 {
compatible = "nxp,lpc3220-slc";
reg = <0x20020000 0x1000>;
status = "disable";
status = "disabled";
};

mlc: flash@200a8000 {
compatible = "nxp,lpc3220-mlc";
reg = <0x200a8000 0x11000>;
interrupts = <11 0>;
status = "disable";
status = "disabled";
};

dma@31000000 {
Expand All @@ -58,21 +58,21 @@
compatible = "nxp,ohci-nxp", "usb-ohci";
reg = <0x31020000 0x300>;
interrupts = <0x3b 0>;
status = "disable";
status = "disabled";
};

usbd@31020000 {
compatible = "nxp,lpc3220-udc";
reg = <0x31020000 0x300>;
interrupts = <0x3d 0>, <0x3e 0>, <0x3c 0>, <0x3a 0>;
status = "disable";
status = "disabled";
};

clcd@31040000 {
compatible = "arm,pl110", "arm,primecell";
reg = <0x31040000 0x1000>;
interrupts = <0x0e 0>;
status = "disable";
status = "disabled";
};

mac: ethernet@31060000 {
Expand Down Expand Up @@ -261,14 +261,14 @@
compatible = "nxp,lpc3220-adc";
reg = <0x40048000 0x1000>;
interrupts = <0x27 0>;
status = "disable";
status = "disabled";
};

tsc@40048000 {
compatible = "nxp,lpc3220-tsc";
reg = <0x40048000 0x1000>;
interrupts = <0x27 0>;
status = "disable";
status = "disabled";
};

key@40050000 {
Expand Down

0 comments on commit 35bce5f

Please sign in to comment.