From 0530c490ee0091cfb97de2aa209bbb73412cca6c Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Mon, 2 Aug 2021 13:41:21 +0200 Subject: [PATCH 01/23] 6in4: delete tunnel on interface teardown Delete tunnel on 6in4 interface teardown. Should solve problem related to tunnel stuck on restart loop with "Unknown Command" on tunnel restart due to wan connection drop. Fixes: FS#3690 Signed-off-by: Ansuel Smith --- package/network/ipv6/6in4/Makefile | 2 +- package/network/ipv6/6in4/files/6in4.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile index 08696ef7a8..331295ba7a 100644 --- a/package/network/ipv6/6in4/Makefile +++ b/package/network/ipv6/6in4/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6in4 -PKG_RELEASE:=26 +PKG_RELEASE:=27 PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh index 5b5c7b36af..d0904952fd 100755 --- a/package/network/ipv6/6in4/files/6in4.sh +++ b/package/network/ipv6/6in4/files/6in4.sh @@ -138,6 +138,8 @@ proto_6in4_setup() { proto_6in4_teardown() { local cfg="$1" + local link="6in4-$cfg" + ip link del $link } proto_6in4_init_config() { From cbb42a44cae4f7de9d72fef85123c1dd9896a4b5 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 12 Aug 2021 22:19:45 +0200 Subject: [PATCH 02/23] rockchip: add missing Kconfig symbols Signed-off-by: David Bauer --- target/linux/rockchip/armv8/config-5.4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4 index ee6a0021b5..f13b59addf 100644 --- a/target/linux/rockchip/armv8/config-5.4 +++ b/target/linux/rockchip/armv8/config-5.4 @@ -148,6 +148,7 @@ CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRCT10DIF=y +# CONFIG_CRYPTO_DEV_ROCKCHIP is not set CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_MANAGER=y @@ -175,6 +176,7 @@ CONFIG_DMA_REMAP=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_DNOTIFY=y CONFIG_DRM_RCAR_WRITEBACK=y +# CONFIG_DRM_ROCKCHIP is not set CONFIG_DTC=y CONFIG_DT_IDLE_STATES=y CONFIG_DUMMY_CONSOLE=y @@ -487,6 +489,7 @@ CONFIG_ROCKCHIP_IOMMU=y CONFIG_ROCKCHIP_MBOX=y CONFIG_ROCKCHIP_PHY=y CONFIG_ROCKCHIP_PM_DOMAINS=y +# CONFIG_ROCKCHIP_SARADC is not set CONFIG_ROCKCHIP_THERMAL=y CONFIG_ROCKCHIP_TIMER=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y @@ -530,6 +533,7 @@ CONFIG_SG_POOL=y CONFIG_SIMPLE_PM_BUS=y CONFIG_SLUB_DEBUG=y CONFIG_SMP=y +# CONFIG_SND_SOC_ROCKCHIP is not set CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_MANUAL=y From 1d344c801ae0ab1d922051107d875cbe1a7f6937 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 12 Aug 2021 23:22:08 +0200 Subject: [PATCH 03/23] tegra: add missing Kconfig symbol Signed-off-by: David Bauer --- target/linux/tegra/config-5.10 | 1 + target/linux/tegra/config-5.4 | 1 + 2 files changed, 2 insertions(+) diff --git a/target/linux/tegra/config-5.10 b/target/linux/tegra/config-5.10 index 5328c5fc31..a99ff20447 100644 --- a/target/linux/tegra/config-5.10 +++ b/target/linux/tegra/config-5.10 @@ -484,6 +484,7 @@ CONFIG_USE_OF=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_WATCHDOG_CORE=y +# CONFIG_USB_XHCI_TEGRA is not set CONFIG_XPS=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4 index 632c4128ce..c2868fedbe 100644 --- a/target/linux/tegra/config-5.4 +++ b/target/linux/tegra/config-5.4 @@ -469,6 +469,7 @@ CONFIG_USE_OF=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_WATCHDOG_CORE=y +# CONFIG_USB_XHCI_TEGRA is not set CONFIG_XPS=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y From 101c0c00a7143a1e50e4c0923f0af88b5176f6ed Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 12 Aug 2021 23:40:32 +0200 Subject: [PATCH 04/23] mediatek: add missing config symbols Signed-off-by: David Bauer --- target/linux/mediatek/mt7623/config-5.10 | 12 ++++++++++++ target/linux/mediatek/mt7629/config-5.4 | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/target/linux/mediatek/mt7623/config-5.10 b/target/linux/mediatek/mt7623/config-5.10 index 9cbee56643..d6e00c2d05 100644 --- a/target/linux/mediatek/mt7623/config-5.10 +++ b/target/linux/mediatek/mt7623/config-5.10 @@ -166,6 +166,18 @@ CONFIG_DRM_MEDIATEK=y CONFIG_DRM_MEDIATEK_HDMI=y CONFIG_DRM_MIPI_DSI=y CONFIG_DRM_PANEL=y +# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set +# CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set +# CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set +# CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set +# CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set +# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set +# CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set +# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set +# CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set CONFIG_DRM_PANEL_BRIDGE=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_SCHED=y diff --git a/target/linux/mediatek/mt7629/config-5.4 b/target/linux/mediatek/mt7629/config-5.4 index ca27a4f62c..7a77c7aafa 100644 --- a/target/linux/mediatek/mt7629/config-5.4 +++ b/target/linux/mediatek/mt7629/config-5.4 @@ -204,6 +204,7 @@ CONFIG_HOTPLUG_CPU=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_MTK=y CONFIG_HZ_FIXED=0 +# CONFIG_I2C_MT65XX is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_IO_URING=y CONFIG_IRQCHIP=y @@ -229,6 +230,7 @@ CONFIG_MACH_MT7629=y # CONFIG_MACH_MT8135 is not set CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y +# CONFIG_MEDIATEK_MT6577_AUXADC is not set CONFIG_MEDIATEK_WATCHDOG=y CONFIG_MEMFD_CREATE=y CONFIG_MFD_SYSCON=y @@ -256,6 +258,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTK_INFRACFG=y # CONFIG_MTK_PMIC_WRAP is not set CONFIG_MTK_SCPSYS=y +# CONFIG_MTK_THERMAL is not set CONFIG_MTK_TIMER=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y @@ -321,6 +324,7 @@ CONFIG_REGMAP_MMIO=y CONFIG_RESET_CONTROLLER=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y +# CONFIG_RTL8367S_GSW is not set CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_SCSI=y CONFIG_SERIAL_8250_FSL=y @@ -334,6 +338,8 @@ CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y # CONFIG_SND_SOC_MT6359 is not set +# CONFIG_SND_SOC_MT6797 is not set +# CONFIG_SND_SOC_MT8183 is not set CONFIG_SPARSE_IRQ=y CONFIG_SPI=y CONFIG_SPI_MASTER=y From 0f3f5d47d3720014960bd3d54e60163221cb5c26 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 13 Aug 2021 00:50:49 +0200 Subject: [PATCH 05/23] bcm4908: add missing config symbol Signed-off-by: David Bauer --- target/linux/bcm4908/config-5.4 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/bcm4908/config-5.4 b/target/linux/bcm4908/config-5.4 index 6f43a822c8..cc3b88cb76 100644 --- a/target/linux/bcm4908/config-5.4 +++ b/target/linux/bcm4908/config-5.4 @@ -39,6 +39,7 @@ CONFIG_B53=y # CONFIG_B53_MDIO_DRIVER is not set # CONFIG_B53_MMAP_DRIVER is not set # CONFIG_B53_SERDES is not set +# CONFIG_B53_SPI_DRIVER is not set # CONFIG_B53_SRAB_DRIVER is not set CONFIG_BCM4908_ENET=y CONFIG_BCM7XXX_PHY=y From 5181af5585c8aab0a04d2bd95c41165d40decd48 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 13 Aug 2021 04:45:17 +0100 Subject: [PATCH 06/23] procd: update to git HEAD 9f233f5 system: make rootfs type accessible through board call Signed-off-by: Daniel Golle --- package/system/procd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index efd2fc32b8..ccd0a9c751 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2021-08-05 -PKG_SOURCE_VERSION:=f5d9b14fea85e3272cac5200fb32a5c99ba7fdff -PKG_MIRROR_HASH:=0be2b84480d63a431721bf01ca95f927717f11c6cecccd1fc7c0e7ea6f2d4e51 +PKG_SOURCE_DATE:=2021-08-13 +PKG_SOURCE_VERSION:=9f233f555f80d1c416656c04ab81d19edc738f07 +PKG_MIRROR_HASH:=01cdadba9e3a8848342f40383ff61cdc91516c9198790ca49dcc6837cdd83351 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From b9162a9c85a5c22ed15ec539b0042cf5167f8a70 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 14 Aug 2021 02:20:40 +0200 Subject: [PATCH 07/23] ipq40xx: increase EX6150v2 SPI frequency The chip supports clock speeds up to 50 MHz, however it won't even read the chip-id correctly at this frequency. 45 MHz however works reliable. Signed-off-by: David Bauer --- .../ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi index c026f70d05..dbf9a02a29 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi @@ -201,7 +201,7 @@ mx25l12805d@0 { compatible = "jedec,spi-nor"; reg = <0>; - spi-max-frequency = <24000000>; + spi-max-frequency = <45000000>; partitions { compatible = "fixed-partitions"; From 685c790e9f0f44f3962276dbaddb784cce16423d Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 14 Aug 2021 00:22:28 +0200 Subject: [PATCH 08/23] ipq40xx: ar40xx: use FIELD_GET macro This improves code readability. Signed-off-by: David Bauer --- .../linux/ipq40xx/files/drivers/net/phy/ar40xx.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c index c35ba2799f..a33bc0de2c 100644 --- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c +++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c @@ -13,6 +13,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include #include @@ -1336,13 +1337,13 @@ ar40xx_sw_mac_polling_task(struct ar40xx_priv *priv) for (i = 1; i < AR40XX_NUM_PORTS; ++i) { port_phy_status[i] = mdiobus_read(bus, i-1, AR40XX_PHY_SPEC_STATUS); - speed = link = duplex = port_phy_status[i]; - speed &= AR40XX_PHY_SPEC_STATUS_SPEED; - speed >>= 14; - link &= AR40XX_PHY_SPEC_STATUS_LINK; - link >>= 10; - duplex &= AR40XX_PHY_SPEC_STATUS_DUPLEX; - duplex >>= 13; + + speed = FIELD_GET(AR40XX_PHY_SPEC_STATUS_SPEED, + port_phy_status[i]); + link = FIELD_GET(AR40XX_PHY_SPEC_STATUS_LINK, + port_phy_status[i]); + duplex = FIELD_GET(AR40XX_PHY_SPEC_STATUS_DUPLEX, + port_phy_status[i]); if (link != priv->ar40xx_port_old_link[i]) { ++link_cnt[i]; From 4d81f087715524994448ecaefd3ca87c8ba7e0a3 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 13 Aug 2021 23:28:44 +0200 Subject: [PATCH 09/23] ipq40xx: ar40xx: reset port status register This resolves incosnsitencies of the configured RX / TX flow control modes between different boards or bootloaders. Signed-off-by: David Bauer --- target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c index a33bc0de2c..f7ce42b9ff 100644 --- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c +++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c @@ -1199,8 +1199,7 @@ ar40xx_init_port(struct ar40xx_priv *priv, int port) { u32 t; - ar40xx_rmw(priv, AR40XX_REG_PORT_STATUS(port), - AR40XX_PORT_AUTO_LINK_EN, 0); + ar40xx_write(priv, AR40XX_REG_PORT_STATUS(port), 0); ar40xx_write(priv, AR40XX_REG_PORT_HEADER(port), 0); From ce2f31254ad6af35c8cba7e71b708e11d8af5249 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Mon, 9 Aug 2021 22:05:05 +0100 Subject: [PATCH 10/23] kernel: bump 5.10 to 5.10.57 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra --- include/kernel-version.mk | 4 ++-- .../0028-NET-lantiq-various-etop-fixes.patch | 4 ++-- .../patches-5.10/110-er200-ethernet_probe_order.patch | 4 ++-- .../700-allocate_interface_by_label.patch | 11 ++++++----- .../701-honor_sgmii_node_device_tree_status.patch | 2 +- ...700-net-ethernet-mediatek-support-net-labels.patch | 8 ++++---- ...-net-usb-r8152-add-LED-configuration-from-OF.patch | 8 ++++---- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 3ef1aba6c3..7e5798861b 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .138 -LINUX_VERSION-5.10 = .56 +LINUX_VERSION-5.10 = .57 LINUX_KERNEL_HASH-5.4.138 = a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657 -LINUX_KERNEL_HASH-5.10.56 = 4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b +LINUX_KERNEL_HASH-5.10.57 = 00bbaeaac17f82d9a6d93cbc42cafd39d3b2fa3a6087333503d2344fa5e3142d remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch b/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch index 0a42fd59e4..eb47010fa0 100644 --- a/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch +++ b/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch @@ -744,7 +744,7 @@ Signed-off-by: John Crispin res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { -@@ -651,31 +860,62 @@ ltq_etop_probe(struct platform_device *p +@@ -651,31 +859,62 @@ ltq_etop_probe(struct platform_device *p goto err_out; } @@ -822,7 +822,7 @@ Signed-off-by: John Crispin err = register_netdev(dev); if (err) -@@ -704,31 +946,22 @@ ltq_etop_remove(struct platform_device * +@@ -704,31 +943,22 @@ ltq_etop_remove(struct platform_device * return 0; } diff --git a/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch index 58312f0c45..b816e9c430 100644 --- a/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch +++ b/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch @@ -1,6 +1,6 @@ --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -683,6 +683,7 @@ static int cvm_oct_probe(struct platform +@@ -679,6 +679,7 @@ static int cvm_oct_probe(struct platform int interface; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; int qos; @@ -8,7 +8,7 @@ struct device_node *pip; int mtu_overhead = ETH_HLEN + ETH_FCS_LEN; -@@ -804,13 +805,19 @@ static int cvm_oct_probe(struct platform +@@ -800,13 +801,19 @@ static int cvm_oct_probe(struct platform } num_interfaces = cvmx_helper_get_number_of_interfaces(); diff --git a/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch b/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch index 4ee6f84660..e4dc3f96e5 100644 --- a/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch +++ b/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch @@ -12,19 +12,20 @@ Tested-by: Johannes Kimmel Signed-off-by: Roman Kuzmitskii --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -408,7 +408,11 @@ int cvm_oct_common_init(struct net_devic +@@ -407,8 +407,12 @@ static int cvm_oct_common_set_mac_addres int cvm_oct_common_init(struct net_device *dev) { struct octeon_ethernet *priv = netdev_priv(dev); + const u8 *label = NULL; - int ret; -+ + int ret; + + if (priv->of_node) + label = of_get_property(priv->of_node, "label", NULL); - ++ ret = of_get_mac_address(priv->of_node, dev->dev_addr); if (ret) -@@ -445,6 +448,9 @@ int cvm_oct_common_init(struct net_devic + eth_hw_addr_random(dev); +@@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic if (dev->netdev_ops->ndo_stop) dev->netdev_ops->ndo_stop(dev); diff --git a/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch b/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch index d11503c2c1..4185fcba70 100644 --- a/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch +++ b/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch @@ -12,7 +12,7 @@ Tested-by: Johannes Kimmel Signed-off-by: Roman Kuzmitskii --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -883,8 +883,10 @@ static int cvm_oct_probe(struct platform +@@ -880,8 +880,10 @@ static int cvm_oct_probe(struct platform case CVMX_HELPER_INTERFACE_MODE_SGMII: priv->phy_mode = PHY_INTERFACE_MODE_SGMII; diff --git a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch index 8f4a2d9848..531a23ef4a 100644 --- a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch @@ -14,7 +14,7 @@ Signed-off-by: René van Dorst --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2914,6 +2914,7 @@ static const struct net_device_ops mtk_n +@@ -2911,6 +2911,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,9 +22,9 @@ Signed-off-by: René van Dorst const __be32 *_id = of_get_property(np, "reg", NULL); phy_interface_t phy_mode; struct phylink *phylink; -@@ -3008,6 +3009,9 @@ static int mtk_add_mac(struct mtk_eth *e - - of_platform_device_create(np, NULL, NULL); +@@ -3003,6 +3004,9 @@ static int mtk_add_mac(struct mtk_eth *e + + eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; + if (name) + strlcpy(eth->netdev[id]->name, name, IFNAMSIZ); diff --git a/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch index c1e2a67272..f94d16c0ff 100644 --- a/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -5300,6 +5301,22 @@ static void rtl_tally_reset(struct r8152 +@@ -5301,6 +5302,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -5341,6 +5358,8 @@ static void r8152b_init(struct r8152 *tp +@@ -5342,6 +5359,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -5486,6 +5505,8 @@ static void r8153_init(struct r8152 *tp) +@@ -5487,6 +5506,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -5572,6 +5593,8 @@ static void r8153b_init(struct r8152 *tp +@@ -5573,6 +5594,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ From 6ec859d23155583fc04311aeba72ffacaaac1a3f Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Fri, 13 Aug 2021 00:16:29 +0100 Subject: [PATCH 11/23] kernel: bump 5.10 to 5.10.58 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra --- include/kernel-version.mk | 4 ++-- target/linux/generic/hack-5.10/205-kconfig-exit.patch | 2 +- target/linux/generic/hack-5.10/904-debloat_dma_buf.patch | 2 +- .../pending-5.10/683-of_net-add-mac-address-to-of-tree.patch | 4 ++-- .../linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 7e5798861b..9afb6ea632 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .138 -LINUX_VERSION-5.10 = .57 +LINUX_VERSION-5.10 = .58 LINUX_KERNEL_HASH-5.4.138 = a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657 -LINUX_KERNEL_HASH-5.10.57 = 00bbaeaac17f82d9a6d93cbc42cafd39d3b2fa3a6087333503d2344fa5e3142d +LINUX_KERNEL_HASH-5.10.58 = 732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/hack-5.10/205-kconfig-exit.patch b/target/linux/generic/hack-5.10/205-kconfig-exit.patch index 8931ad3270..c3fb7a1f99 100644 --- a/target/linux/generic/hack-5.10/205-kconfig-exit.patch +++ b/target/linux/generic/hack-5.10/205-kconfig-exit.patch @@ -1,6 +1,6 @@ --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c -@@ -212,6 +212,8 @@ static int conf_sym(struct menu *menu) +@@ -215,6 +215,8 @@ static int conf_sym(struct menu *menu) break; continue; case 0: diff --git a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch index 2f5f685063..4ed40bb63d 100644 --- a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch @@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -3051,6 +3051,7 @@ int wake_up_state(struct task_struct *p, +@@ -3049,6 +3049,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch index ea5883f037..02f7519f74 100644 --- a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch +++ b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch @@ -1,6 +1,6 @@ --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c -@@ -135,6 +135,26 @@ static int of_get_mac_address_mtd(struct +@@ -141,6 +141,26 @@ static int of_get_mac_address_mtd(struct return -EINVAL; } @@ -27,7 +27,7 @@ /** * Search the device tree for the best MAC address to use. 'mac-address' is -@@ -210,6 +230,7 @@ found: +@@ -216,6 +236,7 @@ found: if (!of_property_read_u32(np, "mac-address-increment", &mac_inc)) addr[inc_idx] += mac_inc; diff --git a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch index 381eaab5e2..b82e174d27 100644 --- a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2712,6 +2712,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2718,6 +2718,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; From 9126c0a59f60e07bcd6e5789a99c9a01b397c0d3 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 14 Aug 2021 18:56:12 +0100 Subject: [PATCH 12/23] fstools: update to git HEAD 629726d blockd: fix resource leak discovered by coverity scan 68ae639 libubi: fix several issues discovered by Coverity a77c4fa ubi: fix resource leak in legacy codepath 2e3aca2 block: fix two resources leaks discovered by Coverity Signed-off-by: Daniel Golle --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 8914c7c9bd..438cb8fee8 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=9cf9b4fd5951196813deb5c71dd24ad7af89348f7e647545b38760332953a8dc -PKG_SOURCE_DATE:=2021-08-05 -PKG_SOURCE_VERSION:=d4f01298105bb8c97e7ac0cad0e78f0ffe261354 +PKG_MIRROR_HASH:=faa4679562ae31cb6dbbc90b7f3f297294a51f7be1b12d10a5f0b7acfaae7252 +PKG_SOURCE_DATE:=2021-08-14 +PKG_SOURCE_VERSION:=2e3aca299ea7bbe74f219860510c4b34e77c7aa4 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 1235e2ee3bcfb678043a0b95ff1a6d4867af2561 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 14 Aug 2021 19:01:37 +0100 Subject: [PATCH 13/23] procd: update to git HEAD 48638ad hotplug-dispatch: yet another rare memory leak disovered by Coverity 459b3e8 jail: fix several issues discovered by Coverity 2562e2b ujail-console: add missing error handling discovered by coverity Signed-off-by: Daniel Golle --- package/system/procd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index ccd0a9c751..31e3f04d31 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2021-08-13 -PKG_SOURCE_VERSION:=9f233f555f80d1c416656c04ab81d19edc738f07 -PKG_MIRROR_HASH:=01cdadba9e3a8848342f40383ff61cdc91516c9198790ca49dcc6837cdd83351 +PKG_SOURCE_DATE:=2021-08-14 +PKG_SOURCE_VERSION:=2562e2b38d14fb1f337202feb6376fd447f30222 +PKG_MIRROR_HASH:=0b4a7a841d44d51b137713e85188b797016cafe9542bb0323b35e570ef758824 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 02e2723ef317c65b6ddfc70144b10f9936cfc2af Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 9 Aug 2021 10:47:18 -0400 Subject: [PATCH 14/23] kernel: bump 5.4 to 5.4.139 All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia --- include/kernel-version.mk | 4 ++-- ...50-0003-smsx95xx-fix-crimes-against-truesize.patch | 4 ++-- ...-Experimental-Enable-turbo_mode-and-packetsi.patch | 2 +- ...0005-Allow-mac-address-to-be-set-in-smsc95xx.patch | 4 ++-- ...cmgenet-Better-coalescing-parameter-defaults.patch | 2 +- .../950-0336-drm-v3d-The-third-IRQ-is-optional.patch | 2 +- ...0-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch | 2 +- ...1-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch | 2 +- ...t-broadcom-bcm4908_enet-support-TX-interrupt.patch | 6 +++--- .../0028-NET-lantiq-various-etop-fixes.patch | 4 ++-- ...rnet-mtk_eth_soc-add-support-for-coherent-DM.patch | 2 +- ...ta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch | 2 +- .../006-net-mvneta-add-basic-XDP-support.patch | 2 +- ...ta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch | 6 +++--- .../patches-5.4/110-er200-ethernet_probe_order.patch | 4 ++-- .../patches-5.4/700-allocate_interface_by_label.patch | 11 ++++++----- .../701-honor_sgmii_node_device_tree_status.patch | 2 +- ...401-net-ethernet-mediatek-support-net-labels.patch | 8 ++++---- .../990-NET-no-auto-carrier-off-support.patch | 2 +- .../703-include-linux-add-phy-ops-for-rtl838x.patch | 2 +- ...-net-usb-r8152-add-LED-configuration-from-OF.patch | 8 ++++---- 21 files changed, 41 insertions(+), 40 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 9afb6ea632..864c5f7bdc 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-5.4 = .138 +LINUX_VERSION-5.4 = .139 LINUX_VERSION-5.10 = .58 -LINUX_KERNEL_HASH-5.4.138 = a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657 +LINUX_KERNEL_HASH-5.4.139 = 0471d0ccb7953cdae7d235192588ac5d72344851969962676d1703e69084a37f LINUX_KERNEL_HASH-5.10.58 = 732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/bcm27xx/patches-5.4/950-0003-smsx95xx-fix-crimes-against-truesize.patch b/target/linux/bcm27xx/patches-5.4/950-0003-smsx95xx-fix-crimes-against-truesize.patch index 2355037880..fc27f60b09 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0003-smsx95xx-fix-crimes-against-truesize.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0003-smsx95xx-fix-crimes-against-truesize.patch @@ -25,7 +25,7 @@ Signed-off-by: Steve Glendinning static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data, int in_pm) { -@@ -1964,7 +1968,8 @@ static int smsc95xx_rx_fixup(struct usbn +@@ -1965,7 +1969,8 @@ static int smsc95xx_rx_fixup(struct usbn if (dev->net->features & NETIF_F_RXCSUM) smsc95xx_rx_csum_offload(skb); skb_trim(skb, skb->len - 4); /* remove fcs */ @@ -35,7 +35,7 @@ Signed-off-by: Steve Glendinning return 1; } -@@ -1982,7 +1987,8 @@ static int smsc95xx_rx_fixup(struct usbn +@@ -1983,7 +1988,8 @@ static int smsc95xx_rx_fixup(struct usbn if (dev->net->features & NETIF_F_RXCSUM) smsc95xx_rx_csum_offload(ax_skb); skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0004-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch b/target/linux/bcm27xx/patches-5.4/950-0004-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch index 90a0c15345..2a0e7736ae 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0004-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0004-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch @@ -22,7 +22,7 @@ See: http://forum.kodi.tv/showthread.php?tid=285288 static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data, int in_pm) { -@@ -1095,13 +1099,13 @@ static int smsc95xx_reset(struct usbnet +@@ -1096,13 +1100,13 @@ static int smsc95xx_reset(struct usbnet if (!turbo_mode) { burst_cap = 0; diff --git a/target/linux/bcm27xx/patches-5.4/950-0005-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/bcm27xx/patches-5.4/950-0005-Allow-mac-address-to-be-set-in-smsc95xx.patch index 47f6e97e1a..ba12276b9b 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0005-Allow-mac-address-to-be-set-in-smsc95xx.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0005-Allow-mac-address-to-be-set-in-smsc95xx.patch @@ -82,8 +82,8 @@ Signed-off-by: popcornmix + static void smsc95xx_init_mac_address(struct usbnet *dev) { - const u8 *mac_addr; -@@ -928,6 +980,10 @@ static void smsc95xx_init_mac_address(st + u8 mac_addr[ETH_ALEN]; +@@ -929,6 +981,10 @@ static void smsc95xx_init_mac_address(st } } diff --git a/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch index b245fbbbfd..6ab928ed33 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell /* Disable rate control for now */ bcmgenet_tdma_ring_writel(priv, index, flow_period_val, TDMA_FLOW_PERIOD); -@@ -3574,9 +3574,12 @@ static int bcmgenet_probe(struct platfor +@@ -3575,9 +3575,12 @@ static int bcmgenet_probe(struct platfor netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); /* Set default coalescing parameters */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch b/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch index 2f9eb20add..edb4ede525 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch @@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3475,7 +3475,7 @@ static int bcmgenet_probe(struct platfor +@@ -3476,7 +3476,7 @@ static int bcmgenet_probe(struct platfor priv = netdev_priv(dev); priv->irq0 = platform_get_irq(pdev, 0); priv->irq1 = platform_get_irq(pdev, 1); diff --git a/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch b/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch index 706244f5c8..6cf8a7c927 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell /* Reinitialize TDMA and RDMA and SW housekeeping */ ret = bcmgenet_init_dma(priv); -@@ -3665,7 +3673,7 @@ static int bcmgenet_resume(struct device +@@ -3666,7 +3674,7 @@ static int bcmgenet_resume(struct device bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC); /* Disable RX/TX DMA and flush TX queues */ diff --git a/target/linux/bcm4908/patches-5.4/074-v5.13-0001-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch b/target/linux/bcm4908/patches-5.4/074-v5.13-0001-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch index df004c0480..c4f336e671 100644 --- a/target/linux/bcm4908/patches-5.4/074-v5.13-0001-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch +++ b/target/linux/bcm4908/patches-5.4/074-v5.13-0001-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller #include #include #include -@@ -647,7 +649,9 @@ static int bcm4908_enet_probe(struct pla +@@ -647,7 +648,9 @@ static int bcm4908_enet_probe(struct pla return err; SET_NETDEV_DEV(netdev, &pdev->dev); diff --git a/target/linux/bcm4908/patches-5.4/074-v5.13-0003-net-broadcom-bcm4908_enet-support-TX-interrupt.patch b/target/linux/bcm4908/patches-5.4/074-v5.13-0003-net-broadcom-bcm4908_enet-support-TX-interrupt.patch index a20be2ae8b..03ac4b07bf 100644 --- a/target/linux/bcm4908/patches-5.4/074-v5.13-0003-net-broadcom-bcm4908_enet-support-TX-interrupt.patch +++ b/target/linux/bcm4908/patches-5.4/074-v5.13-0003-net-broadcom-bcm4908_enet-support-TX-interrupt.patch @@ -269,7 +269,7 @@ Signed-off-by: David S. Miller static int bcm4908_enet_change_mtu(struct net_device *netdev, int new_mtu) { struct bcm4908_enet *enet = netdev_priv(netdev); -@@ -642,6 +706,8 @@ static int bcm4908_enet_probe(struct pla +@@ -641,6 +705,8 @@ static int bcm4908_enet_probe(struct pla if (netdev->irq < 0) return netdev->irq; @@ -278,7 +278,7 @@ Signed-off-by: David S. Miller dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); err = bcm4908_enet_dma_alloc(enet); -@@ -658,7 +724,8 @@ static int bcm4908_enet_probe(struct pla +@@ -655,7 +721,8 @@ static int bcm4908_enet_probe(struct pla netdev->min_mtu = ETH_ZLEN; netdev->mtu = ETH_DATA_LEN; netdev->max_mtu = ENET_MTU_MAX; @@ -288,7 +288,7 @@ Signed-off-by: David S. Miller err = register_netdev(netdev); if (err) { -@@ -676,7 +743,8 @@ static int bcm4908_enet_remove(struct pl +@@ -673,7 +740,8 @@ static int bcm4908_enet_remove(struct pl struct bcm4908_enet *enet = platform_get_drvdata(pdev); unregister_netdev(enet->netdev); diff --git a/target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch b/target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch index 12a71fdad1..e3c987a7e6 100644 --- a/target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch +++ b/target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch @@ -744,7 +744,7 @@ Signed-off-by: John Crispin res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { -@@ -658,31 +867,60 @@ ltq_etop_probe(struct platform_device *p +@@ -658,31 +866,60 @@ ltq_etop_probe(struct platform_device *p goto err_out; } @@ -820,7 +820,7 @@ Signed-off-by: John Crispin err = register_netdev(dev); if (err) -@@ -711,31 +951,22 @@ ltq_etop_remove(struct platform_device * +@@ -711,31 +948,22 @@ ltq_etop_remove(struct platform_device * return 0; } diff --git a/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch index 3d62f40544..3f7660b14b 100644 --- a/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch +++ b/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) { ret = device_reset(eth->dev); if (ret) { -@@ -3106,6 +3114,16 @@ static int mtk_probe(struct platform_dev +@@ -3101,6 +3109,16 @@ static int mtk_probe(struct platform_dev } } diff --git a/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch b/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch index 4d9539adbb..869b22eefb 100644 --- a/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch +++ b/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch @@ -292,7 +292,7 @@ Signed-off-by: David S. Miller MVNETA_RX_BUF_SIZE(pp->pkt_size)); mvneta_rxq_bm_disable(pp, rxq); mvneta_rxq_fill(pp, rxq, rxq->size); -@@ -4715,7 +4720,7 @@ static int mvneta_probe(struct platform_ +@@ -4713,7 +4718,7 @@ static int mvneta_probe(struct platform_ SET_NETDEV_DEV(dev, &pdev->dev); pp->id = global_port_id++; diff --git a/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch b/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch index 4e42bf9307..33a7a27f43 100644 --- a/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch +++ b/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch @@ -300,7 +300,7 @@ Signed-off-by: David S. Miller }; static const struct ethtool_ops mvneta_eth_tool_ops = { -@@ -4720,7 +4850,7 @@ static int mvneta_probe(struct platform_ +@@ -4718,7 +4848,7 @@ static int mvneta_probe(struct platform_ SET_NETDEV_DEV(dev, &pdev->dev); pp->id = global_port_id++; diff --git a/target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch b/target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch index 61a588db70..1299f3f69b 100644 --- a/target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch +++ b/target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch @@ -38,7 +38,7 @@ Signed-off-by: David S. Miller mvreg_write(pp, MVNETA_ACC_MODE, MVNETA_ACC_MODE_EXT1); netdev_info(pp->dev, "fail to update MTU, fall back to software BM\n"); } -@@ -4991,7 +4991,6 @@ static int mvneta_probe(struct platform_ +@@ -4989,7 +4989,6 @@ static int mvneta_probe(struct platform_ SET_NETDEV_DEV(dev, &pdev->dev); pp->id = global_port_id++; @@ -46,7 +46,7 @@ Signed-off-by: David S. Miller /* Obtain access to BM resources if enabled and already initialized */ bm_node = of_parse_phandle(dn, "buffer-manager", 0); -@@ -5016,6 +5015,10 @@ static int mvneta_probe(struct platform_ +@@ -5014,6 +5013,10 @@ static int mvneta_probe(struct platform_ } of_node_put(bm_node); @@ -57,7 +57,7 @@ Signed-off-by: David S. Miller err = mvneta_init(&pdev->dev, pp); if (err < 0) goto err_netdev; -@@ -5173,6 +5176,7 @@ static int mvneta_resume(struct device * +@@ -5171,6 +5174,7 @@ static int mvneta_resume(struct device * err = mvneta_bm_port_init(pdev, pp); if (err < 0) { dev_info(&pdev->dev, "use SW buffer management\n"); diff --git a/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch index 7afa292757..1c04f5c57b 100644 --- a/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch +++ b/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch @@ -1,6 +1,6 @@ --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -683,6 +683,7 @@ static int cvm_oct_probe(struct platform +@@ -679,6 +679,7 @@ static int cvm_oct_probe(struct platform int interface; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; int qos; @@ -8,7 +8,7 @@ struct device_node *pip; int mtu_overhead = ETH_HLEN + ETH_FCS_LEN; -@@ -806,13 +807,19 @@ static int cvm_oct_probe(struct platform +@@ -802,13 +803,19 @@ static int cvm_oct_probe(struct platform } num_interfaces = cvmx_helper_get_number_of_interfaces(); diff --git a/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch b/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch index 4ee6f84660..e4dc3f96e5 100644 --- a/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch +++ b/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch @@ -12,19 +12,20 @@ Tested-by: Johannes Kimmel Signed-off-by: Roman Kuzmitskii --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -408,7 +408,11 @@ int cvm_oct_common_init(struct net_devic +@@ -407,8 +407,12 @@ static int cvm_oct_common_set_mac_addres int cvm_oct_common_init(struct net_device *dev) { struct octeon_ethernet *priv = netdev_priv(dev); + const u8 *label = NULL; - int ret; -+ + int ret; + + if (priv->of_node) + label = of_get_property(priv->of_node, "label", NULL); - ++ ret = of_get_mac_address(priv->of_node, dev->dev_addr); if (ret) -@@ -445,6 +448,9 @@ int cvm_oct_common_init(struct net_devic + eth_hw_addr_random(dev); +@@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic if (dev->netdev_ops->ndo_stop) dev->netdev_ops->ndo_stop(dev); diff --git a/target/linux/octeon/patches-5.4/701-honor_sgmii_node_device_tree_status.patch b/target/linux/octeon/patches-5.4/701-honor_sgmii_node_device_tree_status.patch index 9fb0c2f0a3..77dd085b2b 100644 --- a/target/linux/octeon/patches-5.4/701-honor_sgmii_node_device_tree_status.patch +++ b/target/linux/octeon/patches-5.4/701-honor_sgmii_node_device_tree_status.patch @@ -12,7 +12,7 @@ Tested-by: Johannes Kimmel Signed-off-by: Roman Kuzmitskii --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -885,8 +885,10 @@ static int cvm_oct_probe(struct platform +@@ -882,8 +882,10 @@ static int cvm_oct_probe(struct platform case CVMX_HELPER_INTERFACE_MODE_SGMII: priv->phy_mode = PHY_INTERFACE_MODE_SGMII; diff --git a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch index f29156340b..be453a6d7a 100644 --- a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch @@ -14,7 +14,7 @@ Signed-off-by: René van Dorst --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2943,6 +2943,7 @@ static const struct net_device_ops mtk_n +@@ -2940,6 +2940,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,9 +22,9 @@ Signed-off-by: René van Dorst const __be32 *_id = of_get_property(np, "reg", NULL); struct phylink *phylink; int phy_mode, id, err; -@@ -3037,6 +3038,9 @@ static int mtk_add_mac(struct mtk_eth *e - - of_platform_device_create(np, NULL, NULL); +@@ -3032,6 +3033,9 @@ static int mtk_add_mac(struct mtk_eth *e + + eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; + if (name) + strlcpy(eth->netdev[id]->name, name, IFNAMSIZ); diff --git a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch index c19cfd322d..ae1293c951 100644 --- a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch +++ b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch @@ -37,7 +37,7 @@ Signed-off-by: John Crispin break; --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -380,6 +380,7 @@ struct phy_device { +@@ -381,6 +381,7 @@ struct phy_device { unsigned suspended_by_mdio_bus:1; unsigned sysfs_links:1; unsigned loopback_enabled:1; diff --git a/target/linux/realtek/patches-5.4/703-include-linux-add-phy-ops-for-rtl838x.patch b/target/linux/realtek/patches-5.4/703-include-linux-add-phy-ops-for-rtl838x.patch index 03accd1e07..3682eb30a3 100644 --- a/target/linux/realtek/patches-5.4/703-include-linux-add-phy-ops-for-rtl838x.patch +++ b/target/linux/realtek/patches-5.4/703-include-linux-add-phy-ops-for-rtl838x.patch @@ -1,6 +1,6 @@ --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -644,6 +644,10 @@ struct phy_driver { +@@ -645,6 +645,10 @@ struct phy_driver { struct ethtool_tunable *tuna, const void *data); int (*set_loopback)(struct phy_device *dev, bool enable); diff --git a/target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch index 69b5000177..a96661c968 100644 --- a/target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -4335,6 +4336,22 @@ static void rtl_tally_reset(struct r8152 +@@ -4336,6 +4337,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -4376,6 +4393,8 @@ static void r8152b_init(struct r8152 *tp +@@ -4377,6 +4394,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -4510,6 +4529,8 @@ static void r8153_init(struct r8152 *tp) +@@ -4511,6 +4530,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -4586,6 +4607,8 @@ static void r8153b_init(struct r8152 *tp +@@ -4587,6 +4608,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ From ed9341dd78dcf86828769a7244a989d2c6ac2dbc Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 12 Aug 2021 09:28:18 -0400 Subject: [PATCH 15/23] kernel: bump 5.4 to 5.4.140 Removed upstreamed bcm27xx/patches-5.4: 950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch 950-0980-SQUASH-USB-gadget-f_hid-remove-more-spam.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia --- include/kernel-version.mk | 4 +- ...dded-Device-IDs-for-August-DVB-T-205.patch | 2 +- ...2-Allow-exporting-of-a-struct-dmabuf.patch | 4 +- ...get-f_hid-avoid-crashes-and-log-spam.patch | 56 ------------------- ...SH-USB-gadget-f_hid-remove-more-spam.patch | 26 --------- .../patches-5.4/0900-bt-mtk-serial-fix.patch | 2 +- ...l-armada-37xx-Set-pcie_reset_pin-to-.patch | 2 +- ...l-armada-37xx-Move-PCIe-comphy-handl.patch | 2 +- ...l-armada-37xx-Move-PCIe-max-link-spe.patch | 2 +- 9 files changed, 9 insertions(+), 91 deletions(-) delete mode 100644 target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch delete mode 100644 target/linux/bcm27xx/patches-5.4/950-0980-SQUASH-USB-gadget-f_hid-remove-more-spam.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 864c5f7bdc..013ee6ac4d 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-5.4 = .139 +LINUX_VERSION-5.4 = .140 LINUX_VERSION-5.10 = .58 -LINUX_KERNEL_HASH-5.4.139 = 0471d0ccb7953cdae7d235192588ac5d72344851969962676d1703e69084a37f +LINUX_KERNEL_HASH-5.4.140 = 2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43 LINUX_KERNEL_HASH-5.10.58 = 732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/bcm27xx/patches-5.4/950-0055-Added-Device-IDs-for-August-DVB-T-205.patch b/target/linux/bcm27xx/patches-5.4/950-0055-Added-Device-IDs-for-August-DVB-T-205.patch index a4e4bd1e88..f0c1896e33 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0055-Added-Device-IDs-for-August-DVB-T-205.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0055-Added-Device-IDs-for-August-DVB-T-205.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Added Device IDs for August DVB-T 205 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -@@ -1938,6 +1938,10 @@ static const struct usb_device_id rtl28x +@@ -1947,6 +1947,10 @@ static const struct usb_device_id rtl28x &rtl28xxu_props, "Compro VideoMate U650F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, &rtl28xxu_props, "MaxMedia HU394-T", NULL) }, diff --git a/target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch b/target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch index 74d03540ad..24ea0a9717 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch @@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c -@@ -2073,12 +2073,12 @@ static int __find_plane_by_offset(struct +@@ -2084,12 +2084,12 @@ static int __find_plane_by_offset(struct return -EINVAL; } @@ -35,7 +35,7 @@ Signed-off-by: Dave Stevenson struct dma_buf *dbuf; if (q->memory != VB2_MEMORY_MMAP) { -@@ -2128,6 +2128,21 @@ int vb2_core_expbuf(struct vb2_queue *q, +@@ -2139,6 +2139,21 @@ int vb2_core_expbuf(struct vb2_queue *q, return -EINVAL; } diff --git a/target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch b/target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch deleted file mode 100644 index 1fe685cd99..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 22198e801db7542c59098a75bdab120bcbc42652 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Wed, 30 Sep 2020 19:23:43 +0100 -Subject: [PATCH] USB: gadget: f_hid: avoid crashes and log spam - -Disconnecting and reconnecting the USB cable can lead to crashes and a -variety of kernel log spam. Try to fix or minimise both. - -See: https://github.com/raspberrypi/linux/issues/3870 - -Signed-off-by: Phil Elwell ---- - drivers/usb/gadget/function/f_hid.c | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - ---- a/drivers/usb/gadget/function/f_hid.c -+++ b/drivers/usb/gadget/function/f_hid.c -@@ -344,6 +344,11 @@ static ssize_t f_hidg_write(struct file - - spin_lock_irqsave(&hidg->write_spinlock, flags); - -+ if (!hidg->req) { -+ spin_unlock_irqrestore(&hidg->write_spinlock, flags); -+ return -ESHUTDOWN; -+ } -+ - #define WRITE_COND (!hidg->write_pending) - try_again: - /* write queue */ -@@ -364,7 +369,13 @@ try_again: - count = min_t(unsigned, count, hidg->report_length); - - spin_unlock_irqrestore(&hidg->write_spinlock, flags); -- status = copy_from_user(req->buf, buffer, count); -+ if (req) { -+ status = copy_from_user(req->buf, buffer, count); -+ } else { -+ ERROR(hidg->func.config->cdev, "hidg->req is NULL\n"); -+ status = -ESHUTDOWN; -+ goto release_write_pending; -+ } - - if (status != 0) { - ERROR(hidg->func.config->cdev, -@@ -393,6 +404,11 @@ try_again: - - spin_unlock_irqrestore(&hidg->write_spinlock, flags); - -+ if (!hidg->in_ep->enabled) { -+ ERROR(hidg->func.config->cdev, "in_ep is disabled\n"); -+ status = -ESHUTDOWN; -+ goto release_write_pending; -+ } - status = usb_ep_queue(hidg->in_ep, req, GFP_ATOMIC); - if (status < 0) { - ERROR(hidg->func.config->cdev, diff --git a/target/linux/bcm27xx/patches-5.4/950-0980-SQUASH-USB-gadget-f_hid-remove-more-spam.patch b/target/linux/bcm27xx/patches-5.4/950-0980-SQUASH-USB-gadget-f_hid-remove-more-spam.patch deleted file mode 100644 index 3f199cfdf1..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0980-SQUASH-USB-gadget-f_hid-remove-more-spam.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5018dc559136e2bca24973e71ed8747adf0f37f3 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Mon, 5 Oct 2020 15:41:15 +0100 -Subject: [PATCH] SQUASH: USB: gadget: f_hid: remove more spam - -Tidying up the previous patch to this file dropped the deletion of a -particularly noisy error message. Restore its removal. - -See: https://github.com/raspberrypi/linux/issues/3870 - -Signed-off-by: Phil Elwell ---- - drivers/usb/gadget/function/f_hid.c | 2 -- - 1 file changed, 2 deletions(-) - ---- a/drivers/usb/gadget/function/f_hid.c -+++ b/drivers/usb/gadget/function/f_hid.c -@@ -411,8 +411,6 @@ try_again: - } - status = usb_ep_queue(hidg->in_ep, req, GFP_ATOMIC); - if (status < 0) { -- ERROR(hidg->func.config->cdev, -- "usb_ep_queue error on int endpoint %zd\n", status); - goto release_write_pending; - } else { - status = count; diff --git a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch index 12844c860f..872b2bad45 100644 --- a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2591,6 +2591,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2597,6 +2597,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch b/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch index cd15b20ed1..dd75470b4d 100644 --- a/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch +++ b/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch @@ -69,7 +69,7 @@ Signed-off-by: Gregory CLEMENT /* J6 */ --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts -@@ -126,10 +126,6 @@ +@@ -127,10 +127,6 @@ }; }; diff --git a/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch index b42192d9fd..b851a39a39 100644 --- a/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch +++ b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch @@ -37,7 +37,7 @@ Signed-off-by: Gregory CLEMENT reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts -@@ -132,7 +132,6 @@ +@@ -133,7 +133,6 @@ status = "okay"; max-link-speed = <2>; reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; diff --git a/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch b/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch index 43cda3f29f..4442a5ac15 100644 --- a/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch +++ b/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch @@ -24,7 +24,7 @@ Signed-off-by: Gregory CLEMENT --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts -@@ -130,7 +130,6 @@ +@@ -131,7 +131,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pcie_reset_pins &pcie_clkreq_pins>; status = "okay"; From e68e80ead9a0f700701ca494282756454719d7de Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 10 Aug 2021 01:05:50 +0200 Subject: [PATCH 16/23] uboot-rockchip: update to v2021.07 Tested on NanoPi R2S Signed-off-by: David Bauer --- package/boot/uboot-rockchip/Makefile | 5 +- ...-spl-remove-dtoc-of-pdata-generation.patch | 14 +- ...-arm64-rk3399-Add-support-NanoPi-R4s.patch | 290 ------------------ .../of-platdata/nanopi-r2s-rk3328/dt-decl.h | 23 ++ .../of-platdata/nanopi-r2s-rk3328/dt-plat.c | 48 ++- 5 files changed, 70 insertions(+), 310 deletions(-) delete mode 100644 package/boot/uboot-rockchip/patches/102-arm64-rk3399-Add-support-NanoPi-R4s.patch create mode 100644 package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-decl.h diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index 75825ce690..ff246b5771 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_VERSION:=2021.04 +PKG_VERSION:=2021.07 PKG_RELEASE:=1 -PKG_HASH:=0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a +PKG_HASH:=312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e PKG_MAINTAINER:=Tobias Maedel @@ -88,6 +88,7 @@ ifneq ($(OF_PLATDATA),) $(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-plat.c $(PKG_BUILD_DIR)/tpl/dts/dt-plat.c $(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-structs-gen.h $(PKG_BUILD_DIR)/include/generated/dt-structs-gen.h + $(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-decl.h $(PKG_BUILD_DIR)/include/generated/dt-decl.h endif $(SED) 's#CONFIG_MKIMAGE_DTC_PATH=.*#CONFIG_MKIMAGE_DTC_PATH="$(PKG_BUILD_DIR)/scripts/dtc/dtc"#g' $(PKG_BUILD_DIR)/.config diff --git a/package/boot/uboot-rockchip/patches/002-spl-remove-dtoc-of-pdata-generation.patch b/package/boot/uboot-rockchip/patches/002-spl-remove-dtoc-of-pdata-generation.patch index 61a56c2afc..14bcbfb630 100644 --- a/package/boot/uboot-rockchip/patches/002-spl-remove-dtoc-of-pdata-generation.patch +++ b/package/boot/uboot-rockchip/patches/002-spl-remove-dtoc-of-pdata-generation.patch @@ -17,14 +17,12 @@ Signed-off-by: David Bauer --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl -@@ -329,10 +329,6 @@ PHONY += dts_dir - dts_dir: - $(shell [ -d $(obj)/dts ] || mkdir -p $(obj)/dts) - --include/generated/dt-structs-gen.h $(u-boot-spl-platdata_c) &: \ -- $(obj)/$(SPL_BIN).dtb dts_dir FORCE +@@ -354,8 +354,6 @@ $(platdata-hdr) $(u-boot-spl-platdata_c) + @# of OF_PLATDATA_INST and this might change between builds. Leaving old + @# ones around is confusing and it is possible that switching the + @# setting again will use the old one instead of regenerating it. +- @rm -f $(u-boot-spl-all-platdata_c) $(u-boot-spl-all-platdata) - $(call if_changed,dtoc) -- + ifdef CONFIG_SAMSUNG ifdef CONFIG_VAR_SIZE_SPL - VAR_SIZE_PARAM = --vs diff --git a/package/boot/uboot-rockchip/patches/102-arm64-rk3399-Add-support-NanoPi-R4s.patch b/package/boot/uboot-rockchip/patches/102-arm64-rk3399-Add-support-NanoPi-R4s.patch deleted file mode 100644 index f926f52efe..0000000000 --- a/package/boot/uboot-rockchip/patches/102-arm64-rk3399-Add-support-NanoPi-R4s.patch +++ /dev/null @@ -1,290 +0,0 @@ -From b69b9f3f54732c303939eb748aad97cd4cf60168 Mon Sep 17 00:00:00 2001 -From: Xiaobo Tian -Date: Sat, 27 Feb 2021 22:39:11 +0800 -Subject: [PATCH] arm64: rk3399: Add support NanoPi R4s - -NanoPi R4s is SBC base on Rockchip RK3399 hexa-core processor with -dual-Core Cortex-A72 and Mali-T864 GPU with 4GiB(LPDDR4) of RAM, SD card support, -including 2 gigabit ethernet(RTL8211E 1Gbps - RTL8111H 1Gbps) and 2 USB 3.0 port. -port.It also has two GPIO headers which allows further peripherals to be used. - -The devicetree file is taken of the rk3399 nanopi4 Linux kernel [1]. - -[1] https://github.com/torvalds/linux/commit/e7a095908227fb3ccc86d001d9e13c9ae2bef8e6 - -Signed-off-by: xiaobo -Reviewed-by: Kever Yang ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 16 +++ - arch/arm/dts/rk3399-nanopi-r4s.dts | 138 +++++++++++++++++++++ - board/rockchip/evb_rk3399/MAINTAINERS | 6 + - configs/nanopi-r4s-rk3399_defconfig | 62 +++++++++ - 5 files changed, 223 insertions(+) - create mode 100644 arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi - create mode 100644 arch/arm/dts/rk3399-nanopi-r4s.dts - create mode 100644 configs/nanopi-r4s-rk3399_defconfig - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index dd4d4efed31..0a139473811 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -132,6 +132,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ - rk3399-nanopi-m4.dtb \ - rk3399-nanopi-m4-2gb.dtb \ - rk3399-nanopi-neo4.dtb \ -+ rk3399-nanopi-r4s.dtb \ - rk3399-orangepi.dtb \ - rk3399-pinebook-pro.dtb \ - rk3399-puma-haikou.dtb \ -diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi -new file mode 100644 -index 00000000000..cd1642527ba ---- /dev/null -+++ b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi -@@ -0,0 +1,16 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * RK3399-based FriendlyElec boards device tree source -+ * -+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd -+ * -+ * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. -+ * (http://www.friendlyarm.com) -+ * -+ * Copyright (c) 2018 Collabora Ltd. -+ * Copyright (c) 2019 Arm Ltd. -+ * Copyright (C) 2020 Xiaobo -+ */ -+ -+#include "rk3399-nanopi4-u-boot.dtsi" -+#include "rk3399-sdram-lpddr4-100.dtsi" -diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts -new file mode 100644 -index 00000000000..6f2cf17bf1b ---- /dev/null -+++ b/arch/arm/dts/rk3399-nanopi-r4s.dts -@@ -0,0 +1,138 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd -+ * -+ * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. -+ * (http://www.friendlyarm.com) -+ * -+ * Copyright (c) 2018 Collabora Ltd. -+ * Copyright (c) 2019 Arm Ltd. -+ * Copyright (C) 2020 Xiaobo -+ */ -+ -+/dts-v1/; -+#include "rk3399-nanopi4.dtsi" -+ -+/ { -+ model = "FriendlyElec NanoPi R4S"; -+ compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; -+ -+ aliases { -+ ethernet1 = &r8169; -+ }; -+ -+ vdd_5v: vdd-5v { -+ compatible = "regulator-fixed"; -+ regulator-name = "vdd_5v"; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ fan: pwm-fan { -+ compatible = "pwm-fan"; -+ cooling-levels = <0 12 18 255>; -+ #cooling-cells = <2>; -+ fan-supply = <&vdd_5v>; -+ pwms = <&pwm1 0 50000 0>; -+ }; -+}; -+ -+&cpu_thermal { -+ trips { -+ cpu_warm: cpu_warm { -+ temperature = <55000>; -+ hysteresis = <2000>; -+ type = "active"; -+ }; -+ -+ cpu_hot: cpu_hot { -+ temperature = <65000>; -+ hysteresis = <2000>; -+ type = "active"; -+ }; -+ }; -+ -+ cooling-maps { -+ map2 { -+ trip = <&cpu_warm>; -+ cooling-device = <&fan THERMAL_NO_LIMIT 1>; -+ }; -+ -+ map3 { -+ trip = <&cpu_hot>; -+ cooling-device = <&fan 2 THERMAL_NO_LIMIT>; -+ }; -+ }; -+}; -+ -+&emmc_phy { -+ status = "disabled"; -+}; -+ -+&fusb0 { -+ status = "disabled"; -+}; -+ -+&leds { -+ lan_led: led-1 { -+ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-r4s:green:lan"; -+ }; -+ -+ wan_led: led-2 { -+ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-r4s:green:wan"; -+ }; -+}; -+ -+&leds_gpio { -+ rockchip,pins = -+ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, -+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, -+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; -+}; -+ -+&pcie0 { -+ max-link-speed = <1>; -+ num-lanes = <1>; -+ vpcie3v3-supply = <&vcc3v3_sys>; -+ -+ pcie@0 { -+ reg = <0x00000000 0 0 0 0>; -+ #address-cells = <3>; -+ #size-cells = <2>; -+ -+ r8169: pcie@0,0 { -+ reg = <0x000000 0 0 0 0>; -+ local-mac-address = [ 00 00 00 00 00 00 ]; -+ }; -+ }; -+}; -+ -+&sdhci { -+ status = "disabled"; -+}; -+ -+&sdio0 { -+ status = "disabled"; -+}; -+ -+&sdmmc { -+ host-index-min = <1>; -+}; -+ -+&u2phy0_host { -+ phy-supply = <&vdd_5v>; -+}; -+ -+&u2phy1_host { -+ status = "disabled"; -+}; -+ -+&usbdrd_dwc3_0 { -+ dr_mode = "host"; -+}; -+ -+&vcc3v3_sys { -+ vin-supply = <&vcc5v0_sys>; -+}; -diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS -index 4c889e06a63..3b9d60eccd4 100644 ---- a/board/rockchip/evb_rk3399/MAINTAINERS -+++ b/board/rockchip/evb_rk3399/MAINTAINERS -@@ -55,6 +55,12 @@ S: Maintained - F: configs/nanopi-neo4-rk3399_defconfig - F: arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi - -+NANOPI-R4S -+M: Xiaobo Tian -+S: Maintained -+F: configs/nanopi-r4s-rk3399_defconfig -+F: arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi -+ - ORANGEPI-RK3399 - M: Jagan Teki - S: Maintained -diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig -new file mode 100644 -index 00000000000..0a3c28b0126 ---- /dev/null -+++ b/configs/nanopi-r4s-rk3399_defconfig -@@ -0,0 +1,62 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_ROCKCHIP=y -+CONFIG_SYS_TEXT_BASE=0x00200000 -+CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ROCKCHIP_RK3399=y -+CONFIG_TARGET_EVB_RK3399=y -+CONFIG_NR_DRAM_BANKS=1 -+CONFIG_DEBUG_UART_BASE=0xFF1A0000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_DEBUG_UART=y -+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb" -+CONFIG_DISPLAY_BOARDINFO_LATE=y -+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -+CONFIG_SPL_STACK_R=y -+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 -+CONFIG_TPL=y -+CONFIG_CMD_BOOTZ=y -+CONFIG_CMD_GPT=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_USB=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_TIME=y -+CONFIG_SPL_OF_CONTROL=y -+CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s" -+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -+CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_ROCKCHIP_GPIO=y -+CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MMC_DW=y -+CONFIG_MMC_DW_ROCKCHIP=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_DM_ETH=y -+CONFIG_ETH_DESIGNWARE=y -+CONFIG_GMAC_ROCKCHIP=y -+CONFIG_PMIC_RK8XX=y -+CONFIG_REGULATOR_PWM=y -+CONFIG_REGULATOR_RK8XX=y -+CONFIG_PWM_ROCKCHIP=y -+CONFIG_RAM_RK3399_LPDDR4=y -+CONFIG_BAUDRATE=1500000 -+CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_SYSRESET=y -+CONFIG_USB=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_DWC3=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_KEYBOARD=y -+CONFIG_USB_HOST_ETHER=y -+CONFIG_USB_ETHER_ASIX=y -+CONFIG_USB_ETHER_ASIX88179=y -+CONFIG_USB_ETHER_MCS7830=y -+CONFIG_USB_ETHER_RTL8152=y -+CONFIG_USB_ETHER_SMSC95XX=y -+CONFIG_DM_VIDEO=y -+CONFIG_DISPLAY=y -+CONFIG_VIDEO_ROCKCHIP=y -+CONFIG_DISPLAY_ROCKCHIP_HDMI=y -+CONFIG_SPL_TINY_MEMSET=y -+CONFIG_ERRNO_STR=y diff --git a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-decl.h b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-decl.h new file mode 100644 index 0000000000..0919e4ed53 --- /dev/null +++ b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-decl.h @@ -0,0 +1,23 @@ +/* + * DO NOT MODIFY + * + * Declares externs for all device/uclass instances. + * This was generated by dtoc from a .dtb (device tree binary) file. + */ + +#include +#include + +/* driver declarations - these allow DM_DRIVER_GET() to be used */ +extern U_BOOT_DRIVER(rockchip_rk3328_cru); +extern U_BOOT_DRIVER(rockchip_rk3328_dmc); +extern U_BOOT_DRIVER(rockchip_rk3288_dw_mshc); +extern U_BOOT_DRIVER(ns16550_serial); +extern U_BOOT_DRIVER(rockchip_rk3328_grf); + +/* uclass driver declarations - needed for DM_UCLASS_DRIVER_REF() */ +extern UCLASS_DRIVER(clk); +extern UCLASS_DRIVER(mmc); +extern UCLASS_DRIVER(ram); +extern UCLASS_DRIVER(serial); +extern UCLASS_DRIVER(syscon); diff --git a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c index 1818461ec8..e5b330c9d9 100644 --- a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c +++ b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c @@ -12,19 +12,38 @@ #include #include -/* Node /clock-controller@ff440000 index 0 */ +/* + * driver_info declarations, ordered by 'struct driver_info' linker_list idx: + * + * idx driver_info driver + * --- -------------------- -------------------- + * 0: clock_controller_at_ff440000 rockchip_rk3328_cru + * 1: dmc rockchip_rk3328_dmc + * 2: mmc_at_ff500000 rockchip_rk3288_dw_mshc + * 3: serial_at_ff130000 ns16550_serial + * 4: syscon_at_ff100000 rockchip_rk3328_grf + * --- -------------------- -------------------- + */ + +/* + * Node /clock-controller@ff440000 index 0 + * driver rockchip_rk3328_cru parent None + */ static struct dtd_rockchip_rk3328_cru dtv_clock_controller_at_ff440000 = { .reg = {0xff440000, 0x1000}, .rockchip_grf = 0x3a, }; U_BOOT_DRVINFO(clock_controller_at_ff440000) = { .name = "rockchip_rk3328_cru", - .plat = &dtv_clock_controller_at_ff440000, + .plat = &dtv_clock_controller_at_ff440000, .plat_size = sizeof(dtv_clock_controller_at_ff440000), .parent_idx = -1, }; -/* Node /dmc index 1 */ +/* + * Node /dmc index 1 + * driver rockchip_rk3328_dmc parent None + */ static struct dtd_rockchip_rk3328_dmc dtv_dmc = { .reg = {0xff400000, 0x1000, 0xff780000, 0x3000, 0xff100000, 0x1000, 0xff440000, 0x1000, 0xff720000, 0x1000, 0xff798000, 0x1000}, @@ -56,12 +75,15 @@ static struct dtd_rockchip_rk3328_dmc dtv_dmc = { }; U_BOOT_DRVINFO(dmc) = { .name = "rockchip_rk3328_dmc", - .plat = &dtv_dmc, + .plat = &dtv_dmc, .plat_size = sizeof(dtv_dmc), .parent_idx = -1, }; -/* Node /mmc@ff500000 index 2 */ +/* + * Node /mmc@ff500000 index 2 + * driver rockchip_rk3288_dw_mshc parent None + */ static struct dtd_rockchip_rk3288_dw_mshc dtv_mmc_at_ff500000 = { .bus_width = 0x4, .cap_sd_highspeed = true, @@ -87,12 +109,15 @@ static struct dtd_rockchip_rk3288_dw_mshc dtv_mmc_at_ff500000 = { }; U_BOOT_DRVINFO(mmc_at_ff500000) = { .name = "rockchip_rk3288_dw_mshc", - .plat = &dtv_mmc_at_ff500000, + .plat = &dtv_mmc_at_ff500000, .plat_size = sizeof(dtv_mmc_at_ff500000), .parent_idx = -1, }; -/* Node /serial@ff130000 index 3 */ +/* + * Node /serial@ff130000 index 3 + * driver ns16550_serial parent None + */ static struct dtd_ns16550_serial dtv_serial_at_ff130000 = { .clock_frequency = 0x16e3600, .clocks = { @@ -109,18 +134,21 @@ static struct dtd_ns16550_serial dtv_serial_at_ff130000 = { }; U_BOOT_DRVINFO(serial_at_ff130000) = { .name = "ns16550_serial", - .plat = &dtv_serial_at_ff130000, + .plat = &dtv_serial_at_ff130000, .plat_size = sizeof(dtv_serial_at_ff130000), .parent_idx = -1, }; -/* Node /syscon@ff100000 index 4 */ +/* + * Node /syscon@ff100000 index 4 + * driver rockchip_rk3328_grf parent None + */ static struct dtd_rockchip_rk3328_grf dtv_syscon_at_ff100000 = { .reg = {0xff100000, 0x1000}, }; U_BOOT_DRVINFO(syscon_at_ff100000) = { .name = "rockchip_rk3328_grf", - .plat = &dtv_syscon_at_ff100000, + .plat = &dtv_syscon_at_ff100000, .plat_size = sizeof(dtv_syscon_at_ff100000), .parent_idx = -1, }; From 45d2d4e65ae52d0957df1e408925762e0a867d20 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sat, 14 Aug 2021 19:10:32 +0100 Subject: [PATCH 17/23] firewall: update to git HEAD 40e5f6a ipsets: permit default timeout of 0 Signed-off-by: Kevin Darbyshire-Bryant --- package/network/config/firewall/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile index 5b1e23af8c..378a912f9d 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -13,9 +13,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall3.git -PKG_SOURCE_DATE:=2021-03-29 -PKG_SOURCE_VERSION:=a4355a6faea2c4d59c90cd52851fa9aab4ccee5c -PKG_MIRROR_HASH:=747db79b11010bbfb708aae1793857c8d959d9270c7392f8c78d2d2110cf2fe7 +PKG_SOURCE_DATE:=2021-08-14 +PKG_SOURCE_VERSION:=40e5f6a2bd0b5406eff7e1d2d4f95bbf8f9410a4 +PKG_MIRROR_HASH:=4acd7d3c688d31a07ad871dcdbcd06d975ac86745d9f3a6caed68e694635965c PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC From 09fccdb99e118b48b0b565a35a7806998c5762e2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 15 Aug 2021 15:41:50 +0100 Subject: [PATCH 18/23] procd: update to git HEAD 040fecc system: fix issues reported by Coverity 48f481b service: make sure string read is null terminated 16dbc2a uxc: fix a bunch of issues discovered by Coverity ff9002f uxc: fix help output 104b49d uxc: support config in uvol Signed-off-by: Daniel Golle --- package/system/procd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 31e3f04d31..e55d7755eb 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2021-08-14 -PKG_SOURCE_VERSION:=2562e2b38d14fb1f337202feb6376fd447f30222 -PKG_MIRROR_HASH:=0b4a7a841d44d51b137713e85188b797016cafe9542bb0323b35e570ef758824 +PKG_SOURCE_DATE:=2021-08-15 +PKG_SOURCE_VERSION:=104b49d6ab25a8cf067e6d8d1f2da7defb9876d4 +PKG_MIRROR_HASH:=d13b566a14e84f6babe8b7d3dfb88e34c3dff0e97d7770d6fe71174685bca628 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 5c13177c55d068dec3e58f8f37c1c78502f73d3d Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 15 Aug 2021 17:41:59 +0100 Subject: [PATCH 19/23] procd: add missing dependency and fix empty mount triggers procd.sh: Instead of triggering on every mount.add event, there should be no mount trigger at all in case none of the directories passed to procd_add_*_mount_trigger() are located on a mountpoint configured in /etc/config/fstab. uxc: add missing dependency on rpcd. Signed-off-by: Daniel Golle --- package/system/procd/Makefile | 2 +- package/system/procd/files/procd.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index e55d7755eb..98f1ed1775 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -90,7 +90,7 @@ endef define Package/uxc SECTION:=base CATEGORY:=Base system - DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd + DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd +rpcd TITLE:=OpenWrt container management MAINTAINER:=Daniel Golle endef diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 14314bec95..3549a5a914 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -394,11 +394,15 @@ procd_get_mountpoints() { } _procd_add_restart_mount_trigger() { - _procd_add_action_mount_trigger restart $(procd_get_mountpoints "$@") + local mountpoints="$(procd_get_mountpoints "$@")" + [ "${mountpoints//[[:space:]]}" ] && + _procd_add_action_mount_trigger restart $mountpoints } _procd_add_reload_mount_trigger() { - _procd_add_action_mount_trigger reload $(procd_get_mountpoints "$@") + local mountpoints="$(procd_get_mountpoints "$@")" + [ "${mountpoints//[[:space:]]}" ] && + _procd_add_action_mount_trigger reload $mountpoints } _procd_add_raw_trigger() { From 98bccdafd7244238d9dfbbc1a342a4bb557e4b7c Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 7 Aug 2021 14:30:53 +0100 Subject: [PATCH 20/23] base-files: rename 'sdcard' to 'legacy-sdcard' While an image layout based on MBR and 'bootfs' partition may be easy to understand for users who are very used to the IBM PC and always have the option to access the SD card outside of the device (and hence don't really depend on other recovery methods or dual-boot), in my opinion it's a dead end for many desirable features on embedded systems, especially when managed remotely (and hence without an easy option to access the SD card using another device in case things go wrong, for example). Let me explain: * using a MSDOS/VFAT filesystem to store kernel(s) is problematic, as a single corruption of the bootfs can render the system into a state that it no longer boots at all. This makes dual-boot useless, or at least very tedious to setup with then 2 independent boot partitions to avoid the single point of failure on a "hot" block (the FAT index of the boot partition, written every time a file is changed in bootfs). And well: most targets even store the bootloader environment in a file in that very same FAT filesystem, hence it cannot be used to script a reliable dual-boot method (as loading the environment itself will already fail if the filesystem is corrupted). * loading the kernel uImage from bootfs and using rootfs inside an additional partition means the bootloader can only validate the kernel -- if rootfs is broken or corrupted, this can lead to a reboot loop, which is often a quite costly thing to happen in terms of hardware lifetime. * imitating MBR-boot behavior with a FAT-formatted bootfs partition (like IBM PC in the 80s and 90s) is just one of many choices on embedded targets. There are much better options with modern U-Boot (which is what we use and build from source for all targets booting off SD cards), see examples in mediatek/mt7622 and mediatek/mt7623. Hence rename the 'sdcard' feature to 'legacy-sdcard', and prefix functions with 'legacy_sdcard_' instead of 'sdcard_'. Tested-by: Stijn Tintel Signed-off-by: Daniel Golle --- package/base-files/Makefile | 10 +++++----- .../files/lib/upgrade/{sdcard.sh => legacy-sdcard.sh} | 6 +++--- scripts/target-metadata.pl | 2 +- target/Config.in | 2 +- target/linux/mvebu/Makefile | 2 +- .../mvebu/cortexa53/base-files/lib/upgrade/platform.sh | 6 +++--- .../mvebu/cortexa72/base-files/lib/upgrade/platform.sh | 6 +++--- .../mvebu/cortexa9/base-files/lib/upgrade/platform.sh | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) rename package/base-files/files/lib/upgrade/{sdcard.sh => legacy-sdcard.sh} (96%) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f19b07cfe1..d67f551b9c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -23,7 +23,7 @@ PKG_LICENSE:=GPL-2.0 PKG_CONFIG_DEPENDS += \ CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE \ CONFIG_NAND_SUPPORT \ - CONFIG_SDCARD_SUPPORT \ + CONFIG_LEGACY_SDCARD_SUPPORT \ CONFIG_CLEAN_IPKG \ CONFIG_PER_FEED_REPO \ $(foreach feed,$(FEEDS_AVAILABLE),CONFIG_FEED_$(feed)) @@ -124,9 +124,9 @@ ifeq ($(CONFIG_NAND_SUPPORT),) endef endif -ifeq ($(CONFIG_SDCARD_SUPPORT),) - define Package/base-files/sdcard-support - rm -f $(1)/lib/upgrade/sdcard.sh +ifeq ($(CONFIG_LEGACY_SDCARD_SUPPORT),) + define Package/base-files/legacy-sdcard-support + rm -f $(1)/lib/upgrade/legacy-sdcard.sh endef endif @@ -135,7 +135,7 @@ define Package/base-files/install $(CP) ./files/* $(1)/ $(Package/base-files/install-key) $(Package/base-files/nand-support) - $(Package/base-files/sdcard-support) + $(Package/base-files/legacy-sdcard-support) if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \ $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \ fi diff --git a/package/base-files/files/lib/upgrade/sdcard.sh b/package/base-files/files/lib/upgrade/legacy-sdcard.sh similarity index 96% rename from package/base-files/files/lib/upgrade/sdcard.sh rename to package/base-files/files/lib/upgrade/legacy-sdcard.sh index 2052805acb..d2ae53b729 100644 --- a/package/base-files/files/lib/upgrade/sdcard.sh +++ b/package/base-files/files/lib/upgrade/legacy-sdcard.sh @@ -1,4 +1,4 @@ -sdcard_check_image() { +legacy_sdcard_check_image() { local file="$1" local diskdev partdev diff @@ -26,7 +26,7 @@ sdcard_check_image() { fi } -sdcard_do_upgrade() { +legacy_sdcard_do_upgrade() { local board=$(board_name) local diskdev partdev diff @@ -78,7 +78,7 @@ sdcard_do_upgrade() { sleep 1 } -sdcard_copy_config() { +legacy_sdcard_copy_config() { local partdev if export_partdevice partdev 1; then diff --git a/scripts/target-metadata.pl b/scripts/target-metadata.pl index 34fb32a07e..163eb3768b 100755 --- a/scripts/target-metadata.pl +++ b/scripts/target-metadata.pl @@ -22,6 +22,7 @@ sub target_config_features(@) { /^gpio$/ and $ret .= "\tselect GPIO_SUPPORT\n"; /^jffs2$/ and $ret .= "\tselect USES_JFFS2\n"; /^jffs2_nand$/ and $ret .= "\tselect USES_JFFS2_NAND\n"; + /^legacy-sdcard$/ and $ret .= "\tselect LEGACY_SDCARD_SUPPORT\n"; /^low_mem$/ and $ret .= "\tselect LOW_MEMORY_FOOTPRINT\n"; /^minor$/ and $ret .= "\tselect USES_MINOR\n"; /^mips16$/ and $ret .= "\tselect HAS_MIPS16\n"; @@ -36,7 +37,6 @@ sub target_config_features(@) { /^rfkill$/ and $ret .= "\tselect RFKILL_SUPPORT\n"; /^rootfs-part$/ and $ret .= "\tselect USES_ROOTFS_PART\n"; /^rtc$/ and $ret .= "\tselect RTC_SUPPORT\n"; - /^sdcard$/ and $ret .= "\tselect SDCARD_SUPPORT\n"; /^separate_ramdisk$/ and $ret .= "\tselect USES_INITRAMFS\n\tselect USES_SEPARATE_INITRAMFS\n"; /^small_flash$/ and $ret .= "\tselect SMALL_FLASH\n"; /^spe_fpu$/ and $ret .= "\tselect HAS_SPE_FPU\n"; diff --git a/target/Config.in b/target/Config.in index fde7ea4137..32242446ee 100644 --- a/target/Config.in +++ b/target/Config.in @@ -101,7 +101,7 @@ config RFKILL_SUPPORT config NAND_SUPPORT bool -config SDCARD_SUPPORT +config LEGACY_SDCARD_SUPPORT bool config ARCH_64BIT diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile index 6b992f8903..3737a4aa23 100644 --- a/target/linux/mvebu/Makefile +++ b/target/linux/mvebu/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk BOARD:=mvebu BOARDNAME:=Marvell EBU Armada -FEATURES:=fpu usb pci pcie gpio nand squashfs ramdisk boot-part rootfs-part sdcard +FEATURES:=fpu usb pci pcie gpio nand squashfs ramdisk boot-part rootfs-part legacy-sdcard SUBTARGETS:=cortexa9 cortexa53 cortexa72 KERNEL_PATCHVER:=5.4 diff --git a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh index 26bb022415..0ee1d61506 100755 --- a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh @@ -15,7 +15,7 @@ platform_check_image() { globalscale,espressobin-ultra|\ globalscale,espressobin-v7|\ globalscale,espressobin-v7-emmc) - sdcard_check_image "$1" + legacy_sdcard_check_image "$1" ;; *) return 0 @@ -31,7 +31,7 @@ platform_do_upgrade() { globalscale,espressobin-ultra|\ globalscale,espressobin-v7|\ globalscale,espressobin-v7-emmc) - sdcard_do_upgrade "$1" + legacy_sdcard_do_upgrade "$1" ;; methode,udpu) platform_do_upgrade_uDPU "$1" @@ -49,7 +49,7 @@ platform_copy_config() { globalscale,espressobin-ultra|\ globalscale,espressobin-v7|\ globalscale,espressobin-v7-emmc) - sdcard_copy_config + legacy_sdcard_copy_config ;; methode,udpu) platform_copy_config_uDPU diff --git a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh index 1713f55b72..74aad434ea 100755 --- a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh @@ -11,7 +11,7 @@ platform_check_image() { case "$(board_name)" in marvell,armada8040-mcbin-doubleshot|\ marvell,armada8040-mcbin-singleshot) - sdcard_check_image "$1" + legacy_sdcard_check_image "$1" ;; *) return 0 @@ -23,7 +23,7 @@ platform_do_upgrade() { case "$(board_name)" in marvell,armada8040-mcbin-doubleshot|\ marvell,armada8040-mcbin-singleshot) - sdcard_do_upgrade "$1" + legacy_sdcard_do_upgrade "$1" ;; *) default_do_upgrade "$1" @@ -34,7 +34,7 @@ platform_copy_config() { case "$(board_name)" in marvell,armada8040-mcbin-doubleshot|\ marvell,armada8040-mcbin-singleshot) - sdcard_copy_config + legacy_sdcard_copy_config ;; esac } diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh index bf3961c437..5e69374837 100755 --- a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh @@ -13,7 +13,7 @@ platform_check_image() { kobol,helios4|\ solidrun,clearfog-base-a1|\ solidrun,clearfog-pro-a1) - sdcard_check_image "$1" + legacy_sdcard_check_image "$1" ;; *) return 0 @@ -30,7 +30,7 @@ platform_do_upgrade() { kobol,helios4|\ solidrun,clearfog-base-a1|\ solidrun,clearfog-pro-a1) - sdcard_do_upgrade "$1" + legacy_sdcard_do_upgrade "$1" ;; linksys,wrt1200ac|\ linksys,wrt1900ac-v1|\ @@ -51,7 +51,7 @@ platform_copy_config() { kobol,helios4|\ solidrun,clearfog-base-a1|\ solidrun,clearfog-pro-a1) - sdcard_copy_config + legacy_sdcard_copy_config ;; linksys,wrt1200ac|\ linksys,wrt1900ac-v1|\ From 9704d25da1ed859fa8464689eab2a7ffb284bc8c Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Sun, 15 Aug 2021 23:54:28 +0100 Subject: [PATCH 21/23] kernel: bump 5.10 to 5.10.59 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra --- include/kernel-version.mk | 4 ++-- ...net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 013ee6ac4d..df77e0c901 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .140 -LINUX_VERSION-5.10 = .58 +LINUX_VERSION-5.10 = .59 LINUX_KERNEL_HASH-5.4.140 = 2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43 -LINUX_KERNEL_HASH-5.10.58 = 732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210 +LINUX_KERNEL_HASH-5.10.59 = 333cadc15f23e2060bb9701dbd9c23cfb196c528cded797329a0c369c2b6ea80 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/backport-5.10/610-v5.13-15-net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch b/target/linux/generic/backport-5.10/610-v5.13-15-net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch index aaa6fd7457..e74f47c238 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-15-net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-15-net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch @@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c -@@ -1450,12 +1450,34 @@ static void ppp_dev_priv_destructor(stru +@@ -1461,12 +1461,34 @@ static void ppp_dev_priv_destructor(stru ppp_destroy_interface(ppp); } From ad6b0770493e0fd332db9a7fe09f9214342c578b Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 17 Aug 2021 14:07:57 +0200 Subject: [PATCH 22/23] ramips: mt7628: move mtd-eeprom out of root DTSI The mt76x8 subtarget is the only one in ramips that stores the mediatek,mtd-eeprom property directly in the "root" mt7628an.dtsi. This is not optimal for a few different reasons: * If you don't really know it or are used to other (sub)targets, the property will be set somewhat magically. * The property is set based on &factory partition before (if at all) this partition is defined. * There are several devices that have different offset or even different partitions to read from, which will then be overwritten in the DTS files. Thus, definitions are scattered between root DTSI and individual files. Based on these circumstances, the "root" definition is removed and the property is added to the device-based DTS(I) files where needed and applicable. This should be easier to grasp for unexperienced developers and will move the property closer to the partition definitions. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7628an.dtsi | 2 -- target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts | 2 ++ target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts | 2 ++ target/linux/ramips/dts/mt7628an_cudy_wr1000.dts | 2 ++ target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts | 2 ++ target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts | 2 ++ .../linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi | 2 ++ .../linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts | 3 +++ target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts | 2 ++ target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts | 2 ++ target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_iptime.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi | 2 ++ .../ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts | 2 ++ .../ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts | 6 ++---- target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts | 2 ++ target/linux/ramips/dts/mt7628an_minew_g1-c.dts | 2 ++ target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_onion_omega2.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts | 2 ++ target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts | 2 ++ target/linux/ramips/dts/mt7628an_skylab_skw92a.dts | 2 ++ target/linux/ramips/dts/mt7628an_tama_w06.dts | 2 ++ target/linux/ramips/dts/mt7628an_totolink_lr1200.dts | 2 ++ target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 4 +++- target/linux/ramips/dts/mt7628an_tplink_8m.dtsi | 4 +++- target/linux/ramips/dts/mt7628an_tplink_re200.dtsi | 1 + target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts | 4 +++- target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts | 3 +++ target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts | 2 ++ target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts | 2 ++ target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts | 2 ++ target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts | 2 ++ target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts | 2 ++ target/linux/ramips/dts/mt7628an_widora_neo.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts | 2 ++ target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi | 2 ++ target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts | 2 ++ target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts | 2 ++ .../linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts | 2 ++ 44 files changed, 90 insertions(+), 9 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi index 0dafdc790e..7bc001207b 100644 --- a/target/linux/ramips/dts/mt7628an.dtsi +++ b/target/linux/ramips/dts/mt7628an.dtsi @@ -492,7 +492,5 @@ interrupts = <6>; status = "disabled"; - - mediatek,mtd-eeprom = <&factory 0x0000>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts index 2e01b974a8..f5cff3bb60 100644 --- a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts +++ b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts @@ -130,6 +130,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi index 3a2de12f6a..8fd86dcb16 100644 --- a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi +++ b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi @@ -100,6 +100,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &state_default { diff --git a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts index cb4c61ecbd..41bad4e3ed 100644 --- a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts +++ b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts @@ -173,4 +173,6 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts index 5a2962a315..82f0e7c690 100644 --- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts +++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts @@ -131,6 +131,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts b/target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts index e4b5f31ada..f716ad9f23 100644 --- a/target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts +++ b/target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts @@ -162,6 +162,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts index e0445c61dd..48f0fbd92b 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts @@ -87,6 +87,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi index 6e3f64632d..089a3f3c42 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi +++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi @@ -59,6 +59,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts b/target/linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts index 945f680618..0b21724b1a 100644 --- a/target/linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts +++ b/target/linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "mt7628an.dtsi" + #include #include @@ -122,6 +123,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts index 97acb3ff3f..b7c3af796d 100644 --- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts +++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts @@ -88,6 +88,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts index 8e07dff0f1..231aa15bfc 100644 --- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts +++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts @@ -113,6 +113,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi b/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi index dcdf0cddc7..bfc510e06f 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi @@ -96,6 +96,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_iptime.dtsi b/target/linux/ramips/dts/mt7628an_iptime.dtsi index bc8965ca27..ccc6debfc9 100644 --- a/target/linux/ramips/dts/mt7628an_iptime.dtsi +++ b/target/linux/ramips/dts/mt7628an_iptime.dtsi @@ -104,6 +104,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &uboot { diff --git a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi index 8e73767dc2..03de21224b 100644 --- a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi +++ b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi @@ -123,6 +123,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts index 7beda75806..57624c302e 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts @@ -158,6 +158,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts index 5418dac886..4dede4287f 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts @@ -12,10 +12,6 @@ }; }; -&wmac { - status = "okay"; -}; - &spi0 { status = "okay"; @@ -58,4 +54,6 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; diff --git a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts index f79d2d2641..3797565908 100644 --- a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts +++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts @@ -85,6 +85,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; ralink,mtd-eeprom = <&art 0x0>; }; diff --git a/target/linux/ramips/dts/mt7628an_minew_g1-c.dts b/target/linux/ramips/dts/mt7628an_minew_g1-c.dts index e741d2182c..eeee1c25ed 100644 --- a/target/linux/ramips/dts/mt7628an_minew_g1-c.dts +++ b/target/linux/ramips/dts/mt7628an_minew_g1-c.dts @@ -135,6 +135,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &sdhci { diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi index f811466c16..e6374e7bac 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi +++ b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi @@ -96,6 +96,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi index d4de7fe6a4..555a2a1261 100644 --- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi +++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi @@ -163,6 +163,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts index bf5fbcc64e..61f78c162c 100644 --- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts +++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts @@ -93,6 +93,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts index 4775f8f076..5c3b14f87f 100644 --- a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts +++ b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts @@ -182,6 +182,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts index 4ceccde06d..174272f95f 100644 --- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts +++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts @@ -53,6 +53,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts index def722832d..7a202eb6ef 100644 --- a/target/linux/ramips/dts/mt7628an_tama_w06.dts +++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts @@ -97,6 +97,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts index ef60f01002..9d1c930d76 100644 --- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts +++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts @@ -107,6 +107,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi index bbd66e113c..d7c65d4703 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi @@ -74,9 +74,11 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&radio 0x0>; + nvmem-cells = <&macaddr_rom_f100>; nvmem-cell-names = "mac-address"; - mediatek,mtd-eeprom = <&radio 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi index 8372f057cd..ecb6ce1e4e 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi @@ -55,9 +55,11 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x20000>; + nvmem-cells = <&macaddr_factory_f100>; nvmem-cell-names = "mac-address"; - mediatek,mtd-eeprom = <&factory 0x20000>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi index d221a5c7c8..d6b06ba2fc 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi @@ -138,6 +138,7 @@ status = "okay"; mediatek,mtd-eeprom = <&radio 0x0>; + nvmem-cells = <&macaddr_config_2008>; nvmem-cell-names = "mac-address"; mac-address-increment = <1>; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts index 496f8db2ca..c90442da1f 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts @@ -123,9 +123,11 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x20000>; + nvmem-cells = <&macaddr_factory_f100>; nvmem-cell-names = "mac-address"; - mediatek,mtd-eeprom = <&factory 0x20000>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts index ad65152a95..01a1a7f09e 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts @@ -88,6 +88,9 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; + nvmem-cells = <&macaddr_factory_f100>; nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts index 9f1d667070..ff2c8d48d1 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts @@ -100,6 +100,8 @@ &wmac { status = "okay"; + mediatek,mtd-eeprom = <&factory 0x0>; + nvmem-cells = <&macaddr_factory_f100>; nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi index f0a6b1df5d..805d5debf5 100644 --- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi +++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi @@ -91,6 +91,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &state_default { diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi index bffcdf67c6..06a80fdde7 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi @@ -23,6 +23,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts index eb74c2ae51..dcba4b64e2 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts @@ -114,6 +114,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts index b12e1f7106..83e269b366 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts @@ -109,6 +109,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts index 5e19e331c8..b4e6905624 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts @@ -113,6 +113,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts index 96633c062e..1d5c99da31 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts @@ -143,6 +143,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi index 4c60ad95aa..185f554df7 100644 --- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi +++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi @@ -115,4 +115,6 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index a25f4d8d28..3f5db4441f 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -159,6 +159,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi index 7158101ab7..9024fb711b 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi @@ -88,6 +88,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &factory { diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi index d3f5e33be7..0a48c06019 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi +++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi @@ -100,4 +100,6 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts index 37f409eee9..f9adca9d71 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts @@ -71,6 +71,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts index fef199ac34..aca4555a40 100644 --- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts +++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts @@ -102,6 +102,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts index f3650dc6ae..50094a82da 100644 --- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts +++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts @@ -178,6 +178,8 @@ &wmac { status = "okay"; + + mediatek,mtd-eeprom = <&factory 0x0>; }; &pcie { From efca67983d4fc01c14619efcaa632220bd28826e Mon Sep 17 00:00:00 2001 From: David Yang Date: Sun, 25 Jul 2021 21:21:02 +0800 Subject: [PATCH 23/23] ramips: add WPS button for newifi d1 This device has a WPS button under WiFi antenna cover, add it to dts. Signed-off-by: David Yang --- target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts index ddd46befe6..e8069ec394 100644 --- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts +++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts @@ -47,6 +47,12 @@ gpios = <&gpio 15 GPIO_ACTIVE_LOW>; linux,code = ; }; + + wps { + label = "wps"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; }; gpio_export { @@ -159,7 +165,7 @@ &state_default { gpio { - groups = "jtag", "uart2"; + groups = "jtag", "uart2", "wdt"; function = "gpio"; }; };