From 5e4693f2ac9bb1d4a06e059db22dace9bb45bf7d Mon Sep 17 00:00:00 2001 From: lean Date: Sun, 2 Jan 2022 12:07:07 +0800 Subject: [PATCH] k3screenctrl: fix PHICOMM K3 screen display off --- package/lean/k3screenctrl/Makefile | 2 +- .../k3screenctrl/patches/000-fix-k3screen.patch | 16 ++++++++++++++++ .../bcm53xx/patches-5.4/906-BCM5301x-uart1.patch | 12 ++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 package/lean/k3screenctrl/patches/000-fix-k3screen.patch create mode 100644 target/linux/bcm53xx/patches-5.4/906-BCM5301x-uart1.patch diff --git a/package/lean/k3screenctrl/Makefile b/package/lean/k3screenctrl/Makefile index 7b3153a48..7104ac404 100644 --- a/package/lean/k3screenctrl/Makefile +++ b/package/lean/k3screenctrl/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=k3screenctrl PKG_VERSION:=0.10 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/updateing/k3screenctrl.git diff --git a/package/lean/k3screenctrl/patches/000-fix-k3screen.patch b/package/lean/k3screenctrl/patches/000-fix-k3screen.patch new file mode 100644 index 000000000..944027028 --- /dev/null +++ b/package/lean/k3screenctrl/patches/000-fix-k3screen.patch @@ -0,0 +1,16 @@ +diff -Nuar a/src/infocenter.c b/src/infocenter.c +--- a/src/infocenter.c 2017-05-02 19:49:08.000000000 +0800 ++++ b/src/infocenter.c 2021-12-29 17:37:00.837529076 +0800 +@@ -116,9 +116,10 @@ + * be malformatted and the results are not reliable. + */ + const char *stopped_at = tokenize_and_store(out, '\n', stores, store_len); ++ int ret = *stopped_at == 0 ? SUCCESS : FAILURE; ++ + free((void *)out); +- +- return *stopped_at == 0 ? SUCCESS : FAILURE; ++ return ret; + } + + BASIC_INFO g_basic_info; diff --git a/target/linux/bcm53xx/patches-5.4/906-BCM5301x-uart1.patch b/target/linux/bcm53xx/patches-5.4/906-BCM5301x-uart1.patch new file mode 100644 index 000000000..245965058 --- /dev/null +++ b/target/linux/bcm53xx/patches-5.4/906-BCM5301x-uart1.patch @@ -0,0 +1,12 @@ +diff -Nuar a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi +--- a/arch/arm/boot/dts/bcm5301x.dtsi 2021-12-29 16:55:29.441523015 +0800 ++++ b/arch/arm/boot/dts/bcm5301x.dtsi 2021-12-29 17:03:44.640694605 +0800 +@@ -38,8 +38,6 @@ + reg = <0x0400 0x100>; + interrupts = ; + clocks = <&iprocslow>; +- pinctrl-names = "default"; +- pinctrl-0 = <&pinmux_uart1>; + status = "disabled"; + }; + };