From febfe1fdf206191309ca99aaa51b848a77f8a6e6 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 12 Sep 2022 06:56:19 -0400 Subject: [PATCH] Fixes for 4.14 Signed-off-by: Sasha Levin --- ...ngson32-ls1c-fix-hang-during-startup.patch | 37 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.14/mips-loongson32-ls1c-fix-hang-during-startup.patch diff --git a/queue-4.14/mips-loongson32-ls1c-fix-hang-during-startup.patch b/queue-4.14/mips-loongson32-ls1c-fix-hang-during-startup.patch new file mode 100644 index 00000000000..4d7ded1cb77 --- /dev/null +++ b/queue-4.14/mips-loongson32-ls1c-fix-hang-during-startup.patch @@ -0,0 +1,37 @@ +From 714bc034ceb1e6bc2c8a2e62c806ec8ca3e0a0ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Aug 2022 19:17:25 +0800 +Subject: MIPS: loongson32: ls1c: Fix hang during startup + +From: Yang Ling + +[ Upstream commit 35508d2424097f9b6a1a17aac94f702767035616 ] + +The RTCCTRL reg of LS1C is obselete. +Writing this reg will cause system hang. + +Fixes: 60219c563c9b6 ("MIPS: Add RTC support for Loongson1C board") +Signed-off-by: Yang Ling +Tested-by: Keguang Zhang +Acked-by: Keguang Zhang +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/loongson32/ls1c/board.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/mips/loongson32/ls1c/board.c b/arch/mips/loongson32/ls1c/board.c +index eb2d913c694fd..2d9675a6782c3 100644 +--- a/arch/mips/loongson32/ls1c/board.c ++++ b/arch/mips/loongson32/ls1c/board.c +@@ -19,7 +19,6 @@ static struct platform_device *ls1c_platform_devices[] __initdata = { + static int __init ls1c_platform_init(void) + { + ls1x_serial_set_uartclk(&ls1x_uart_pdev); +- ls1x_rtc_set_extclk(&ls1x_rtc_pdev); + + return platform_add_devices(ls1c_platform_devices, + ARRAY_SIZE(ls1c_platform_devices)); +-- +2.35.1 + diff --git a/queue-4.14/series b/queue-4.14/series index 1d1d2e35ed9..0a9a0e196fb 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -57,3 +57,4 @@ sch_sfb-also-store-skb-len-before-calling-child-enqu.patch usb-dwc3-fix-phy-disable-sequence.patch usb-serial-ch341-fix-lost-character-on-lcr-updates.patch usb-serial-ch341-fix-disabled-rx-timer-on-older-devices.patch +mips-loongson32-ls1c-fix-hang-during-startup.patch -- 2.47.3