From 7bf276014dd1da10fab96629d0d27972ef25eaa9 Mon Sep 17 00:00:00 2001 From: hyx Date: Mon, 9 Jun 2025 20:52:47 +0800 Subject: [PATCH] change ttyFIQ to uart2 upto v1.1.7 --- .../boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi | 6 ++-- .../arm64/boot/dts/rockchip/rk3326-linux.dtsi | 34 +++++++++++++------ .../arch/arm64/configs/px30_linux_defconfig | 10 +++--- kernel/arch/arm64/configs/rockchip_defconfig | 7 +--- .../arm64/configs/rockchip_linux_defconfig | 7 +--- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi index 29a8c031c..2135fc438 100644 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -787,13 +787,13 @@ &uart1 { pinctrl-0 = <&uart1_xfer>; status = "okay"; }; -/* + &uart2 { pinctrl-names = "default"; - pinctrl-0 = <&uart2_xfer>; + pinctrl-0 = <&uart2m0_xfer>; status = "okay"; }; -*/ + &uart5 { pinctrl-names = "default"; pinctrl-0 = <&uart5_xfer>; diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi index f3ed899ab..ae783649a 100644 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi @@ -14,22 +14,34 @@ aliases { }; chosen { - bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootwait"; + //bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootwait"; + bootargs = "root=PARTUUID=614e0000-0000 rootwait"; }; + //fiq-debugger { + // compatible = "rockchip,fiq-debugger"; + // rockchip,serial-id = <2>; + // rockchip,wake-irq = <0>; + // /* If enable uart uses irq instead of fiq */ + // rockchip,irq-mode-enable = <1>; + // rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */ + // interrupts = ; + // pinctrl-names = "default"; + // pinctrl-0 = <&uart2m0_xfer>; + // status = "okay"; + //}; + fiq-debugger { - compatible = "rockchip,fiq-debugger"; - rockchip,serial-id = <2>; - rockchip,wake-irq = <0>; + rockchip,serial-id = <0xffffffff>; + //rockchip,wake-irq = <0>; /* If enable uart uses irq instead of fiq */ - rockchip,irq-mode-enable = <1>; - rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */ - interrupts = ; - pinctrl-names = "default"; - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; + //rockchip,irq-mode-enable = <1>; + //rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */ + //interrupts = ; + //pinctrl-names = "default"; + //pinctrl-0 = <&uart2m0_xfer>; + status = "disabled"; }; - reserved-memory { #address-cells = <2>; #size-cells = <2>; diff --git a/kernel/arch/arm64/configs/px30_linux_defconfig b/kernel/arch/arm64/configs/px30_linux_defconfig index d35d5b558..ff3040ca8 100644 --- a/kernel/arch/arm64/configs/px30_linux_defconfig +++ b/kernel/arch/arm64/configs/px30_linux_defconfig @@ -176,7 +176,7 @@ CONFIG_INPUT_RK805_PWRKEY=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y +#CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_RUNTIME_UARTS=6 CONFIG_SERIAL_8250_DW=y @@ -340,10 +340,10 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y CONFIG_ROCKCHIP_SUSPEND_MODE=y CONFIG_ROCKCHIP_SYSTEM_MONITOR=y -CONFIG_FIQ_DEBUGGER=y -CONFIG_FIQ_DEBUGGER_NO_SLEEP=y -CONFIG_FIQ_DEBUGGER_CONSOLE=y -CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y +#CONFIG_FIQ_DEBUGGER=y +#CONFIG_FIQ_DEBUGGER_NO_SLEEP=y +#CONFIG_FIQ_DEBUGGER_CONSOLE=y +#CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y CONFIG_PM_DEVFREQ=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y diff --git a/kernel/arch/arm64/configs/rockchip_defconfig b/kernel/arch/arm64/configs/rockchip_defconfig index 3ca30ba99..557bd63b4 100644 --- a/kernel/arch/arm64/configs/rockchip_defconfig +++ b/kernel/arch/arm64/configs/rockchip_defconfig @@ -511,7 +511,7 @@ CONFIG_INPUT_RK805_PWRKEY=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_CONSOLE=y +#CONFIG_SERIAL_8250_CONSOLE=y # CONFIG_SERIAL_8250_PCI is not set CONFIG_SERIAL_8250_NR_UARTS=10 CONFIG_SERIAL_8250_RUNTIME_UARTS=10 @@ -924,11 +924,6 @@ CONFIG_ROCKCHIP_SYSTEM_MONITOR=y CONFIG_ROCKCHIP_VENDOR_STORAGE=y CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y -CONFIG_FIQ_DEBUGGER=y -CONFIG_FIQ_DEBUGGER_NO_SLEEP=y -CONFIG_FIQ_DEBUGGER_CONSOLE=y -CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y -CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y CONFIG_RK_CONSOLE_THREAD=y CONFIG_ROCKCHIP_DEBUG=y CONFIG_ROCKCHIP_MINIDUMP=y diff --git a/kernel/arch/arm64/configs/rockchip_linux_defconfig b/kernel/arch/arm64/configs/rockchip_linux_defconfig index 68c1910b5..a86edcec4 100644 --- a/kernel/arch/arm64/configs/rockchip_linux_defconfig +++ b/kernel/arch/arm64/configs/rockchip_linux_defconfig @@ -241,7 +241,7 @@ CONFIG_INPUT_RK805_PWRKEY=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y +#CONFIG_SERIAL_8250_CONSOLE=y # CONFIG_SERIAL_8250_PCI is not set CONFIG_SERIAL_8250_NR_UARTS=10 CONFIG_SERIAL_8250_RUNTIME_UARTS=10 @@ -539,11 +539,6 @@ CONFIG_ROCKCHIP_SYSTEM_MONITOR=y CONFIG_ROCKCHIP_VENDOR_STORAGE=y CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y -CONFIG_FIQ_DEBUGGER=y -CONFIG_FIQ_DEBUGGER_NO_SLEEP=y -CONFIG_FIQ_DEBUGGER_CONSOLE=y -CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y -CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y CONFIG_RK_CONSOLE_THREAD=y CONFIG_ROCKCHIP_DEBUG=y CONFIG_PM_DEVFREQ=y