UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: SPEAr: DT: Fix existing DT support 

This patch fixes existing DT support for all SPEAr SoC's. This includes:
- Removing few nodes from board files
- Updating DT data of few nodes
- Updating ranges of few busses
- Moving devices to correct parent bus

Signed-off-by: Bhavna Yadav <bhavna.yadav@st.com>
Signed-off-by: Deepak Sikri <deepak.sikri@st.com>
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: Vijay Kumar Mishra <vijay.kumar@st.com>
Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Vipul Kumar Samar 2012-07-05 11:51:47 +08:00 committed by Viresh Kumar
parent 482a8f3f53
commit f631b984ee
9 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/boot/dts/spear1310-evb.dts
View File

@ -192,10 +192,6 @@
};
};
spi0: spi@e0100000 {
status = "okay";
};
ehci@e4800000 {
status = "okay";
};
@ -233,10 +229,6 @@
status = "okay";
};
i2c1: i2c@5cd00000 {
status = "okay";
};
kbd@e0300000 {
linux,keymap = < 0x00000001
0x00010002
@ -321,6 +313,7 @@
0x08080052 >;
autorepeat;
st,mode = <0>;
suspended_rate = <2000000>;
status = "okay";
};
@ -332,6 +325,10 @@
status = "okay";
};
spi0: spi@e0100000 {
status = "okay";
};
wdt@ec800620 {
status = "okay";
};

14
arch/arm/boot/dts/spear1310.dtsi
View File

@ -88,13 +88,6 @@
#gpio-range-cells = <2>;
};
spi1: spi@5d400000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x5d400000 0x1000>;
interrupts = <0 99 0x4>;
status = "disabled";
};
apb {
i2c1: i2c@5cd00000 {
#address-cells = <1>;
@ -159,6 +152,13 @@
status = "disabled";
};
spi1: spi@5d400000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x5d400000 0x1000>;
interrupts = <0 99 0x4>;
status = "disabled";
};
serial@5c800000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x5c800000 0x1000>;

9
arch/arm/boot/dts/spear1340-evb.dts
View File

@ -200,10 +200,6 @@
};
};
spi0: spi@e0100000 {
status = "okay";
};
ehci@e4800000 {
status = "okay";
};
@ -329,6 +325,7 @@
0x08080052 >;
autorepeat;
st,mode = <0>;
suspended_rate = <2000000>;
status = "okay";
};
@ -344,6 +341,10 @@
status = "okay";
};
spi0: spi@e0100000 {
status = "okay";
};
wdt@ec800620 {
status = "okay";
};

1
arch/arm/boot/dts/spear1340.dtsi
View File

@ -58,6 +58,7 @@
compatible = "snps,designware-i2c";
reg = <0xb4000000 0x1000>;
interrupts = <0 104 0x4>;
write-16bit;
status = "disabled";
};

33
arch/arm/boot/dts/spear13xx.dtsi
View File

@ -70,6 +70,8 @@
compatible = "simple-bus";
ranges = <0x50000000 0x50000000 0x10000000
0xb0000000 0xb0000000 0x10000000
0xd0000000 0xd0000000 0x02000000
0xd8000000 0xd8000000 0x01000000
0xe0000000 0xe0000000 0x10000000>;
sdhci@b3000000 {
@ -81,7 +83,7 @@
cf@b2800000 {
compatible = "arasan,cf-spear1340";
reg = <0xb2800000 0x100>;
reg = <0xb2800000 0x1000>;
interrupts = <0 29 0x4>;
status = "disabled";
};
@ -113,6 +115,7 @@
0 23 0x4>;
st,ale-off = <0x20000>;
st,cle-off = <0x10000>;
st,mode = <2>;
status = "disabled";
};
@ -134,17 +137,11 @@
status = "disabled";
};
spi0: spi@e0100000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0xe0100000 0x1000>;
interrupts = <0 31 0x4>;
status = "disabled";
};
ehci@e4800000 {
compatible = "st,spear600-ehci", "usb-ehci";
reg = <0xe4800000 0x1000>;
interrupts = <0 64 0x4>;
usbh0_id = <0>;
status = "disabled";
};
@ -152,6 +149,7 @@
compatible = "st,spear600-ehci", "usb-ehci";
reg = <0xe5800000 0x1000>;
interrupts = <0 66 0x4>;
usbh1_id = <1>;
status = "disabled";
};
@ -159,6 +157,7 @@
compatible = "st,spear600-ohci", "usb-ohci";
reg = <0xe4000000 0x1000>;
interrupts = <0 65 0x4>;
usbh0_id = <0>;
status = "disabled";
};
@ -166,6 +165,7 @@
compatible = "st,spear600-ohci", "usb-ohci";
reg = <0xe5000000 0x1000>;
interrupts = <0 67 0x4>;
usbh1_id = <1>;
status = "disabled";
};
@ -175,6 +175,8 @@
compatible = "simple-bus";
ranges = <0x50000000 0x50000000 0x10000000
0xb0000000 0xb0000000 0x10000000
0xd0000000 0xd0000000 0x02000000
0xd8000000 0xd8000000 0x01000000
0xe0000000 0xe0000000 0x10000000>;
gpio0: gpio@e0600000 {
@ -215,8 +217,15 @@
status = "disabled";
};
spi0: spi@e0100000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0xe0100000 0x1000>;
interrupts = <0 31 0x4>;
status = "disabled";
};
rtc@e0580000 {
compatible = "st,spear-rtc";
compatible = "st,spear600-rtc";
reg = <0xe0580000 0x1000>;
interrupts = <0 36 0x4>;
status = "disabled";
@ -232,7 +241,7 @@
adc@e0080000 {
compatible = "st,spear600-adc";
reg = <0xe0080000 0x1000>;
interrupts = <0 44 0x4>;
interrupts = <0 12 0x4>;
status = "disabled";
};
@ -245,7 +254,8 @@
timer@ec800600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0xec800600 0x20>;
interrupts = <1 13 0x301>;
interrupts = <1 13 0x4>;
status = "disabled";
};
wdt@ec800620 {
@ -257,6 +267,7 @@
thermal@e07008c4 {
compatible = "st,thermal-spear1340";
reg = <0xe07008c4 0x4>;
thermal_flags = <0x7000>;
};
};
};

2
arch/arm/boot/dts/spear300.dtsi
View File

@ -27,7 +27,7 @@
};
clcd@60000000 {
compatible = "arm,clcd-pl110", "arm,primecell";
compatible = "arm,pl110", "arm,primecell";
reg = <0x60000000 0x1000>;
interrupts = <30>;
status = "disabled";

5
arch/arm/boot/dts/spear320-evb.dts
View File

@ -82,10 +82,6 @@
};
};
clcd@90000000 {
status = "okay";
};
dma@fc400000 {
status = "okay";
};
@ -99,6 +95,7 @@
};
sdhci@70000000 {
power-gpio = <&gpiopinctrl 61 1>;
status = "okay";
};

4
arch/arm/boot/dts/spear320.dtsi
View File

@ -28,7 +28,7 @@
};
clcd@90000000 {
compatible = "arm,clcd-pl110", "arm,primecell";
compatible = "arm,pl110", "arm,primecell";
reg = <0x90000000 0x1000>;
interrupts = <33>;
status = "disabled";
@ -69,7 +69,7 @@
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
ranges = <0xa0000000 0xa0000000 0x10000000
ranges = <0xa0000000 0xa0000000 0x20000000
0xd0000000 0xd0000000 0x30000000>;
i2c1: i2c@a7000000 {

2
arch/arm/boot/dts/spear3xx.dtsi
View File

@ -120,7 +120,7 @@
};
rtc@fc900000 {
compatible = "st,spear-rtc";
compatible = "st,spear600-rtc";
reg = <0xfc900000 0x1000>;
interrupts = <10>;
status = "disabled";