diff --git a/config/sources/families/spacemit.conf b/config/sources/families/spacemit.conf index ee831c12aaa1..5b095ff0271d 100644 --- a/config/sources/families/spacemit.conf +++ b/config/sources/families/spacemit.conf @@ -21,7 +21,7 @@ declare -g ATF_TARGET_MAP="PLATFORM_DEFCONFIG=k1_defconfig PLATFORM=generic ;;bu # U-Boot declare -g BOOTSOURCE="https://gitee.com/bianbu-linux/uboot-2022.10.git" -declare -g BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:v1.0.8"}" +declare -g BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:v1.0.12"}" declare -g BOOTDIR='u-boot-spacemit' declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"legacy/u-boot-spacemit-k1"}" declare -g UBOOT_TARGET_MAP=";;bootinfo_emmc.bin FSBL.bin u-boot.itb fw_dynamic.itb" @@ -38,7 +38,7 @@ case "${BRANCH}" in legacy) # Kernel declare -g KERNELSOURCE='https://gitee.com/bianbu-linux/linux-6.1.git' - declare -g KERNELBRANCH='tag:v1.0.8' + declare -g KERNELBRANCH='tag:v1.0.12' declare -g KERNEL_MAJOR_MINOR="6.1" declare -g LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}" declare -g KERNELPATCHDIR="${LINUXFAMILY}-legacy-${KERNEL_MAJOR_MINOR}" # Needed as long as both legacy and current are 6.1 kernels diff --git a/patch/kernel/archive/imx8m-6.6/0001-Add-HDMI-support-for-IMX8MP.patch b/patch/kernel/archive/imx8m-6.6/0001-Add-HDMI-support-for-IMX8MP.patch index 26ef87920ced..13e914274237 100644 --- a/patch/kernel/archive/imx8m-6.6/0001-Add-HDMI-support-for-IMX8MP.patch +++ b/patch/kernel/archive/imx8m-6.6/0001-Add-HDMI-support-for-IMX8MP.patch @@ -312,55 +312,11 @@ diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/fre index 4b50920ac204..b00b4cced57c 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi -@@ -832,6 +832,23 @@ pgc_mediamix: power-domain@10 { - <&clk IMX8MP_CLK_MEDIA_APB_ROOT>; - }; - -+ pgc_hdmimix: power-domains@14 { -+ #power-domain-cells = <0>; -+ reg = ; -+ clocks = <&clk IMX8MP_CLK_HDMI_ROOT>, -+ <&clk IMX8MP_CLK_HDMI_APB>; -+ assigned-clocks = <&clk IMX8MP_CLK_HDMI_AXI>, -+ <&clk IMX8MP_CLK_HDMI_APB>; -+ assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>, -+ <&clk IMX8MP_SYS_PLL1_133M>; -+ assigned-clock-rates = <500000000>, <133000000>; -+ }; -+ -+ pgc_hdmi_phy: power-domains@15 { -+ #power-domain-cells = <0>; -+ reg = ; -+ }; -+ - pgc_mipi_phy2: power-domain@16 { - #power-domain-cells = <0>; - reg = ; -@@ -1831,6 +1848,122 @@ hsio_blk_ctrl: blk-ctrl@32f10000 { +@@ -1831,6 +1848,102 @@ hsio_blk_ctrl: blk-ctrl@32f10000 { #power-domain-cells = <1>; #clock-cells = <0>; }; + -+ hdmi_blk_ctrl: blk-ctrl@32fc0000 { -+ compatible = "fsl,imx8mp-hdmi-blk-ctrl", "syscon"; -+ reg = <0x32fc0000 0x23c>; -+ clocks = <&clk IMX8MP_CLK_HDMI_APB>, -+ <&clk IMX8MP_CLK_HDMI_ROOT>, -+ <&clk IMX8MP_CLK_HDMI_REF_266M>, -+ <&clk IMX8MP_CLK_HDMI_24M>; -+ clock-names = "apb", "axi", "ref_266m", "ref_24m"; -+ power-domains = <&pgc_hdmimix>, <&pgc_hdmimix>, -+ <&pgc_hdmimix>, <&pgc_hdmimix>, -+ <&pgc_hdmimix>, <&pgc_hdmimix>, -+ <&pgc_hdmimix>, <&pgc_hdmi_phy>, -+ <&pgc_hdmimix>, <&pgc_hdmimix>; -+ power-domain-names = "bus", "irqsteer", "lcdif", -+ "pai", "pvi", "trng", -+ "hdmi-tx", "hdmi-tx-phy", -+ "hdmiblk-hrv", "hdmiblk-hdcp"; -+ #power-domain-cells = <1>; -+ }; -+ + irqsteer_hdmi: interrupt-controller@32fc2000 { + compatible = "fsl,imx-irqsteer"; + reg = <0x32fc2000 0x44>; diff --git a/patch/kernel/archive/meson-6.6/generic-0001-m8-m8b-m8m2-Support-HDMI.patch b/patch/kernel/archive/meson-6.6/generic-0001-m8-m8b-m8m2-Support-HDMI.patch.disabled similarity index 100% rename from patch/kernel/archive/meson-6.6/generic-0001-m8-m8b-m8m2-Support-HDMI.patch rename to patch/kernel/archive/meson-6.6/generic-0001-m8-m8b-m8m2-Support-HDMI.patch.disabled diff --git a/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1000-drm-rockchip.patch b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1000-drm-rockchip.patch index e29ccd886984..c7796aaafe7c 100644 --- a/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1000-drm-rockchip.patch +++ b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1000-drm-rockchip.patch @@ -2593,34 +2593,6 @@ index e50f71ad3ceb..ef0a078c22f4 100644 for (i = 0; i < NUM_YUV2YUV_COEFFICIENTS; i++) { -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Wed, 8 Jan 2020 21:07:51 +0000 -Subject: [PATCH] arm64: dts: rockchip: increase vop clock rate on rk3328 - -The VOP on RK3328 needs to run at higher rate in order to -produce a proper 3840x2160 signal. - -Signed-off-by: Jonas Karlman ---- - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index d7e44d174d7b..5519347232f6 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -811,8 +811,8 @@ cru: clock-controller@ff440000 { - <0>, <24000000>, - <24000000>, <24000000>, - <15000000>, <15000000>, -- <100000000>, <100000000>, -- <100000000>, <100000000>, -+ <300000000>, <100000000>, -+ <400000000>, <100000000>, - <50000000>, <100000000>, - <100000000>, <100000000>, - <50000000>, <50000000>, From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee diff --git a/patch/kernel/archive/rockchip-6.6/patches.libreelec/linux-1000-drm-rockchip.patch b/patch/kernel/archive/rockchip-6.6/patches.libreelec/linux-1000-drm-rockchip.patch index 836cc09f6c46..6a2409801407 100644 --- a/patch/kernel/archive/rockchip-6.6/patches.libreelec/linux-1000-drm-rockchip.patch +++ b/patch/kernel/archive/rockchip-6.6/patches.libreelec/linux-1000-drm-rockchip.patch @@ -2610,35 +2610,6 @@ index e50f71ad3ceb..ef0a078c22f4 100644 for (i = 0; i < NUM_YUV2YUV_COEFFICIENTS; i++) { -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Wed, 8 Jan 2020 21:07:51 +0000 -Subject: [PATCH] arm64: dts: rockchip: increase vop clock rate on rk3328 - -The VOP on RK3328 needs to run at higher rate in order to -produce a proper 3840x2160 signal. - -Signed-off-by: Jonas Karlman ---- - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index d7e44d174d7b..5519347232f6 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -811,8 +811,8 @@ cru: clock-controller@ff440000 { - <0>, <24000000>, - <24000000>, <24000000>, - <15000000>, <15000000>, -- <100000000>, <100000000>, -- <100000000>, <100000000>, -+ <300000000>, <100000000>, -+ <400000000>, <100000000>, - <50000000>, <100000000>, - <100000000>, <100000000>, - <50000000>, <50000000>, - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 10 Apr 2021 16:54:26 +0200 diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/0012-fix-initial-PERST-GPIO-value.patch b/patch/kernel/archive/rockchip-rk3588-6.10/0012-fix-initial-PERST-GPIO-value.patch deleted file mode 100644 index 8212b6261b87..000000000000 --- a/patch/kernel/archive/rockchip-rk3588-6.10/0012-fix-initial-PERST-GPIO-value.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: yangchaohong <45483831+yangchaohong@users.noreply.github.com> -Date: Wed, 1 May 2024 08:30:43 +0100 -Subject: [ARCHEOLOGY] Fix PCIe for RK35xx+Fix ROCK5A PCIe device tree - -> X-Git-Archeology: - Revision b1f648ee755de73a922a33d6a432f310ea4ff3e0: https://github.com/armbian/build/commit/b1f648ee755de73a922a33d6a432f310ea4ff3e0 -> X-Git-Archeology: Date: Wed, 01 May 2024 08:30:43 +0100 -> X-Git-Archeology: From: yangchaohong <45483831+yangchaohong@users.noreply.github.com> -> X-Git-Archeology: Subject: Fix PCIe for RK35xx+Fix ROCK5A PCIe device tree -> X-Git-Archeology: ---- - drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c -index 111111111111..222222222222 100644 ---- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c -+++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c -@@ -240,7 +240,7 @@ static int rockchip_pcie_resource_get(struct platform_device *pdev, - return PTR_ERR(rockchip->apb_base); - - rockchip->rst_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", -- GPIOD_OUT_HIGH); -+ GPIOD_OUT_LOW); - if (IS_ERR(rockchip->rst_gpio)) - return PTR_ERR(rockchip->rst_gpio); - --- -Armbian - diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0001-arm64-dts.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0001-arm64-dts.patch.disabled similarity index 100% rename from patch/kernel/archive/rockchip64-6.10/board-rockpis-0001-arm64-dts.patch rename to patch/kernel/archive/rockchip64-6.10/board-rockpis-0001-arm64-dts.patch.disabled diff --git a/patch/kernel/archive/rockchip64-6.10/general-hdmi-clock-fixes.patch b/patch/kernel/archive/rockchip64-6.10/general-hdmi-clock-fixes.patch index d3af0b175eb8..820c24dfc7f8 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-hdmi-clock-fixes.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-hdmi-clock-fixes.patch @@ -1,32 +1,3 @@ -From 5113ec8e82ea78884308aac6b0b8172c417d570b Mon Sep 17 00:00:00 2001 -From: Paolo Sabatino -Date: Sat, 6 Apr 2024 15:40:30 +0200 -Subject: [PATCH 1/2] hdmi timing core changes and fixes - ---- - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +- - drivers/clk/rockchip/clk-rk3399.c | 49 ++++++++++++++++++--- - drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 29 ++++++++---- - drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 44 +++++++++++++++++- - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 31 ++++++++++--- - drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 7 +++ - 6 files changed, 140 insertions(+), 24 deletions(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index cc8209795c3e..74af7dba0f9a 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -813,8 +813,8 @@ cru: clock-controller@ff440000 { - <0>, <24000000>, - <24000000>, <24000000>, - <15000000>, <15000000>, -- <100000000>, <100000000>, -- <100000000>, <100000000>, -+ <300000000>, <100000000>, -+ <400000000>, <100000000>, - <50000000>, <100000000>, - <100000000>, <100000000>, - <50000000>, <50000000>, diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index 9ebd6c451b3d..d2391fdd6cb5 100644 --- a/drivers/clk/rockchip/clk-rk3399.c diff --git a/patch/kernel/archive/rockchip64-6.6/board-rockpis-0001-arm64-dts.patch b/patch/kernel/archive/rockchip64-6.6/board-rockpis-0001-arm64-dts.patch.disabled similarity index 100% rename from patch/kernel/archive/rockchip64-6.6/board-rockpis-0001-arm64-dts.patch rename to patch/kernel/archive/rockchip64-6.6/board-rockpis-0001-arm64-dts.patch.disabled diff --git a/patch/kernel/archive/rockchip64-6.6/general-hdmi-clock-fixes.patch b/patch/kernel/archive/rockchip64-6.6/general-hdmi-clock-fixes.patch index 0e33041cb785..08b08630a6fb 100644 --- a/patch/kernel/archive/rockchip64-6.6/general-hdmi-clock-fixes.patch +++ b/patch/kernel/archive/rockchip64-6.6/general-hdmi-clock-fixes.patch @@ -4,7 +4,6 @@ Date: Sat, 6 Apr 2024 15:40:30 +0200 Subject: [PATCH 1/2] hdmi timing core changes and fixes --- - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +- drivers/clk/rockchip/clk-rk3399.c | 49 ++++++++++++++++++--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 29 ++++++++---- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 44 +++++++++++++++++- @@ -12,21 +11,6 @@ Subject: [PATCH 1/2] hdmi timing core changes and fixes drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 7 +++ 6 files changed, 140 insertions(+), 24 deletions(-) -diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index cc8209795c3e..74af7dba0f9a 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -813,8 +813,8 @@ cru: clock-controller@ff440000 { - <0>, <24000000>, - <24000000>, <24000000>, - <15000000>, <15000000>, -- <100000000>, <100000000>, -- <100000000>, <100000000>, -+ <300000000>, <100000000>, -+ <400000000>, <100000000>, - <50000000>, <100000000>, - <100000000>, <100000000>, - <50000000>, <50000000>, diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index 9ebd6c451b3d..d2391fdd6cb5 100644 --- a/drivers/clk/rockchip/clk-rk3399.c diff --git a/patch/misc/rtw88/6.6/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch b/patch/misc/rtw88/6.6/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch index 2b4426db45c9..0ee59a21c455 100644 --- a/patch/misc/rtw88/6.6/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch +++ b/patch/misc/rtw88/6.6/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch @@ -6408,66 +6408,6 @@ index 1dfe7c6ae4ba..a28f35a03b26 100644 -- 2.44.0 -From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 -From: Bitterblue Smith -Date: Mon, 29 Apr 2024 20:57:52 +0300 -Subject: [PATCH] wifi: rtw88: usb: Fix disconnection after beacon loss - -When there is beacon loss, for example due to unrelated Bluetooth -devices transmitting music nearby, the wifi connection dies soon -after the first beacon loss message: - -Apr 28 20:47:14 ideapad2 wpa_supplicant[1161]: wlp3s0f3u4: - CTRL-EVENT-BEACON-LOSS -Apr 28 20:47:15 ideapad2 wpa_supplicant[1161]: wlp3s0f3u4: - CTRL-EVENT-DISCONNECTED bssid=... reason=4 locally_generated=1 - -Apr 28 20:47:24 ideapad2 wpa_supplicant[1161]: wlp3s0f3u4: - CTRL-EVENT-BEACON-LOSS -Apr 28 20:47:25 ideapad2 wpa_supplicant[1161]: wlp3s0f3u4: - CTRL-EVENT-DISCONNECTED bssid=... reason=4 locally_generated=1 - -Apr 28 20:47:34 ideapad2 wpa_supplicant[1161]: wlp3s0f3u4: - CTRL-EVENT-BEACON-LOSS -Apr 28 20:47:35 ideapad2 wpa_supplicant[1161]: wlp3s0f3u4: - CTRL-EVENT-DISCONNECTED bssid=... reason=4 locally_generated=1 - -When the beacon loss happens, mac80211 makes rtw88 transmit a QOS -NULL frame and asks to confirm the ACK status. Even though rtw88 -confirms to mac80211 that the QOS NULL was transmitted successfully, -the connection still dies. This is because rtw88 is handing the QOS -NULL back to mac80211 with skb->data pointing to the headroom (the -TX descriptor) instead of ieee80211_hdr. - -Fix the disconnection by moving skb->data to the correct position -before ieee80211_tx_status_irqsafe(). - -The problem was observed with RTL8811AU (TP-Link Archer T2U Nano) -and the potential future rtw88_8821au driver. Also tested with -RTL8811CU (Tenda U9). - -Cc: stable@vger.kernel.org -Signed-off-by: Bitterblue Smith ---- - drivers/net/wireless/realtek/rtw88/usb.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c -index 3ba7b81c6080..1dfe7c6ae4ba 100644 ---- a/drivers/net/wireless/realtek/rtw88/usb.c -+++ b/drivers/net/wireless/realtek/rtw88/usb.c -@@ -278,6 +278,8 @@ static void rtw_usb_write_port_tx_complete(struct urb *urb) - info = IEEE80211_SKB_CB(skb); - tx_data = rtw_usb_get_tx_data(skb); - -+ skb_pull(skb, rtwdev->chip->tx_pkt_desc_sz); -+ - /* enqueue to wait for tx report */ - if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS) { - rtw_tx_report_enqueue(rtwdev, skb, tx_data->sn); --- -2.44.0 - From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 From: Bitterblue Smith Date: Sun, 16 Jun 2024 22:27:34 +0300