From 4082b0db86750ec9d8b280b68ffef2143b2b49b8 Mon Sep 17 00:00:00 2001 From: Wasim Nazir Date: Wed, 13 Nov 2024 17:45:41 +0530 Subject: [PATCH] ARM: dts: msm: Update stdout-path with serial0 alias Use alias to reduce dev mistake of not using proper path for serial console. Change-Id: Ie588cc39b8f9e167b323abb9901114b547c278fc Signed-off-by: Wasim Nazir Signed-off-by: Mukesh Ojha --- qcom/kera.dtsi | 40 ++++++++++++++++++++-------------------- qcom/sun.dtsi | 11 +++++------ qcom/tuna.dtsi | 40 ++++++++++++++++++++-------------------- 3 files changed, 45 insertions(+), 46 deletions(-) diff --git a/qcom/kera.dtsi b/qcom/kera.dtsi index 06d8bbc1..e92e5093 100644 --- a/qcom/kera.dtsi +++ b/qcom/kera.dtsi @@ -34,26 +34,6 @@ reg = <0 0 0 0>; }; - chosen: chosen { - bootargs = "log_buf_len=512K loglevel=6 cpufreq.default_governor=performance sysctl.kernel.sched_pelt_multiplier=4 no-steal-acc kpti=0 swiotlb=0 loop.max_part=7 irqaffinity=0-2 printk.console_no_auto_verbose=1 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kernel.panic_on_rcu_stall=1 disable_dma32=on cgroup_disable=pressure fw_devlink.strict=1 can.stats_timer=0 ftrace_dump_on_oops page_poison=on cgroup.memory=nokmem,nosocket"; - stdout-path = "/soc/qcom,qupv3_1_geni_se@8c0000/qcom,qup_uart@894000:115200n8"; - }; - - reserved_memory: reserved-memory {}; - - ddr-regions { }; - - mem-offline { - compatible = "qcom,mem-offline"; - offline-sizes = <0x2 0xc0000000 0x1 0x0>; - granule = <512>; - qcom,qmp = <&aoss_qmp>; - }; - - firmware: firmware { - qcom_scm: qcom_scm { }; - }; - aliases: aliases { serial0 = &qupv3_se13_2uart; ufshc1 = &ufshc_mem; /* Embedded UFS Slot */ @@ -87,6 +67,26 @@ spi15 = &qupv3_se15_spi; }; + chosen: chosen { + bootargs = "log_buf_len=512K loglevel=6 cpufreq.default_governor=performance sysctl.kernel.sched_pelt_multiplier=4 no-steal-acc kpti=0 swiotlb=0 loop.max_part=7 irqaffinity=0-2 printk.console_no_auto_verbose=1 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kernel.panic_on_rcu_stall=1 disable_dma32=on cgroup_disable=pressure fw_devlink.strict=1 can.stats_timer=0 ftrace_dump_on_oops"; + stdout-path = "serial0:115200n8"; + }; + + reserved_memory: reserved-memory {}; + + ddr-regions { }; + + mem-offline { + compatible = "qcom,mem-offline"; + offline-sizes = <0x2 0xc0000000 0x1 0x0>; + granule = <512>; + qcom,qmp = <&aoss_qmp>; + }; + + firmware: firmware { + qcom_scm: qcom_scm { }; + }; + cpus { #address-cells = <2>; #size-cells = <0>; diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi index 63894df7..c8885373 100644 --- a/qcom/sun.dtsi +++ b/qcom/sun.dtsi @@ -33,12 +33,6 @@ #size-cells = <2>; memory { device_type = "memory"; reg = <0 0 0 0>; }; - - chosen: chosen { - bootargs = "log_buf_len=512K loglevel=6 cpufreq.default_governor=performance sysctl.kernel.sched_pelt_multiplier=4 no-steal-acc kpti=0 swiotlb=0 loop.max_part=7 irqaffinity=0-1 pcie_ports=compat printk.console_no_auto_verbose=1 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kernel.panic_on_rcu_stall=1 disable_dma32=on cgroup_disable=pressure fw_devlink.strict=1 can.stats_timer=0 pci-msm-drv.pcie_sm_regs=0x1D07000,0x1040,0x1048,0x3000,0x1 ftrace_dump_on_oops slub_debug=-"; - stdout-path = "/soc/qcom,qupv3_1_geni_se@ac0000/qcom,qup_uart@a9c000:115200n8"; - }; - aliases: aliases { serial0 = &qupv3_se7_2uart; hsuart0 = &qupv3_se14_4uart; @@ -46,6 +40,11 @@ mmc1 = &sdhc_2; /* SDC2 SD card slot */ }; + chosen: chosen { + bootargs = "log_buf_len=512K loglevel=6 cpufreq.default_governor=performance sysctl.kernel.sched_pelt_multiplier=4 no-steal-acc kpti=0 swiotlb=0 loop.max_part=7 irqaffinity=0-1 pcie_ports=compat printk.console_no_auto_verbose=1 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kernel.panic_on_rcu_stall=1 disable_dma32=on cgroup_disable=pressure fw_devlink.strict=1 can.stats_timer=0 pci-msm-drv.pcie_sm_regs=0x1D07000,0x1040,0x1048,0x3000,0x1 ftrace_dump_on_oops slub_debug=-"; + stdout-path = "serial0:115200n8"; + }; + firmware: firmware { qcom_scm: qcom_scm { }; }; diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi index 981db753..6a7f8074 100644 --- a/qcom/tuna.dtsi +++ b/qcom/tuna.dtsi @@ -37,26 +37,6 @@ reg = <0 0 0 0>; }; - chosen: chosen { - bootargs = "log_buf_len=512K loglevel=6 cpufreq.default_governor=performance sysctl.kernel.sched_pelt_multiplier=4 no-steal-acc kpti=0 swiotlb=0 loop.max_part=7 pcie_ports=compat irqaffinity=0-1 printk.console_no_auto_verbose=1 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kernel.panic_on_rcu_stall=1 disable_dma32=on cgroup_disable=pressure fw_devlink.strict=1 can.stats_timer=0 ftrace_dump_on_oops cpufreq.default_governor=performance page_poison=on cgroup.memory=nokmem,nosocket"; - stdout-path = "/soc/qcom,qupv3_1_geni_se@ac0000/qcom,qup_uart@a9c000:115200n8"; - }; - - reserved_memory: reserved-memory {}; - - ddr-regions { }; - - mem-offline { - compatible = "qcom,mem-offline"; - offline-sizes = <0x2 0xc0000000 0x1 0x0>; - granule = <512>; - qcom,qmp = <&aoss_qmp>; - }; - - firmware: firmware { - qcom_scm: qcom_scm {}; - }; - aliases: aliases { serial0 = &qupv3_se7_2uart; ufshc1 = &ufshc_mem; /* Embedded UFS Slot */ @@ -90,6 +70,26 @@ spi15 = &qupv3_se15_spi; }; + chosen: chosen { + bootargs = "log_buf_len=512K loglevel=6 cpufreq.default_governor=performance sysctl.kernel.sched_pelt_multiplier=4 no-steal-acc kpti=0 swiotlb=0 loop.max_part=7 pcie_ports=compat irqaffinity=0-1 printk.console_no_auto_verbose=1 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kernel.panic_on_rcu_stall=1 disable_dma32=on cgroup_disable=pressure fw_devlink.strict=1 can.stats_timer=0 ftrace_dump_on_oops cpufreq.default_governor=performance page_poison=on cgroup.memory=nokmem,nosocket"; + stdout-path = "serial0:115200n8"; + }; + + reserved_memory: reserved-memory {}; + + ddr-regions { }; + + mem-offline { + compatible = "qcom,mem-offline"; + offline-sizes = <0x2 0xc0000000 0x1 0x0>; + granule = <512>; + qcom,qmp = <&aoss_qmp>; + }; + + firmware: firmware { + qcom_scm: qcom_scm {}; + }; + cpus { #address-cells = <2>; #size-cells = <0>;