Skip to content

Commit 5776451

Browse files
olofjolofj
committed
Merge tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into fixes
Merge "qcom DT changes for v3.18-3" from Kumar Gala: Qualcomm ARM Based Device Tree Updates for v3.18-3 * Added Board support for CM-QS600 and Sony Xperia Z1 phone * Added SATA support on IPQ8064/AP148 * tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: ARM: dts: qcom: add CM-QS600 board ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone ARM: dts: qcom: Add SATA support on IPQ8064/AP148
2 parents e29c648 + 7dac24b commit 5776451

File tree

6 files changed

+121
-1
lines changed

6 files changed

+121
-1
lines changed

‎Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ sitronix Sitronix Technology Corporation
140140
smsc Standard Microsystems Corporation
141141
snps Synopsys, Inc.
142142
solidrun SolidRun
143+
sony Sony Corporation
143144
spansion Spansion Inc.
144145
st STMicroelectronics
145146
ste ST-Ericsson

‎arch/arm/boot/dts/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,15 @@ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
354354
orion5x-rd88f5182-nas.dtb
355355
dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
356356
dtb-$(CONFIG_ARCH_QCOM) += \
357+
qcom-apq8064-cm-qs600.dtb \
357358
qcom-apq8064-ifc6410.dtb \
358359
qcom-apq8074-dragonboard.dtb \
359360
qcom-apq8084-ifc6540.dtb \
360361
qcom-apq8084-mtp.dtb \
361362
qcom-ipq8064-ap148.dtb \
362363
qcom-msm8660-surf.dtb \
363-
qcom-msm8960-cdp.dtb
364+
qcom-msm8960-cdp.dtb \
365+
qcom-msm8974-sony-xperia-honami.dtb
364366
dtb-$(CONFIG_ARCH_ROCKCHIP) += \
365367
rk3066a-bqcurie2.dtb \
366368
rk3188-radxarock.dtb \

‎arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#include "qcom-apq8064-v2.0.dtsi"
2+
3+
/ {
4+
model = "CompuLab CM-QS600";
5+
compatible = "qcom,apq8064-cm-qs600", "qcom,apq8064";
6+
7+
soc {
8+
pinctrl@800000 {
9+
i2c1_pins: i2c1 {
10+
mux {
11+
pins = "gpio20", "gpio21";
12+
function = "gsbi1";
13+
};
14+
};
15+
};
16+
17+
gsbi@12440000 {
18+
status = "okay";
19+
qcom,mode = <GSBI_PROT_I2C>;
20+
21+
i2c@12460000 {
22+
status = "okay";
23+
clock-frequency = <200000>;
24+
pinctrl-0 = <&i2c1_pins>;
25+
pinctrl-names = "default";
26+
27+
eeprom: eeprom@50 {
28+
compatible = "24c02";
29+
reg = <0x50>;
30+
pagesize = <32>;
31+
};
32+
};
33+
};
34+
35+
gsbi@16600000 {
36+
status = "ok";
37+
qcom,mode = <GSBI_PROT_I2C_UART>;
38+
serial@16640000 {
39+
status = "ok";
40+
};
41+
};
42+
43+
amba {
44+
/* eMMC */
45+
sdcc1: sdcc@12400000 {
46+
status = "okay";
47+
};
48+
49+
/* External micro SD card */
50+
sdcc3: sdcc@12180000 {
51+
status = "okay";
52+
};
53+
/* WLAN */
54+
sdcc4: sdcc@121c0000 {
55+
status = "okay";
56+
};
57+
};
58+
};
59+
};

‎arch/arm/boot/dts/qcom-ipq8064-ap148.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,13 @@
8181
};
8282
};
8383
};
84+
85+
sata-phy@1b400000 {
86+
status = "ok";
87+
};
88+
89+
sata@29000000 {
90+
status = "ok";
91+
};
8492
};
8593
};

‎arch/arm/boot/dts/qcom-ipq8064.dtsi

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,39 @@
234234
};
235235
};
236236

237+
sata_phy: sata-phy@1b400000 {
238+
compatible = "qcom,ipq806x-sata-phy";
239+
reg = <0x1b400000 0x200>;
240+
241+
clocks = <&gcc SATA_PHY_CFG_CLK>;
242+
clock-names = "cfg";
243+
244+
#phy-cells = <0>;
245+
status = "disabled";
246+
};
247+
248+
sata@29000000 {
249+
compatible = "qcom,ipq806x-ahci", "generic-ahci";
250+
reg = <0x29000000 0x180>;
251+
252+
interrupts = <0 209 0x0>;
253+
254+
clocks = <&gcc SFAB_SATA_S_H_CLK>,
255+
<&gcc SATA_H_CLK>,
256+
<&gcc SATA_A_CLK>,
257+
<&gcc SATA_RXOOB_CLK>,
258+
<&gcc SATA_PMALIVE_CLK>;
259+
clock-names = "slave_face", "iface", "core",
260+
"rxoob", "pmalive";
261+
262+
assigned-clocks = <&gcc SATA_RXOOB_CLK>, <&gcc SATA_PMALIVE_CLK>;
263+
assigned-clock-rates = <100000000>, <100000000>;
264+
265+
phys = <&sata_phy>;
266+
phy-names = "sata-phy";
267+
status = "disabled";
268+
};
269+
237270
qcom,ssbi@500000 {
238271
compatible = "qcom,ssbi";
239272
reg = <0x00500000 0x1000>;

‎arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#include "qcom-msm8974.dtsi"
2+
3+
/ {
4+
model = "Sony Xperia Z1";
5+
compatible = "sony,xperia-honami", "qcom,msm8974";
6+
7+
memory@0 {
8+
reg = <0 0x40000000>, <0x40000000 0x40000000>;
9+
device_type = "memory";
10+
};
11+
};
12+
13+
&soc {
14+
serial@f991e000 {
15+
status = "ok";
16+
};
17+
};

0 commit comments

Comments
 (0)