tz/linuxOS_AP06
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change ttyFIQ to uart2 upto v1.1.7

Browse Source
This commit is contained in:
hyx 2025-06-09 20:52:47 +08:00
parent 52809c4ad0
commit 7bf276014d
5 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
View File

@ -787,13 +787,13 @@ &uart1 {
pinctrl-0 = <&uart1_xfer>; pinctrl-0 = <&uart1_xfer>;
status = "okay"; status = "okay";
}; };
/*
&uart2 { &uart2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart2_xfer>; pinctrl-0 = <&uart2m0_xfer>;
status = "okay"; status = "okay";
}; };
*/
&uart5 { &uart5 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart5_xfer>; pinctrl-0 = <&uart5_xfer>;

34
kernel/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi
View File

@ -14,22 +14,34 @@ aliases {
}; };
chosen { 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 = <GIC_SPI 127 IRQ_TYPE_LEVEL_LOW>;
// pinctrl-names = "default";
// pinctrl-0 = <&uart2m0_xfer>;
// status = "okay";
//};
fiq-debugger { fiq-debugger {
compatible = "rockchip,fiq-debugger"; rockchip,serial-id = <0xffffffff>;
rockchip,serial-id = <2>; //rockchip,wake-irq = <0>;
rockchip,wake-irq = <0>;
/* If enable uart uses irq instead of fiq */ /* If enable uart uses irq instead of fiq */
rockchip,irq-mode-enable = <1>; //rockchip,irq-mode-enable = <1>;
rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */ //rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */
interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_LOW>; //interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default"; //pinctrl-names = "default";
pinctrl-0 = <&uart2m0_xfer>; //pinctrl-0 = <&uart2m0_xfer>;
status = "okay"; status = "disabled";
}; };
reserved-memory { reserved-memory {
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;

10
kernel/arch/arm64/configs/px30_linux_defconfig
View File

@ -176,7 +176,7 @@ CONFIG_INPUT_RK805_PWRKEY=y
CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y #CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_NR_UARTS=6
CONFIG_SERIAL_8250_RUNTIME_UARTS=6 CONFIG_SERIAL_8250_RUNTIME_UARTS=6
CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_DW=y
@ -340,10 +340,10 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y
CONFIG_ROCKCHIP_PVTM=y CONFIG_ROCKCHIP_PVTM=y
CONFIG_ROCKCHIP_SUSPEND_MODE=y CONFIG_ROCKCHIP_SUSPEND_MODE=y
CONFIG_ROCKCHIP_SYSTEM_MONITOR=y CONFIG_ROCKCHIP_SYSTEM_MONITOR=y
CONFIG_FIQ_DEBUGGER=y #CONFIG_FIQ_DEBUGGER=y
CONFIG_FIQ_DEBUGGER_NO_SLEEP=y #CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
CONFIG_FIQ_DEBUGGER_CONSOLE=y #CONFIG_FIQ_DEBUGGER_CONSOLE=y
CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y #CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
CONFIG_PM_DEVFREQ=y CONFIG_PM_DEVFREQ=y
CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y
CONFIG_DEVFREQ_GOV_POWERSAVE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y

7
kernel/arch/arm64/configs/rockchip_defconfig
View File

@ -511,7 +511,7 @@ CONFIG_INPUT_RK805_PWRKEY=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set # 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_PCI is not set
CONFIG_SERIAL_8250_NR_UARTS=10 CONFIG_SERIAL_8250_NR_UARTS=10
CONFIG_SERIAL_8250_RUNTIME_UARTS=10 CONFIG_SERIAL_8250_RUNTIME_UARTS=10
@ -924,11 +924,6 @@ CONFIG_ROCKCHIP_SYSTEM_MONITOR=y
CONFIG_ROCKCHIP_VENDOR_STORAGE=y CONFIG_ROCKCHIP_VENDOR_STORAGE=y
CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y
CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=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_RK_CONSOLE_THREAD=y
CONFIG_ROCKCHIP_DEBUG=y CONFIG_ROCKCHIP_DEBUG=y
CONFIG_ROCKCHIP_MINIDUMP=y CONFIG_ROCKCHIP_MINIDUMP=y

7
kernel/arch/arm64/configs/rockchip_linux_defconfig
View File

@ -241,7 +241,7 @@ CONFIG_INPUT_RK805_PWRKEY=y
CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y #CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_SERIAL_8250_PCI is not set # CONFIG_SERIAL_8250_PCI is not set
CONFIG_SERIAL_8250_NR_UARTS=10 CONFIG_SERIAL_8250_NR_UARTS=10
CONFIG_SERIAL_8250_RUNTIME_UARTS=10 CONFIG_SERIAL_8250_RUNTIME_UARTS=10
@ -539,11 +539,6 @@ CONFIG_ROCKCHIP_SYSTEM_MONITOR=y
CONFIG_ROCKCHIP_VENDOR_STORAGE=y CONFIG_ROCKCHIP_VENDOR_STORAGE=y
CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y
CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=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_RK_CONSOLE_THREAD=y
CONFIG_ROCKCHIP_DEBUG=y CONFIG_ROCKCHIP_DEBUG=y
CONFIG_PM_DEVFREQ=y CONFIG_PM_DEVFREQ=y