summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-10-24 11:10:05 +0100
committerLee Jones <lee.jones@linaro.org>2012-10-25 08:46:20 +0100
commit76ff4e434734f7772d1a592cc9fe1d9921a3ec40 (patch)
treec14a815ba34e18b53d9311fc37c48509de956fcf /arch/arm
parent35b33d230f7a621abf4d77b635d13061f08fd7a5 (diff)
downloadlinux-3.10-76ff4e434734f7772d1a592cc9fe1d9921a3ec40.tar.gz
linux-3.10-76ff4e434734f7772d1a592cc9fe1d9921a3ec40.tar.bz2
linux-3.10-76ff4e434734f7772d1a592cc9fe1d9921a3ec40.zip
ARM: ux500: Correct SDI5 address and add some format changes
Here we fix a simple copy and paste error and bring some node spaces back into line with the remainder of the tree. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/dbx5x0.dtsi7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 28dccd6578d..4b0e0ca08f4 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -583,33 +583,38 @@
interrupts = <0 60 0x4>;
status = "disabled";
};
+
sdi@80118000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80118000 0x1000>;
interrupts = <0 50 0x4>;
status = "disabled";
};
+
sdi@80005000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80005000 0x1000>;
interrupts = <0 41 0x4>;
status = "disabled";
};
+
sdi@80119000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80119000 0x1000>;
interrupts = <0 59 0x4>;
status = "disabled";
};
+
sdi@80114000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80114000 0x1000>;
interrupts = <0 99 0x4>;
status = "disabled";
};
+
sdi@80008000 {
compatible = "arm,pl18x", "arm,primecell";
- reg = <0x80114000 0x1000>;
+ reg = <0x80008000 0x1000>;
interrupts = <0 100 0x4>;
status = "disabled";
};