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 8f617f7..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 {
+               serial0 = &uart9;
                hsuart0 = &uart6;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        gpio-keys {
                compatible = "gpio-keys";
                label = "Volume keys";
@@ -46,6 +51,14 @@
        };
 
        reserved-memory {
+               /* The rmtfs_mem needs to be guarded due to "XPU limitations"
+                * it is otherwise possible for an allocation adjacent to the
+                * rmtfs_mem region to trigger an XPU violation, causing a crash.
+                */
+               rmtfs_lower_guard: memory@f5b00000 {
+                       no-map;
+                       reg = <0 0xf5b00000 0 0x1000>;
+               };
                /*
                 * The rmtfs memory region in downstream is 'dynamically allocated'
                 * but given the same address every time. Hard code it as this address is
@@ -59,6 +72,10 @@
                        qcom,client-id = <1>;
                        qcom,vmid = <15>;
                };
+               rmtfs_upper_guard: memory@f5d01000 {
+                       no-map;
+                       reg = <0 0xf5d01000 0 0x1000>;
+               };
 
                /*
                 * It seems like reserving the old rmtfs_mem region is also needed to prevent
@@ -66,7 +83,7 @@
                 */
                removed_region: memory@88f00000 {
                        no-map;
-                       reg = <0 0x88f00000 0 0x200000>;
+                       reg = <0 0x88f00000 0 0x1c00000>;
                };
 
                ramoops: ramoops@ac300000 {
@@ -387,6 +404,13 @@
        };
 };
 
+&ipa {
+       status = "okay";
+
+       memory-region = <&ipa_fw_mem>;
+       firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn";
+};
+
 &mdss {
        status = "okay";
 };
@@ -508,6 +532,11 @@
        };
 };
 
+&uart9 {
+       label = "LS-UART1";
+       status = "okay";
+};
+
 &ufs_mem_hc {
        status = "okay";