From ab80e6c6842e5cd18c1c5c1feb166dd4764e5d08 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 12 Feb 2025 17:57:02 +0000 Subject: [PATCH 1/7] arm-trusted-firmware-mediatek: update to upstream release 2025-02-12 Rebased MediaTek's SoC support patchset on top of upstream ARM TrustedFirmware-A v2.12+. Signed-off-by: Daniel Golle --- package/boot/arm-trusted-firmware-mediatek/Makefile | 9 ++++----- ...-mediatek-snfi-fix-return-code-when-reading.patch | 12 ++++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/package/boot/arm-trusted-firmware-mediatek/Makefile b/package/boot/arm-trusted-firmware-mediatek/Makefile index 3046a01a58..0b68d510c5 100644 --- a/package/boot/arm-trusted-firmware-mediatek/Makefile +++ b/package/boot/arm-trusted-firmware-mediatek/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arm-trusted-firmware-mediatek -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/mtk-openwrt/arm-trusted-firmware.git -PKG_SOURCE_DATE:=2024-01-17 -PKG_SOURCE_VERSION:=bacca82a8cac369470df052a9d801a0ceb9b74ca -PKG_MIRROR_HASH:=1138649f64ac3982330925c38c795ca6860289adbd95755991f80afa30ebdea7 +PKG_SOURCE_DATE:=2025-02-12 +PKG_SOURCE_VERSION:=e090770684e775711a624e68e0b28112227a4c38 +PKG_MIRROR_HASH:=1ff9d60f3677aadd9a6716e860985987ba7157bd28ce831112e05c0b3170939a PKG_MAINTAINER:=Daniel Golle @@ -569,7 +569,6 @@ TFA_TARGETS:= \ mt7988-spim-nand-ubi-comb TFA_MAKE_FLAGS += \ - $(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \ BOOT_DEVICE=$(BOOT_DEVICE) \ USE_MKIMAGE=1 MKIMAGE=$(STAGING_DIR_HOST)/bin/mkimage \ $(if $(findstring ddr4,$(DDR_TYPE)),DRAM_USE_DDR4=1) \ diff --git a/package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch b/package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch index 857ecd0595..8ac52143a7 100644 --- a/package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch +++ b/package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch @@ -13,15 +13,19 @@ Signed-off-by: Daniel Golle --- a/plat/mediatek/apsoc_common/bl2/bl2_dev_snfi_init.c +++ b/plat/mediatek/apsoc_common/bl2/bl2_dev_snfi_init.c -@@ -29,8 +29,10 @@ static int snfi_mtd_read_page(struct nan +@@ -30,9 +30,14 @@ static int snfi_mtd_read_page(struct nan int ret; ret = mtk_snand_read_page(snf, addr, (void *)buffer, NULL, false); -- if (ret == -EBADMSG) +- if (ret == -EBADMSG || ret > 0) ++ if (ret == -EBADMSG) + ret = 0; + + if (ret > 0) { + NOTICE("corrected %d bitflips while reading page %u\n", ret, page); - ret = 0; ++ ret = 0; + } - ++ return ret; } + From eacc4d8c9b31ac17df034d2140558bdaaa56c16b Mon Sep 17 00:00:00 2001 From: George Moussalem Date: Thu, 6 Feb 2025 12:14:27 +0400 Subject: [PATCH 2/7] qualcommax: ipq50xx: use ascii-env driver to set mac address for Linksys MX devices The ascii-env driver enables reading name pair values from nand in ascii layout. So, let's pick up and set the mac address accordingly. Signed-off-by: George Moussalem Link: https://github.com/openwrt/openwrt/pull/18029 Signed-off-by: Robert Marko --- target/linux/qualcommax/config-6.6 | 1 + .../arm64/boot/dts/qcom/ipq5018-mx-base.dtsi | 14 +++++++++-- .../arm64/boot/dts/qcom/ipq5018-mx2000.dts | 4 ++++ .../arm64/boot/dts/qcom/ipq5018-mx5500.dts | 4 ++++ .../arm64/boot/dts/qcom/ipq5018-spnmx56.dts | 5 ++++ .../ipq50xx/base-files/etc/board.d/02_network | 24 ------------------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/target/linux/qualcommax/config-6.6 b/target/linux/qualcommax/config-6.6 index a24a617124..1467bc968b 100644 --- a/target/linux/qualcommax/config-6.6 +++ b/target/linux/qualcommax/config-6.6 @@ -278,6 +278,7 @@ CONFIG_NR_CPUS=4 CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVMEM=y CONFIG_NVMEM_LAYOUTS=y +CONFIG_NVMEM_LAYOUT_ASCII_ENV=y CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y CONFIG_NVMEM_QCOM_QFPROM=y # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi index 57fe5c53a9..a015fcbd34 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi @@ -8,8 +8,6 @@ / { aliases { - ethernet0 = &dp1; - ethernet1 = &dp2; led-boot = &led_system_blue; led-failsafe = &led_system_red; led-running = &led_system_blue; @@ -209,6 +207,18 @@ label = "devinfo"; reg = <0x00680000 0x40000>; read-only; + + nvmem-layout { + compatible = "ascii-eq-delim-env"; + #address-cells = <1>; + #size-cells = <1>; + + hw_mac_addr: hw_mac_addr { + compatible = "mac-base"; + + #nvmem-cell-cells = <1>; + }; + }; }; partition@6c0000 { diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts index 108b26f8d1..e563cca779 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts @@ -48,8 +48,12 @@ // MAC1 ---SGMII---> QCA8337 SerDes &dp2 { status = "okay"; + phy-mode = "sgmii"; + nvmem-cells = <&hw_mac_addr 0>; + nvmem-cell-names = "mac-address"; + fixed-link { speed = <1000>; full-duplex; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts index 630e8ba310..ab3e00a9cc 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts @@ -48,8 +48,12 @@ // MAC1 ---SGMII---> QCA8337 SerDes &dp2 { status = "okay"; + phy-mode = "sgmii"; + nvmem-cells = <&hw_mac_addr 0>; + nvmem-cell-names = "mac-address"; + fixed-link { speed = <1000>; full-duplex; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts index 75b9444514..d25ff0f1cb 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts @@ -53,6 +53,9 @@ // MAC0 -> GE Phy &dp1 { status = "okay"; + + nvmem-cells = <&hw_mac_addr 0>; + nvmem-cell-names = "mac-address"; }; // MAC1 ---SGMII---> QCA8081 @@ -61,6 +64,8 @@ label = "wan"; phy-handle = <&qca8081>; + nvmem-cells = <&hw_mac_addr 0>; + nvmem-cell-names = "mac-address"; }; &mdio0 { diff --git a/target/linux/qualcommax/ipq50xx/base-files/etc/board.d/02_network b/target/linux/qualcommax/ipq50xx/base-files/etc/board.d/02_network index c80b259d27..6c8574c474 100644 --- a/target/linux/qualcommax/ipq50xx/base-files/etc/board.d/02_network +++ b/target/linux/qualcommax/ipq50xx/base-files/etc/board.d/02_network @@ -15,33 +15,9 @@ ipq50xx_setup_interfaces() esac } -ipq50xx_setup_macs() -{ - local board="$1" - local lan_mac="" - local wan_mac="" - local label_mac="" - - case "$board" in - linksys,mx2000|\ - linksys,mx5500|\ - linksys,spnmx56) - label_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr) - lan_mac=$label_mac - wan_mac=$label_mac - ucidef_set_network_device_mac eth0 $label_mac - ;; - esac - - [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac - [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac - [ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac -} - board_config_update board=$(board_name) ipq50xx_setup_interfaces $board -ipq50xx_setup_macs $board board_config_flush exit 0 From b790989dffb274f43e3442210b902bcbccc0eac4 Mon Sep 17 00:00:00 2001 From: George Moussalem Date: Wed, 19 Feb 2025 13:08:49 +0400 Subject: [PATCH 3/7] qualcommax: ipq50xx: Linksys MX remove superfluous properties and fix indentation On the ipq50xx platform, the internal GE PHY at phy address 7 on mdio0 must be enabled as it's used to detect the virtual switch in qca-ssdk. This is a platform wide condition and is therefore part of the dtsi. However, by enabling the mdio0 bus in board-specific dts files, the ge_phy is implicitly enabled. So, let's remove the superfluous status property in the dts files for Linksys MX2000 and MX5500. While at it, remove the redundant phy-mode property as it's set to sgmii by default in the ipq5018-ess.dtsi file and fix indentation in the firmware property of the q5v6_wcss node. Signed-off-by: George Moussalem Link: https://github.com/openwrt/openwrt/pull/18029 Signed-off-by: Robert Marko --- .../arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts | 13 ++----------- .../arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts | 11 +---------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts index e563cca779..ce10405164 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts @@ -49,8 +49,6 @@ &dp2 { status = "okay"; - phy-mode = "sgmii"; - nvmem-cells = <&hw_mac_addr 0>; nvmem-cell-names = "mac-address"; @@ -64,13 +62,6 @@ status = "okay"; }; -/* IPQ5018 GE Phy -> Not connected - * needs to be enabled for QSDK to identify the IPQ5018 dummy switch - */ -&ge_phy { - status = "okay"; -}; - &mdio1 { status = "okay"; @@ -159,8 +150,8 @@ memory-region = <&q6_mem_regions>; firmware-name = "ath11k/IPQ5018/hw1.0/q6_fw.mdt", - "ath11k/IPQ5018/hw1.0/m3_fw.mdt", - "ath11k/QCN6122/hw1.0/m3_fw.mdt"; + "ath11k/IPQ5018/hw1.0/m3_fw.mdt", + "ath11k/QCN6122/hw1.0/m3_fw.mdt"; /* The QCN6102 radio should map to UPD ID 2. Without */ /* bootargs, the firmware will expect it to be on UPD ID 3 */ diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts index ab3e00a9cc..4792ed5d43 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts @@ -49,8 +49,6 @@ &dp2 { status = "okay"; - phy-mode = "sgmii"; - nvmem-cells = <&hw_mac_addr 0>; nvmem-cell-names = "mac-address"; @@ -64,13 +62,6 @@ status = "okay"; }; -/* IPQ5018 GE Phy -> Not connected - * needs to be enabled for QSDK to identify the IPQ5018 dummy switch - */ -&ge_phy { - status = "okay"; -}; - &mdio1 { status = "okay"; @@ -186,7 +177,7 @@ memory-region = <&q6_mem_regions>; firmware-name = "ath11k/IPQ5018/hw1.0/q6_fw.mdt", - "ath11k/IPQ5018/hw1.0/m3_fw.mdt"; + "ath11k/IPQ5018/hw1.0/m3_fw.mdt"; // IPQ5018 q6_wcss_pd1: pd-1 { From 57b0304ce93b9e84701de3091c9f272e6b14e6fa Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 17 Feb 2025 05:12:48 -0500 Subject: [PATCH 4/7] kernel: bump 6.6 to 6.6.78 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.78 Removed upstreamed: bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch[1] mediatek/patches-6.6/256-clk-mediatek-mt2701-vdec-fix-conversion-to-mtk_clk_s.patch[2] mediatek/patches-6.6/257-clk-mediatek-mt2701-aud-fix-conversion-to-mtk_clk_si.patch[3] mediatek/patches-6.6/258-clk-mediatek-mt2701-bdp-add-missing-dummy-clk.patch[4] mediatek/patches-6.6/259-clk-mediatek-mt2701-mm-add-missing-dummy-clk.patch[5] mediatek/patches-6.6/260-clk-mediatek-mt2701-img-add-missing-dummy-clk.patch[6] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=25abffee5ceb6691ecd4f089be2bb28842e2d2fd 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=b6c5237ab7af82c9f1d8d772dbf309bb4aadfdbb 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=20210b5c775d2d96f706591c64bc2ad975c37eaf 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=a1fa3dda6bf0b7ecd95fa8f9125e5486b699a81f 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=fc60e9357f15372698da373ee76de8f52d22aac2 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=6f4868e6b2887b55531bc8e0a4106ef0150e6326 Build system: x86/64 Build-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Run-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/18000 Signed-off-by: Robert Marko --- include/kernel-6.6 | 4 +- ...53x-Add-ti-tca9554-compatible-string.patch | 2 +- ...mx296-Add-standby-delay-during-probe.patch | 26 ------ ...ok-up-preferred-fbdev-node-number-fr.patch | 4 +- ...ange-query-for-FB-designation-from-d.patch | 2 +- ...-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch | 4 +- ...d-initialise-an-orientation-field-to.patch | 2 +- ...top-property-to-true-for-writeback-a.patch | 2 +- ...-number-of-overlay-planes-from-16-to.patch | 2 +- .../patches-6.6/791-tg3-no-pci-sleep.patch | 2 +- ...rk-layouts-to-become-regular-devices.patch | 2 +- ...1-nvmem-imx-ocotp-ele-support-i.MX95.patch | 6 +- .../hack-6.6/904-debloat_dma_buf.patch | 2 +- ...Fix-DMA-allocations-on-57766-devices.patch | 2 +- ...msm-use-sdhci_set_clock-instead-of-s.patch | 2 +- ...m-comment-unused-sdhci_msm_set_clock.patch | 2 +- ...701-vdec-fix-conversion-to-mtk_clk_s.patch | 56 ----------- ...701-aud-fix-conversion-to-mtk_clk_si.patch | 92 ------------------- ...tek-mt2701-bdp-add-missing-dummy-clk.patch | 55 ----------- ...atek-mt2701-mm-add-missing-dummy-clk.patch | 56 ----------- ...tek-mt2701-img-add-missing-dummy-clk.patch | 55 ----------- ...ommon-commonize-qcom_cc_really_probe.patch | 4 +- .../810-uvc-add-iPassion-iP2970-support.patch | 8 +- 23 files changed, 26 insertions(+), 366 deletions(-) delete mode 100644 target/linux/bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch delete mode 100644 target/linux/mediatek/patches-6.6/256-clk-mediatek-mt2701-vdec-fix-conversion-to-mtk_clk_s.patch delete mode 100644 target/linux/mediatek/patches-6.6/257-clk-mediatek-mt2701-aud-fix-conversion-to-mtk_clk_si.patch delete mode 100644 target/linux/mediatek/patches-6.6/258-clk-mediatek-mt2701-bdp-add-missing-dummy-clk.patch delete mode 100644 target/linux/mediatek/patches-6.6/259-clk-mediatek-mt2701-mm-add-missing-dummy-clk.patch delete mode 100644 target/linux/mediatek/patches-6.6/260-clk-mediatek-mt2701-img-add-missing-dummy-clk.patch diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 3f07a92fc4..a22eb0f6f9 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .77 -LINUX_KERNEL_HASH-6.6.77 = 081089dfcf125aef67aa940ebb995ff789b646129f5d4b2365e1d5685b29a84e +LINUX_VERSION-6.6 = .78 +LINUX_KERNEL_HASH-6.6.78 = 5aa39a9bd555133ad741058f9908a277e6b36bb928481e747d885b50aaaa93ed diff --git a/target/linux/bcm27xx/patches-6.6/950-0416-gpio-pca953x-Add-ti-tca9554-compatible-string.patch b/target/linux/bcm27xx/patches-6.6/950-0416-gpio-pca953x-Add-ti-tca9554-compatible-string.patch index be8e134cf6..e0de6fe1cb 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0416-gpio-pca953x-Add-ti-tca9554-compatible-string.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0416-gpio-pca953x-Add-ti-tca9554-compatible-string.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c -@@ -1330,6 +1330,7 @@ static const struct of_device_id pca953x +@@ -1311,6 +1311,7 @@ static const struct of_device_id pca953x { .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), }, { .compatible = "ti,tca9538", .data = OF_953X( 8, PCA_INT), }, { .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), }, diff --git a/target/linux/bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch b/target/linux/bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch deleted file mode 100644 index 786ba7656c..0000000000 --- a/target/linux/bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7713ce38e6a26425ace3a57b3d03ba0125c16f89 Mon Sep 17 00:00:00 2001 -From: Naushir Patuck -Date: Fri, 28 Jul 2023 12:00:40 +0100 -Subject: [PATCH 0487/1085] drivers: media: imx296: Add standby delay during - probe - -Add a 2-5ms delay when coming out of standby and before reading the -sensor info register durning probe, as instructed by the datasheet. This -standby delay is already present when the sensor starts streaming. - -Signed-off-by: Naushir Patuck ---- - drivers/media/i2c/imx296.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/media/i2c/imx296.c -+++ b/drivers/media/i2c/imx296.c -@@ -940,6 +940,8 @@ static int imx296_identify_model(struct - return ret; - } - -+ usleep_range(2000, 5000); -+ - ret = imx296_read(sensor, IMX296_SENSOR_INFO); - if (ret < 0) { - dev_err(sensor->dev, "failed to read sensor information (%d)\n", diff --git a/target/linux/bcm27xx/patches-6.6/950-0679-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch b/target/linux/bcm27xx/patches-6.6/950-0679-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch index f94efc25b2..0b2b28b7f1 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0679-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0679-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch @@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c -@@ -1851,7 +1851,7 @@ __drm_fb_helper_initial_config_and_unloc +@@ -1853,7 +1853,7 @@ __drm_fb_helper_initial_config_and_unloc struct drm_device *dev = fb_helper->dev; struct fb_info *info; unsigned int width, height; @@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson width = dev->mode_config.max_width; height = dev->mode_config.max_height; -@@ -1879,6 +1879,15 @@ __drm_fb_helper_initial_config_and_unloc +@@ -1881,6 +1881,15 @@ __drm_fb_helper_initial_config_and_unloc * register the fbdev emulation instance in kernel_fb_helper_list. */ mutex_unlock(&fb_helper->lock); diff --git a/target/linux/bcm27xx/patches-6.6/950-0684-drm-fb_helper-Change-query-for-FB-designation-from-d.patch b/target/linux/bcm27xx/patches-6.6/950-0684-drm-fb_helper-Change-query-for-FB-designation-from-d.patch index 60cabdffc3..a63bd11af4 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0684-drm-fb_helper-Change-query-for-FB-designation-from-d.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0684-drm-fb_helper-Change-query-for-FB-designation-from-d.patch @@ -12,7 +12,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c -@@ -1879,11 +1879,11 @@ __drm_fb_helper_initial_config_and_unloc +@@ -1881,11 +1881,11 @@ __drm_fb_helper_initial_config_and_unloc * register the fbdev emulation instance in kernel_fb_helper_list. */ mutex_unlock(&fb_helper->lock); diff --git a/target/linux/bcm27xx/patches-6.6/950-0923-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch b/target/linux/bcm27xx/patches-6.6/950-0923-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch index 485196b15a..c4a5537a8c 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0923-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0923-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch @@ -21,7 +21,7 @@ Signed-off-by: Nick Hollinghurst --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c -@@ -1049,6 +1049,7 @@ static const struct drm_prop_enum_list d +@@ -1050,6 +1050,7 @@ static const struct drm_prop_enum_list d { DRM_MODE_TV_MODE_PAL_M, "PAL-M" }, { DRM_MODE_TV_MODE_PAL_N, "PAL-N" }, { DRM_MODE_TV_MODE_SECAM, "SECAM" }, @@ -29,7 +29,7 @@ Signed-off-by: Nick Hollinghurst }; DRM_ENUM_NAME_FN(drm_get_tv_mode_name, drm_tv_mode_enum_list) -@@ -1735,6 +1736,12 @@ EXPORT_SYMBOL(drm_connector_attach_dp_su +@@ -1736,6 +1737,12 @@ EXPORT_SYMBOL(drm_connector_attach_dp_su * TV Mode is CCIR System B (aka 625-lines) together with * the SECAM Color Encoding. * diff --git a/target/linux/bcm27xx/patches-6.6/950-1051-drm-panel-Add-and-initialise-an-orientation-field-to.patch b/target/linux/bcm27xx/patches-6.6/950-1051-drm-panel-Add-and-initialise-an-orientation-field-to.patch index 694e2a0082..6d745f6e9d 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1051-drm-panel-Add-and-initialise-an-orientation-field-to.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1051-drm-panel-Add-and-initialise-an-orientation-field-to.patch @@ -22,7 +22,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c -@@ -2697,10 +2697,15 @@ int drm_connector_set_orientation_from_p +@@ -2698,10 +2698,15 @@ int drm_connector_set_orientation_from_p { enum drm_panel_orientation orientation; diff --git a/target/linux/bcm27xx/patches-6.6/950-1365-drm-Set-non-desktop-property-to-true-for-writeback-a.patch b/target/linux/bcm27xx/patches-6.6/950-1365-drm-Set-non-desktop-property-to-true-for-writeback-a.patch index e8f52cbc43..a1ac849e3e 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1365-drm-Set-non-desktop-property-to-true-for-writeback-a.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1365-drm-Set-non-desktop-property-to-true-for-writeback-a.patch @@ -18,7 +18,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c -@@ -361,7 +361,8 @@ static int __drm_connector_init(struct d +@@ -362,7 +362,8 @@ static int __drm_connector_init(struct d drm_object_attach_property(&connector->base, config->non_desktop_property, diff --git a/target/linux/bcm27xx/patches-6.6/950-1367-drm-vc4-Increase-number-of-overlay-planes-from-16-to.patch b/target/linux/bcm27xx/patches-6.6/950-1367-drm-vc4-Increase-number-of-overlay-planes-from-16-to.patch index 6eae6fc2ac..564d7abeb6 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1367-drm-vc4-Increase-number-of-overlay-planes-from-16-to.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1367-drm-vc4-Increase-number-of-overlay-planes-from-16-to.patch @@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c -@@ -362,7 +362,7 @@ static int __drm_connector_init(struct d +@@ -363,7 +363,7 @@ static int __drm_connector_init(struct d drm_object_attach_property(&connector->base, config->non_desktop_property, (connector_type != DRM_MODE_CONNECTOR_VIRTUAL && diff --git a/target/linux/bcm47xx/patches-6.6/791-tg3-no-pci-sleep.patch b/target/linux/bcm47xx/patches-6.6/791-tg3-no-pci-sleep.patch index 76e979ad58..0777873701 100644 --- a/target/linux/bcm47xx/patches-6.6/791-tg3-no-pci-sleep.patch +++ b/target/linux/bcm47xx/patches-6.6/791-tg3-no-pci-sleep.patch @@ -5,7 +5,7 @@ when a switch driver is in use. --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c -@@ -4269,7 +4269,8 @@ static int tg3_power_down_prepare(struct +@@ -4270,7 +4270,8 @@ static int tg3_power_down_prepare(struct static void tg3_power_down(struct tg3 *tp) { pci_wake_from_d3(tp->pdev, tg3_flag(tp, WOL_ENABLE)); diff --git a/target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch b/target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch index c846c485e0..220a968136 100644 --- a/target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch +++ b/target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch @@ -330,7 +330,7 @@ Signed-off-by: Greg Kroah-Hartman } EXPORT_SYMBOL_GPL(nvmem_cell_put); -@@ -2116,11 +2057,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_size); +@@ -2118,11 +2059,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_size); static int __init nvmem_init(void) { diff --git a/target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch b/target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch index c19931b3fa..b96134e315 100644 --- a/target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch +++ b/target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman FUSE_INVALID = -1 }; -@@ -93,7 +94,10 @@ static int imx_ocotp_reg_read(void *cont +@@ -95,7 +96,10 @@ static int imx_ocotp_reg_read(void *cont continue; } @@ -39,8 +39,8 @@ Signed-off-by: Greg Kroah-Hartman + *buf++ = readl_relaxed(reg + (i << 2)); } - memcpy(val, (u8 *)p, bytes); -@@ -155,8 +159,30 @@ static const struct ocotp_devtype_data i + memcpy(val, ((u8 *)p) + skipbytes, bytes); +@@ -157,8 +161,30 @@ static const struct ocotp_devtype_data i }, }; diff --git a/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch b/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch index 355bd0d70c..3ca98788ab 100644 --- a/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch @@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4483,6 +4483,7 @@ int wake_up_state(struct task_struct *p, +@@ -4485,6 +4485,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/pending-6.6/791-tg3-Fix-DMA-allocations-on-57766-devices.patch b/target/linux/generic/pending-6.6/791-tg3-Fix-DMA-allocations-on-57766-devices.patch index a90d77c9f0..9d219d13e5 100644 --- a/target/linux/generic/pending-6.6/791-tg3-Fix-DMA-allocations-on-57766-devices.patch +++ b/target/linux/generic/pending-6.6/791-tg3-Fix-DMA-allocations-on-57766-devices.patch @@ -17,7 +17,7 @@ Signed-off-by: Pavan Chebbi --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c -@@ -17731,8 +17731,10 @@ static int tg3_init_one(struct pci_dev * +@@ -17732,8 +17732,10 @@ static int tg3_init_one(struct pci_dev * } else persist_dma_mask = dma_mask = DMA_BIT_MASK(64); diff --git a/target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch b/target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch index 1c156d4398..76c36db38f 100644 --- a/target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch +++ b/target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch @@ -13,7 +13,7 @@ Signed-off-by: Robert Marko --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c -@@ -2320,7 +2320,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat +@@ -2369,7 +2369,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat static const struct sdhci_ops sdhci_msm_ops = { .reset = sdhci_and_cqhci_reset, diff --git a/target/linux/ipq40xx/patches-6.6/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch b/target/linux/ipq40xx/patches-6.6/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch index cfbb643974..a90b0aaf9b 100644 --- a/target/linux/ipq40xx/patches-6.6/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch +++ b/target/linux/ipq40xx/patches-6.6/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch @@ -13,7 +13,7 @@ Signed-off-by: Christian Marangi --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c -@@ -1755,49 +1755,49 @@ static unsigned int sdhci_msm_get_min_cl +@@ -1804,49 +1804,49 @@ static unsigned int sdhci_msm_get_min_cl return SDHCI_MSM_MIN_CLOCK; } diff --git a/target/linux/mediatek/patches-6.6/256-clk-mediatek-mt2701-vdec-fix-conversion-to-mtk_clk_s.patch b/target/linux/mediatek/patches-6.6/256-clk-mediatek-mt2701-vdec-fix-conversion-to-mtk_clk_s.patch deleted file mode 100644 index e2aed0126f..0000000000 --- a/target/linux/mediatek/patches-6.6/256-clk-mediatek-mt2701-vdec-fix-conversion-to-mtk_clk_s.patch +++ /dev/null @@ -1,56 +0,0 @@ -From patchwork Sun Dec 15 22:13:49 2024 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Daniel Golle -X-Patchwork-Id: 13909005 -Date: Sun, 15 Dec 2024 22:13:49 +0000 -From: Daniel Golle -To: Michael Turquette , - Stephen Boyd , Matthias Brugger , - AngeloGioacchino Del Regno , - Alexandre Mergnat , - Geert Uytterhoeven , - Daniel Golle , - Uwe =?iso-8859-1?q?Kleine-K=F6nig?= , - Miles Chen , Chen-Yu Tsai , - Frank Wunderlich , John Crispin , - linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, - linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, - stable@vger.kernel.org -Subject: [PATCH 1/5] clk: mediatek: mt2701-vdec: fix conversion to - mtk_clk_simple_probe -Message-ID: - -Precedence: bulk -X-Mailing-List: linux-clk@vger.kernel.org -List-Id: -List-Subscribe: -List-Unsubscribe: -MIME-Version: 1.0 -Content-Disposition: inline - -Commit 973d1607d936 ("clk: mediatek: mt2701: use mtk_clk_simple_probe to -simplify driver") broke DT bindings as the highest index was reduced by -1 because the id count starts from 1 and not from 0. - -Fix this, like for other drivers which had the same issue, by adding a -dummy clk at index 0. - -Fixes: 973d1607d936 ("clk: mediatek: mt2701: use mtk_clk_simple_probe to simplify driver") -Cc: stable@vger.kernel.org -Signed-off-by: Daniel Golle ---- - drivers/clk/mediatek/clk-mt2701-vdec.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/clk/mediatek/clk-mt2701-vdec.c -+++ b/drivers/clk/mediatek/clk-mt2701-vdec.c -@@ -31,6 +31,7 @@ static const struct mtk_gate_regs vdec1_ - GATE_MTK(_id, _name, _parent, &vdec1_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv) - - static const struct mtk_gate vdec_clks[] = { -+ GATE_DUMMY(CLK_DUMMY, "vdec_dummy"), - GATE_VDEC0(CLK_VDEC_CKGEN, "vdec_cken", "vdec_sel", 0), - GATE_VDEC1(CLK_VDEC_LARB, "vdec_larb_cken", "mm_sel", 0), - }; diff --git a/target/linux/mediatek/patches-6.6/257-clk-mediatek-mt2701-aud-fix-conversion-to-mtk_clk_si.patch b/target/linux/mediatek/patches-6.6/257-clk-mediatek-mt2701-aud-fix-conversion-to-mtk_clk_si.patch deleted file mode 100644 index 5d31aec0be..0000000000 --- a/target/linux/mediatek/patches-6.6/257-clk-mediatek-mt2701-aud-fix-conversion-to-mtk_clk_si.patch +++ /dev/null @@ -1,92 +0,0 @@ -From patchwork Sun Dec 15 22:14:11 2024 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Daniel Golle -X-Patchwork-Id: 13909006 -Date: Sun, 15 Dec 2024 22:14:11 +0000 -From: Daniel Golle -To: Michael Turquette , - Stephen Boyd , Matthias Brugger , - AngeloGioacchino Del Regno , - Alexandre Mergnat , - Geert Uytterhoeven , - Daniel Golle , - Uwe =?iso-8859-1?q?Kleine-K=F6nig?= , - Miles Chen , Chen-Yu Tsai , - Frank Wunderlich , John Crispin , - linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, - linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, - stable@vger.kernel.org -Subject: [PATCH 2/5] clk: mediatek: mt2701-aud: fix conversion to - mtk_clk_simple_probe -Message-ID: - -References: - -Precedence: bulk -X-Mailing-List: linux-clk@vger.kernel.org -List-Id: -List-Subscribe: -List-Unsubscribe: -MIME-Version: 1.0 -Content-Disposition: inline -In-Reply-To: - - -Some of the audio subsystem clocks defined in clk-mt2701.h aren't -actually used by the driver. This broke conversion to -mtk_clk_simple_probe which expects that the highest possible clk id is -defined by the ARRAY_SIZE. - -Add additional dummy clocks to fill the gaps and remain compatible with -the existing DT bindings. - -Fixes: 0f69a423c458 ("clk: mediatek: Switch to mtk_clk_simple_probe() where possible") -Cc: stable@vger.kernel.org -Signed-off-by: Daniel Golle ---- - drivers/clk/mediatek/clk-mt2701-aud.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/clk/mediatek/clk-mt2701-aud.c -+++ b/drivers/clk/mediatek/clk-mt2701-aud.c -@@ -55,10 +55,16 @@ static const struct mtk_gate audio_clks[ - GATE_DUMMY(CLK_DUMMY, "aud_dummy"), - /* AUDIO0 */ - GATE_AUDIO0(CLK_AUD_AFE, "audio_afe", "aud_intbus_sel", 2), -+ GATE_DUMMY(CLK_AUD_LRCK_DETECT, "audio_lrck_detect_dummy"), -+ GATE_DUMMY(CLK_AUD_I2S, "audio_i2c_dummy"), -+ GATE_DUMMY(CLK_AUD_APLL_TUNER, "audio_apll_tuner_dummy"), - GATE_AUDIO0(CLK_AUD_HDMI, "audio_hdmi", "audpll_sel", 20), - GATE_AUDIO0(CLK_AUD_SPDF, "audio_spdf", "audpll_sel", 21), - GATE_AUDIO0(CLK_AUD_SPDF2, "audio_spdf2", "audpll_sel", 22), - GATE_AUDIO0(CLK_AUD_APLL, "audio_apll", "audpll_sel", 23), -+ GATE_DUMMY(CLK_AUD_TML, "audio_tml_dummy"), -+ GATE_DUMMY(CLK_AUD_AHB_IDLE_EXT, "audio_ahb_idle_ext_dummy"), -+ GATE_DUMMY(CLK_AUD_AHB_IDLE_INT, "audio_ahb_idle_int_dummy"), - /* AUDIO1 */ - GATE_AUDIO1(CLK_AUD_I2SIN1, "audio_i2sin1", "aud_mux1_sel", 0), - GATE_AUDIO1(CLK_AUD_I2SIN2, "audio_i2sin2", "aud_mux1_sel", 1), -@@ -76,10 +82,12 @@ static const struct mtk_gate audio_clks[ - GATE_AUDIO1(CLK_AUD_ASRCI2, "audio_asrci2", "asm_h_sel", 13), - GATE_AUDIO1(CLK_AUD_ASRCO1, "audio_asrco1", "asm_h_sel", 14), - GATE_AUDIO1(CLK_AUD_ASRCO2, "audio_asrco2", "asm_h_sel", 15), -+ GATE_DUMMY(CLK_AUD_HDMIRX, "audio_hdmirx_dummy"), - GATE_AUDIO1(CLK_AUD_INTDIR, "audio_intdir", "intdir_sel", 20), - GATE_AUDIO1(CLK_AUD_A1SYS, "audio_a1sys", "aud_mux1_sel", 21), - GATE_AUDIO1(CLK_AUD_A2SYS, "audio_a2sys", "aud_mux2_sel", 22), - GATE_AUDIO1(CLK_AUD_AFE_CONN, "audio_afe_conn", "aud_mux1_sel", 23), -+ GATE_DUMMY(CLK_AUD_AFE_PCMIF, "audio_afe_pcmif_dummy"), - GATE_AUDIO1(CLK_AUD_AFE_MRGIF, "audio_afe_mrgif", "aud_mux1_sel", 25), - /* AUDIO2 */ - GATE_AUDIO2(CLK_AUD_MMIF_UL1, "audio_ul1", "aud_mux1_sel", 0), -@@ -100,6 +108,8 @@ static const struct mtk_gate audio_clks[ - GATE_AUDIO2(CLK_AUD_MMIF_AWB2, "audio_awb2", "aud_mux1_sel", 15), - GATE_AUDIO2(CLK_AUD_MMIF_DAI, "audio_dai", "aud_mux1_sel", 16), - /* AUDIO3 */ -+ GATE_DUMMY(CLK_AUD_DMIC1, "audio_dmic1_dummy"), -+ GATE_DUMMY(CLK_AUD_DMIC2, "audio_dmic2_dummy"), - GATE_AUDIO3(CLK_AUD_ASRCI3, "audio_asrci3", "asm_h_sel", 2), - GATE_AUDIO3(CLK_AUD_ASRCI4, "audio_asrci4", "asm_h_sel", 3), - GATE_AUDIO3(CLK_AUD_ASRCI5, "audio_asrci5", "asm_h_sel", 4), diff --git a/target/linux/mediatek/patches-6.6/258-clk-mediatek-mt2701-bdp-add-missing-dummy-clk.patch b/target/linux/mediatek/patches-6.6/258-clk-mediatek-mt2701-bdp-add-missing-dummy-clk.patch deleted file mode 100644 index 0542bcae4e..0000000000 --- a/target/linux/mediatek/patches-6.6/258-clk-mediatek-mt2701-bdp-add-missing-dummy-clk.patch +++ /dev/null @@ -1,55 +0,0 @@ -From patchwork Sun Dec 15 22:14:24 2024 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Daniel Golle -X-Patchwork-Id: 13909007 -Date: Sun, 15 Dec 2024 22:14:24 +0000 -From: Daniel Golle -To: Michael Turquette , - Stephen Boyd , Matthias Brugger , - AngeloGioacchino Del Regno , - Alexandre Mergnat , - Geert Uytterhoeven , - Daniel Golle , - Uwe =?iso-8859-1?q?Kleine-K=F6nig?= , - Miles Chen , Chen-Yu Tsai , - Frank Wunderlich , John Crispin , - linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, - linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, - stable@vger.kernel.org -Subject: [PATCH 3/5] clk: mediatek: mt2701-bdp: add missing dummy clk -Message-ID: - -References: - -Precedence: bulk -X-Mailing-List: linux-clk@vger.kernel.org -List-Id: -List-Subscribe: -List-Unsubscribe: -MIME-Version: 1.0 -Content-Disposition: inline -In-Reply-To: - - -Add dummy clk for index 0 which was missed during the conversion to -mtk_clk_simple_probe(). - -Fixes: 973d1607d936 ("clk: mediatek: mt2701: use mtk_clk_simple_probe to simplify driver") -Cc: stable@vger.kernel.org -Signed-off-by: Daniel Golle ---- - drivers/clk/mediatek/clk-mt2701-bdp.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/clk/mediatek/clk-mt2701-bdp.c -+++ b/drivers/clk/mediatek/clk-mt2701-bdp.c -@@ -31,6 +31,7 @@ static const struct mtk_gate_regs bdp1_c - GATE_MTK(_id, _name, _parent, &bdp1_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv) - - static const struct mtk_gate bdp_clks[] = { -+ GATE_DUMMY(CLK_DUMMY, "bdp_dummy"), - GATE_BDP0(CLK_BDP_BRG_BA, "brg_baclk", "mm_sel", 0), - GATE_BDP0(CLK_BDP_BRG_DRAM, "brg_dram", "mm_sel", 1), - GATE_BDP0(CLK_BDP_LARB_DRAM, "larb_dram", "mm_sel", 2), diff --git a/target/linux/mediatek/patches-6.6/259-clk-mediatek-mt2701-mm-add-missing-dummy-clk.patch b/target/linux/mediatek/patches-6.6/259-clk-mediatek-mt2701-mm-add-missing-dummy-clk.patch deleted file mode 100644 index 526fdd9d1a..0000000000 --- a/target/linux/mediatek/patches-6.6/259-clk-mediatek-mt2701-mm-add-missing-dummy-clk.patch +++ /dev/null @@ -1,56 +0,0 @@ -From patchwork Sun Dec 15 22:14:34 2024 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Daniel Golle -X-Patchwork-Id: 13909008 -Date: Sun, 15 Dec 2024 22:14:34 +0000 -From: Daniel Golle -To: Michael Turquette , - Stephen Boyd , Matthias Brugger , - AngeloGioacchino Del Regno , - Alexandre Mergnat , - Geert Uytterhoeven , - Daniel Golle , - Uwe =?iso-8859-1?q?Kleine-K=F6nig?= , - Miles Chen , Chen-Yu Tsai , - Frank Wunderlich , John Crispin , - linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, - linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, - stable@vger.kernel.org -Subject: [PATCH 4/5] clk: mediatek: mt2701-mm: add missing dummy clk -Message-ID: - <9de23440fcba1ffef9e77d58c9f505105e57a250.1734300668.git.daniel@makrotopia.org> -References: - -Precedence: bulk -X-Mailing-List: linux-clk@vger.kernel.org -List-Id: -List-Subscribe: -List-Unsubscribe: -MIME-Version: 1.0 -Content-Disposition: inline -In-Reply-To: - - -Add dummy clk which was missed during the conversion to -mtk_clk_pdev_probe() and is required for the existing DT bindings to -keep working. - -Fixes: 65c10c50c9c7 ("clk: mediatek: Migrate to mtk_clk_pdev_probe() for multimedia clocks") -Cc: stable@vger.kernel.org -Signed-off-by: Daniel Golle ---- - drivers/clk/mediatek/clk-mt2701-mm.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/clk/mediatek/clk-mt2701-mm.c -+++ b/drivers/clk/mediatek/clk-mt2701-mm.c -@@ -31,6 +31,7 @@ static const struct mtk_gate_regs disp1_ - GATE_MTK(_id, _name, _parent, &disp1_cg_regs, _shift, &mtk_clk_gate_ops_setclr) - - static const struct mtk_gate mm_clks[] = { -+ GATE_DUMMY(CLK_DUMMY, "mm_dummy"), - GATE_DISP0(CLK_MM_SMI_COMMON, "mm_smi_comm", "mm_sel", 0), - GATE_DISP0(CLK_MM_SMI_LARB0, "mm_smi_larb0", "mm_sel", 1), - GATE_DISP0(CLK_MM_CMDQ, "mm_cmdq", "mm_sel", 2), diff --git a/target/linux/mediatek/patches-6.6/260-clk-mediatek-mt2701-img-add-missing-dummy-clk.patch b/target/linux/mediatek/patches-6.6/260-clk-mediatek-mt2701-img-add-missing-dummy-clk.patch deleted file mode 100644 index a86f158106..0000000000 --- a/target/linux/mediatek/patches-6.6/260-clk-mediatek-mt2701-img-add-missing-dummy-clk.patch +++ /dev/null @@ -1,55 +0,0 @@ -From patchwork Sun Dec 15 22:14:48 2024 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Daniel Golle -X-Patchwork-Id: 13909009 -Date: Sun, 15 Dec 2024 22:14:48 +0000 -From: Daniel Golle -To: Michael Turquette , - Stephen Boyd , Matthias Brugger , - AngeloGioacchino Del Regno , - Alexandre Mergnat , - Geert Uytterhoeven , - Daniel Golle , - Uwe =?iso-8859-1?q?Kleine-K=F6nig?= , - Miles Chen , Chen-Yu Tsai , - Frank Wunderlich , John Crispin , - linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, - linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, - stable@vger.kernel.org -Subject: [PATCH 5/5] clk: mediatek: mt2701-img: add missing dummy clk -Message-ID: - -References: - -Precedence: bulk -X-Mailing-List: linux-clk@vger.kernel.org -List-Id: -List-Subscribe: -List-Unsubscribe: -MIME-Version: 1.0 -Content-Disposition: inline -In-Reply-To: - - -Add dummy clk for index 0 which was missed during the conversion to -mtk_clk_simple_probe(). - -Fixes: 973d1607d936 ("clk: mediatek: mt2701: use mtk_clk_simple_probe to simplify driver") -Cc: stable@vger.kernel.org -Signed-off-by: Daniel Golle ---- - drivers/clk/mediatek/clk-mt2701-img.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/clk/mediatek/clk-mt2701-img.c -+++ b/drivers/clk/mediatek/clk-mt2701-img.c -@@ -22,6 +22,7 @@ static const struct mtk_gate_regs img_cg - GATE_MTK(_id, _name, _parent, &img_cg_regs, _shift, &mtk_clk_gate_ops_setclr) - - static const struct mtk_gate img_clks[] = { -+ GATE_DUMMY(CLK_DUMMY, "img_dummy"), - GATE_IMG(CLK_IMG_SMI_COMM, "img_smi_comm", "mm_sel", 0), - GATE_IMG(CLK_IMG_RESZ, "img_resz", "mm_sel", 1), - GATE_IMG(CLK_IMG_JPGDEC_SMI, "img_jpgdec_smi", "mm_sel", 5), diff --git a/target/linux/qualcommbe/patches-6.6/006-v6.11-clk-qcom-common-commonize-qcom_cc_really_probe.patch b/target/linux/qualcommbe/patches-6.6/006-v6.11-clk-qcom-common-commonize-qcom_cc_really_probe.patch index 8d4153d70c..98a6ed7372 100644 --- a/target/linux/qualcommbe/patches-6.6/006-v6.11-clk-qcom-common-commonize-qcom_cc_really_probe.patch +++ b/target/linux/qualcommbe/patches-6.6/006-v6.11-clk-qcom-common-commonize-qcom_cc_really_probe.patch @@ -320,7 +320,7 @@ Signed-off-by: Bjorn Andersson static struct platform_driver disp_cc_sm6125_driver = { --- a/drivers/clk/qcom/dispcc-sm6350.c +++ b/drivers/clk/qcom/dispcc-sm6350.c -@@ -761,7 +761,7 @@ static int disp_cc_sm6350_probe(struct p +@@ -760,7 +760,7 @@ static int disp_cc_sm6350_probe(struct p clk_fabia_pll_configure(&disp_cc_pll0, regmap, &disp_cc_pll0_config); @@ -661,7 +661,7 @@ Signed-off-by: Bjorn Andersson static struct platform_driver gcc_sm6125_driver = { --- a/drivers/clk/qcom/gcc-sm6350.c +++ b/drivers/clk/qcom/gcc-sm6350.c -@@ -2559,7 +2559,7 @@ static int gcc_sm6350_probe(struct platf +@@ -2565,7 +2565,7 @@ static int gcc_sm6350_probe(struct platf if (ret) return ret; diff --git a/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch index b545667ce3..dc4f2ecd9a 100644 --- a/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch +++ b/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch @@ -13,7 +13,7 @@ Signed-off-by: John Crispin --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c -@@ -3271,6 +3271,18 @@ static const struct usb_device_id uvc_id +@@ -3269,6 +3269,18 @@ static const struct usb_device_id uvc_id .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) }, @@ -64,7 +64,7 @@ Signed-off-by: John Crispin #include -@@ -1275,9 +1280,149 @@ static void uvc_video_decode_data(struct +@@ -1296,9 +1301,149 @@ static void uvc_video_decode_data(struct uvc_urb->async_operations++; } @@ -214,7 +214,7 @@ Signed-off-by: John Crispin /* Mark the buffer as done if the EOF marker is set. */ if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) { uvc_dbg(stream->dev, FRAME, "Frame complete (EOF found)\n"); -@@ -1859,6 +2004,8 @@ static int uvc_init_video_isoc(struct uv +@@ -1880,6 +2025,8 @@ static int uvc_init_video_isoc(struct uv if (npackets == 0) return -ENOMEM; @@ -234,7 +234,7 @@ Signed-off-by: John Crispin /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 -@@ -585,6 +587,7 @@ struct uvc_device { +@@ -586,6 +588,7 @@ struct uvc_device { struct input_dev *input; char input_phys[64]; From 2b0c973895751f10bc8f4b1d8f6e6ce2c7b107d4 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Mon, 3 Feb 2025 10:20:41 +0800 Subject: [PATCH 5/7] tools: fakeroot: update to 1.37 There are no patches that need to be refreshed. changelog: https://salsa.debian.org/clint/fakeroot/-/blob/debian/1.37-1/debian/changelog?ref_type=tags Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/17879 Signed-off-by: Nick Hainke --- tools/fakeroot/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/fakeroot/Makefile b/tools/fakeroot/Makefile index 22b2c8f24f..d03b03be27 100644 --- a/tools/fakeroot/Makefile +++ b/tools/fakeroot/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fakeroot -PKG_VERSION:=1.36 +PKG_VERSION:=1.37 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=@DEBIAN/pool/main/f/fakeroot -PKG_HASH:=7fe3cf3daf95ee93b47e568e85f4d341a1f9ae91766b4f9a9cdc29737dea4988 +PKG_HASH:=9831cc912bc1da6dadac15699c5a07a82c00d6f0dd5c15ec02e20908dd527d3a PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf From 70586f574d93bf5b48f878a3c2a264b0249830c1 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 29 Dec 2024 22:55:04 +0100 Subject: [PATCH 6/7] ipq40xx: convert GL.iNet GL-S1300 to DSA Convert the router to DSA. Co-Developed-by: Matt Beaumont Tested-by: Matt Beaumont Link: https://github.com/openwrt/openwrt/pull/12478 Signed-off-by: Nick Hainke --- .../ipq40xx/base-files/etc/board.d/02_network | 1 + .../boot/dts/qcom/qcom-ipq4029-gl-s1300.dts | 39 +++++++++++++++++++ target/linux/ipq40xx/image/generic.mk | 3 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 549e1ac0c9..57dca0e1a2 100644 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -84,6 +84,7 @@ ipq40xx_setup_interfaces() ;; glinet,gl-a1300|\ glinet,gl-b1300|\ + glinet,gl-s1300|\ mobipromo,cm520-79f) ucidef_set_interfaces_lan_wan "lan1 lan2" "wan" ;; diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-gl-s1300.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-gl-s1300.dts index e6d74da864..6d7a0aa2cd 100644 --- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-gl-s1300.dts +++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-gl-s1300.dts @@ -197,6 +197,14 @@ precal_art_5000: precal@5000 { reg = <0x5000 0x2f20>; }; + + macaddr_art_0: macaddr@0 { + reg = <0x0 0x6>; + }; + + macaddr_art_6: macaddr@6 { + reg = <0x6 0x6>; + }; }; }; @@ -348,6 +356,37 @@ status = "okay"; }; +&gmac { + status = "okay"; + + nvmem-cells = <&macaddr_art_0>; + nvmem-cell-names = "mac-address"; +}; + +&switch { + status = "okay"; +}; + +&swport3 { + status = "okay"; + + label = "lan2"; +}; + +&swport4 { + status = "okay"; + + label = "lan1"; +}; + +&swport5 { + status = "okay"; + + label = "wan"; + nvmem-cells = <&macaddr_art_6>; + nvmem-cell-names = "mac-address"; +}; + &wifi0 { status = "okay"; nvmem-cell-names = "pre-calibration"; diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 21841f4bf1..2071059444 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -642,8 +642,7 @@ define Device/glinet_gl-s1300 IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata DEVICE_PACKAGES := kmod-fs-ext4 kmod-mmc kmod-spi-dev endef -# Missing DSA Setup -#TARGET_DEVICES += glinet_gl-s1300 +TARGET_DEVICES += glinet_gl-s1300 define Device/kernel-size-6350-8300 DEVICE_COMPAT_VERSION := 2.0 From 6936deac67e5f0d950bcc26e56bc90b15b12db12 Mon Sep 17 00:00:00 2001 From: Kuan-Yi Li Date: Fri, 21 Feb 2025 05:26:15 +0800 Subject: [PATCH 7/7] imagebuilder: fix addition of local packages Since alpinelinux/apk-tools@460d62ee743c, relative paths are no longer accepted in repositories file. Add local repository in APK command instead to fix this issue. Fixes: 83d2d21904e0 ("apk: update to Git HEAD (2025-02-08)") Fixes: https://github.com/openwrt/openwrt/issues/18032 Signed-off-by: Kuan-Yi Li Link: https://github.com/openwrt/openwrt/pull/18048 Signed-off-by: Robert Marko --- target/imagebuilder/Makefile | 1 - target/imagebuilder/files/Makefile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index afc97550c1..6fca91939f 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -49,7 +49,6 @@ ifneq ($(CONFIG_USE_APK),) $(call FeedSourcesAppendAPK,$(PKG_BUILD_DIR)/repositories) $(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories endif - echo "packages/packages.adb" >> $(PKG_BUILD_DIR)/repositories $(INSTALL_DATA) ./files/README.apk.md $(PKG_BUILD_DIR)/packages/README.md else diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index b27021d600..d8c1c3c5e8 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -99,6 +99,7 @@ OPKG:=$(call opkg,$(TARGET_DIR)) \ export APK_KEYS:=$(TOPDIR)/keys APK:=$(call apk,$(TARGET_DIR)) \ --repositories-file $(TOPDIR)/repositories \ + --repository $(PACKAGE_DIR)/packages.adb \ $(if $(CONFIG_SIGNATURE_CHECK),,--allow-untrusted) \ --cache-dir $(DL_DIR)