projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
qcom-apq8064.dtsi
diff --git
a/arch/arm/boot/dts/qcom-apq8064.dtsi
b/arch/arm/boot/dts/qcom-apq8064.dtsi
index
2687c4e
..
0b2bed6
100644
(file)
--- a/
arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/
arch/arm/boot/dts/qcom-apq8064.dtsi
@@
-766,40
+766,40
@@
#size-cells = <0>;
#io-channel-cells = <2>;
#size-cells = <0>;
#io-channel-cells = <2>;
- vcoin: adc-channel@0
0
{
+ vcoin: adc-channel@0 {
reg = <0x00 0x00>;
};
reg = <0x00 0x00>;
};
- vbat: adc-channel@
0
1 {
+ vbat: adc-channel@1 {
reg = <0x00 0x01>;
};
reg = <0x00 0x01>;
};
- dcin: adc-channel@
0
2 {
+ dcin: adc-channel@2 {
reg = <0x00 0x02>;
};
reg = <0x00 0x02>;
};
- vph_pwr: adc-channel@
0
4 {
+ vph_pwr: adc-channel@4 {
reg = <0x00 0x04>;
};
reg = <0x00 0x04>;
};
- batt_therm: adc-channel@
0
8 {
+ batt_therm: adc-channel@8 {
reg = <0x00 0x08>;
};
reg = <0x00 0x08>;
};
- batt_id: adc-channel@
0
9 {
+ batt_id: adc-channel@9 {
reg = <0x00 0x09>;
};
reg = <0x00 0x09>;
};
- usb_vbus: adc-channel@
0
a {
+ usb_vbus: adc-channel@a {
reg = <0x00 0x0a>;
};
reg = <0x00 0x0a>;
};
- die_temp: adc-channel@
0
b {
+ die_temp: adc-channel@b {
reg = <0x00 0x0b>;
};
reg = <0x00 0x0b>;
};
- ref_625mv: adc-channel@
0
c {
+ ref_625mv: adc-channel@c {
reg = <0x00 0x0c>;
};
reg = <0x00 0x0c>;
};
- ref_1250mv: adc-channel@
0
d {
+ ref_1250mv: adc-channel@d {
reg = <0x00 0x0d>;
};
reg = <0x00 0x0d>;
};
- chg_temp: adc-channel@
0
e {
+ chg_temp: adc-channel@e {
reg = <0x00 0x0e>;
};
reg = <0x00 0x0e>;
};
- ref_muxoff: adc-channel@
0
f {
+ ref_muxoff: adc-channel@f {
reg = <0x00 0x0f>;
};
};
reg = <0x00 0x0f>;
};
};
@@
-1262,9
+1262,9
@@
<&mmcc DSI1_BYTE_CLK>,
<&mmcc DSI_PIXEL_CLK>,
<&mmcc DSI1_ESC_CLK>;
<&mmcc DSI1_BYTE_CLK>,
<&mmcc DSI_PIXEL_CLK>,
<&mmcc DSI1_ESC_CLK>;
- clock-names = "iface
_clk", "bus_clk", "core_mmss_clk
",
- "src
_clk", "byte_clk", "pixel_clk
",
- "core
_clk
";
+ clock-names = "iface
", "bus", "core_mmss
",
+ "src
", "byte", "pixel
",
+ "core";
assigned-clocks = <&mmcc DSI1_BYTE_SRC>,
<&mmcc DSI1_ESC_SRC>,
assigned-clocks = <&mmcc DSI1_BYTE_SRC>,
<&mmcc DSI1_ESC_SRC>,