Skip to content

L
linux
Commit 464caefb authored by Kevin Hilman's avatar Kevin Hilman
Browse files
Options

Merge tag 'sirf-dts-for-3.14' of... 

Merge tag 'sirf-dts-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt

ARM: sirf: dts update for 3.14

From Barry Song:
some missed dt nodes or props for sirf dts for 3.14.
Among them:
 - add lost clocks for cphifbg
 - add lost bus_width, clock and status for sdhci
 - add clock, frequence-voltage table for CPU0
 - add lost minigpsrtc device node
 - add lost usp1_uart_nostreamctrl pin group for atlas6
 - add pin group for USP0 with only RX or TX frame sync

* tag 'sirf-dts-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
  ARM: dts: SiRF: add pin group for USP0 with only RX or TX frame sync
  ARM: dts: SiRF: add lost usp1_uart_nostreamctrl pin group for atlas6
  ARM: dts: sirf: add lost minigpsrtc device node
  ARM: dts: sirf: add clock, frequence-voltage table for CPU0
  ARM: dts: sirf: add lost bus_width, clock and status for sdhci
  ARM: dts: sirf: add lost clocks for cphifbg
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents c01c80d7 73f68c01
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 0 deletions
arch/arm/boot/dts/atlas6.dtsi
View file @ 464caefb
...@@ -27,6 +27,15 @@ cpu@0 { ...@@ -27,6 +27,15 @@ cpu@0 {
timebase-frequency = <0>; timebase-frequency = <0>;
bus-frequency = <0>; bus-frequency = <0>;
clock-frequency = <0>; clock-frequency = <0>;
clocks = <&clks 12>;
operating-points = <
/* kHz uV */
200000 1025000
400000 1025000
600000 1050000
800000 1100000
>;
clock-latency = <150000>;
}; };
}; };
...@@ -69,6 +78,7 @@ rsc-controller@88020000 { ...@@ -69,6 +78,7 @@ rsc-controller@88020000 {
cphifbg@88030000 { cphifbg@88030000 {
compatible = "sirf,prima2-cphifbg"; compatible = "sirf,prima2-cphifbg";
reg = <0x88030000 0x1000>; reg = <0x88030000 0x1000>;
clocks = <&clks 42>;
}; };
}; };
...@@ -546,6 +556,12 @@ usp1 { ...@@ -546,6 +556,12 @@ usp1 {
sirf,function = "usp1"; sirf,function = "usp1";
}; };
}; };
usp1_uart_nostreamctrl_pins_a: usp1@1 {
usp1 {
sirf,pins = "usp1_uart_nostreamctrl_grp";
sirf,function = "usp1_uart_nostreamctrl";
};
};
usb0_upli_drvbus_pins_a: usb0_upli_drvbus@0 { usb0_upli_drvbus_pins_a: usb0_upli_drvbus@0 {
usb0_upli_drvbus { usb0_upli_drvbus {
sirf,pins = "usb0_upli_drvbusgrp"; sirf,pins = "usb0_upli_drvbusgrp";
...@@ -636,6 +652,7 @@ sd1: sdhci@56100000 { ...@@ -636,6 +652,7 @@ sd1: sdhci@56100000 {
reg = <0x56100000 0x100000>; reg = <0x56100000 0x100000>;
interrupts = <38>; interrupts = <38>;
status = "disabled"; status = "disabled";
bus-width = <4>;
clocks = <&clks 36>; clocks = <&clks 36>;
}; };
...@@ -645,6 +662,7 @@ sd2: sdhci@56200000 { ...@@ -645,6 +662,7 @@ sd2: sdhci@56200000 {
reg = <0x56200000 0x100000>; reg = <0x56200000 0x100000>;
interrupts = <23>; interrupts = <23>;
status = "disabled"; status = "disabled";
bus-width = <4>;
clocks = <&clks 37>; clocks = <&clks 37>;
}; };
...@@ -654,6 +672,7 @@ sd3: sdhci@56300000 { ...@@ -654,6 +672,7 @@ sd3: sdhci@56300000 {
reg = <0x56300000 0x100000>; reg = <0x56300000 0x100000>;
interrupts = <23>; interrupts = <23>;
status = "disabled"; status = "disabled";
bus-width = <4>;
clocks = <&clks 37>; clocks = <&clks 37>;
}; };
...@@ -663,6 +682,7 @@ sd5: sdhci@56500000 { ...@@ -663,6 +682,7 @@ sd5: sdhci@56500000 {
reg = <0x56500000 0x100000>; reg = <0x56500000 0x100000>;
interrupts = <39>; interrupts = <39>;
status = "disabled"; status = "disabled";
bus-width = <4>;
clocks = <&clks 38>; clocks = <&clks 38>;
}; };
...@@ -697,6 +717,12 @@ sysrtc@2000 { ...@@ -697,6 +717,12 @@ sysrtc@2000 {
interrupts = <52 53 54>; interrupts = <52 53 54>;
}; };
minigpsrtc@2000 {
compatible = "sirf,prima2-minigpsrtc";
reg = <0x2000 0x1000>;
interrupts = <54>;
};
pwrc@3000 { pwrc@3000 {
compatible = "sirf,prima2-pwrc"; compatible = "sirf,prima2-pwrc";
reg = <0x3000 0x1000>; reg = <0x3000 0x1000>;
......
arch/arm/boot/dts/prima2.dtsi
View file @ 464caefb
...@@ -29,6 +29,15 @@ cpu@0 { ...@@ -29,6 +29,15 @@ cpu@0 {
timebase-frequency = <0>; timebase-frequency = <0>;
bus-frequency = <0>; bus-frequency = <0>;
clock-frequency = <0>; clock-frequency = <0>;
clocks = <&clks 12>;
operating-points = <
/* kHz uV */
200000 1025000
400000 1025000
664000 1050000
800000 1100000
>;
clock-latency = <150000>;
}; };
}; };
...@@ -80,6 +89,7 @@ rsc-controller@88020000 { ...@@ -80,6 +89,7 @@ rsc-controller@88020000 {
cphifbg@88030000 { cphifbg@88030000 {
compatible = "sirf,prima2-cphifbg"; compatible = "sirf,prima2-cphifbg";
reg = <0x88030000 0x1000>; reg = <0x88030000 0x1000>;
clocks = <&clks 42>;
}; };
}; };
...@@ -540,6 +550,18 @@ usp0 { ...@@ -540,6 +550,18 @@ usp0 {
"usp0_uart_nostreamctrl"; "usp0_uart_nostreamctrl";
}; };
}; };
usp0_only_utfs_pins_a: usp0@2 {
usp0 {
sirf,pins = "usp0_only_utfs_grp";
sirf,function = "usp0_only_utfs";
};
};
usp0_only_urfs_pins_a: usp0@3 {
usp0 {
sirf,pins = "usp0_only_urfs_grp";
sirf,function = "usp0_only_urfs";
};
};
usp1_pins_a: usp1@0 { usp1_pins_a: usp1@0 {
usp1 { usp1 {
sirf,pins = "usp1grp"; sirf,pins = "usp1grp";
...@@ -648,6 +670,9 @@ sd0: sdhci@56000000 { ...@@ -648,6 +670,9 @@ sd0: sdhci@56000000 {
compatible = "sirf,prima2-sdhc"; compatible = "sirf,prima2-sdhc";
reg = <0x56000000 0x100000>; reg = <0x56000000 0x100000>;
interrupts = <38>; interrupts = <38>;
status = "disabled";
bus-width = <8>;
clocks = <&clks 36>;
}; };
sd1: sdhci@56100000 { sd1: sdhci@56100000 {
...@@ -655,6 +680,9 @@ sd1: sdhci@56100000 { ...@@ -655,6 +680,9 @@ sd1: sdhci@56100000 {
compatible = "sirf,prima2-sdhc"; compatible = "sirf,prima2-sdhc";
reg = <0x56100000 0x100000>; reg = <0x56100000 0x100000>;
interrupts = <38>; interrupts = <38>;
status = "disabled";
bus-width = <4>;
clocks = <&clks 36>;
}; };
sd2: sdhci@56200000 { sd2: sdhci@56200000 {
...@@ -662,6 +690,8 @@ sd2: sdhci@56200000 { ...@@ -662,6 +690,8 @@ sd2: sdhci@56200000 {
compatible = "sirf,prima2-sdhc"; compatible = "sirf,prima2-sdhc";
reg = <0x56200000 0x100000>; reg = <0x56200000 0x100000>;
interrupts = <23>; interrupts = <23>;
status = "disabled";
clocks = <&clks 37>;
}; };
sd3: sdhci@56300000 { sd3: sdhci@56300000 {
...@@ -669,6 +699,8 @@ sd3: sdhci@56300000 { ...@@ -669,6 +699,8 @@ sd3: sdhci@56300000 {
compatible = "sirf,prima2-sdhc"; compatible = "sirf,prima2-sdhc";
reg = <0x56300000 0x100000>; reg = <0x56300000 0x100000>;
interrupts = <23>; interrupts = <23>;
status = "disabled";
clocks = <&clks 37>;
}; };
sd4: sdhci@56400000 { sd4: sdhci@56400000 {
...@@ -676,6 +708,8 @@ sd4: sdhci@56400000 { ...@@ -676,6 +708,8 @@ sd4: sdhci@56400000 {
compatible = "sirf,prima2-sdhc"; compatible = "sirf,prima2-sdhc";
reg = <0x56400000 0x100000>; reg = <0x56400000 0x100000>;
interrupts = <39>; interrupts = <39>;
status = "disabled";
clocks = <&clks 38>;
}; };
sd5: sdhci@56500000 { sd5: sdhci@56500000 {
...@@ -683,6 +717,7 @@ sd5: sdhci@56500000 { ...@@ -683,6 +717,7 @@ sd5: sdhci@56500000 {
compatible = "sirf,prima2-sdhc"; compatible = "sirf,prima2-sdhc";
reg = <0x56500000 0x100000>; reg = <0x56500000 0x100000>;
interrupts = <39>; interrupts = <39>;
clocks = <&clks 38>;
}; };
pci-copy@57900000 { pci-copy@57900000 {
...@@ -716,6 +751,12 @@ sysrtc@2000 { ...@@ -716,6 +751,12 @@ sysrtc@2000 {
interrupts = <52 53 54>; interrupts = <52 53 54>;
}; };
minigpsrtc@2000 {
compatible = "sirf,prima2-minigpsrtc";
reg = <0x2000 0x1000>;
interrupts = <54>;
};
pwrc@3000 { pwrc@3000 {
compatible = "sirf,prima2-pwrc"; compatible = "sirf,prima2-pwrc";
reg = <0x3000 0x1000>; reg = <0x3000 0x1000>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7