projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
qcom-ipq8064.dtsi
diff --git
a/arch/arm/boot/dts/qcom-ipq8064.dtsi
b/arch/arm/boot/dts/qcom-ipq8064.dtsi
index 9f727d8eadf6998561e748e0400e46299417f9b3..fa698635eea0d1f859d57c766c679438a416b55d 100644
(file)
--- a/
arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/
arch/arm/boot/dts/qcom-ipq8064.dtsi
@@
-197,7
+197,7
@@
syscon-tcsr = <&tcsr>;
- serial@16340000 {
+
gsbi4_serial:
serial@16340000 {
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
reg = <0x16340000 0x1000>,
<0x16300000 0x1000>;