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 'docs-5.15' of git://git.lwn.net/linux
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
boot
/
dts
/
qcom
/
sdm845-oneplus-common.dtsi
diff --git
a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index
4d052e3
..
d435552
100644
(file)
--- a/
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@
-19,9
+19,14
@@
/ {
aliases {
/ {
aliases {
+ serial0 = &uart9;
hsuart0 = &uart6;
};
hsuart0 = &uart6;
};
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
gpio-keys {
compatible = "gpio-keys";
label = "Volume keys";
gpio-keys {
compatible = "gpio-keys";
label = "Volume keys";
@@
-69,7
+74,7
@@
};
rmtfs_upper_guard: memory@f5d01000 {
no-map;
};
rmtfs_upper_guard: memory@f5d01000 {
no-map;
- reg = <0 0xf5d01000 0 0x
2
000>;
+ reg = <0 0xf5d01000 0 0x
1
000>;
};
/*
};
/*
@@
-78,7
+83,7
@@
*/
removed_region: memory@88f00000 {
no-map;
*/
removed_region: memory@88f00000 {
no-map;
- reg = <0 0x88f00000 0 0x
2
00000>;
+ reg = <0 0x88f00000 0 0x
1c
00000>;
};
ramoops: ramoops@ac300000 {
};
ramoops: ramoops@ac300000 {
@@
-403,6
+408,7
@@
status = "okay";
memory-region = <&ipa_fw_mem>;
status = "okay";
memory-region = <&ipa_fw_mem>;
+ firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn";
};
&mdss {
};
&mdss {
@@
-526,6
+532,11
@@
};
};
};
};
+&uart9 {
+ label = "LS-UART1";
+ status = "okay";
+};
+
&ufs_mem_hc {
status = "okay";
&ufs_mem_hc {
status = "okay";