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 tag 'arc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
boot
/
dts
/
qcom
/
sdm630-sony-xperia-ganges-kirin.dts
diff --git
a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
index
46a7f2b
..
a4e1fb8
100644
(file)
--- a/
arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
+++ b/
arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
@@
-5,9
+5,21
@@
/dts-v1/;
/dts-v1/;
-#include "sdm630-sony-xperia-ganges.dtsi"
+#include "sdm630.dtsi"
+#include "sdm630-sony-xperia-nile.dtsi"
/ {
model = "Sony Xperia 10";
compatible = "sony,kirin-row", "qcom,sdm630";
/ {
model = "Sony Xperia 10";
compatible = "sony,kirin-row", "qcom,sdm630";
+
+ chosen {
+ framebuffer@9d400000 {
+ reg = <0 0x9d400000 0 (2520 * 1080 * 4)>;
+ height = <2520>;
+ };
+ };
};
};
+
+/* Ganges devices feature a Novatek touchscreen instead. */
+/delete-node/ &touchscreen;
+/delete-node/ &vreg_l18a_1v8;