Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[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 eb6b1d1..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";


@@ -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";