Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2022-11-25 21:23:56 +04:00 committed by GitHub
commit 533390e5f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 60 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package/kernel/linux/modules/iio.mk
View file

@ -566,3 +566,17 @@ define KernelPackage/iio-fxos8700-spi/description
endef endef
$(eval $(call KernelPackage,iio-fxos8700-spi)) $(eval $(call KernelPackage,iio-fxos8700-spi))
define KernelPackage/iio-ti-am335x-adc
TITLE:= TI Sitara AM335x ADC driver
DEPENDS:=@TARGET_omap
KCONFIG:=CONFIG_TI_AM335X_ADC
FILES:=$(LINUX_DIR)/drivers/iio/adc/ti_am335x_adc.ko
AUTOLOAD:=$(call AutoProbe,ti_am335x_adc)
$(call AddDepends/iio,+kmod-iio-kfifo-buf)
endef
define KernelPackage/iio-ti-am335x-adc/description
Driver for the TI AM335x ADC.
endef
$(eval $(call KernelPackage,iio-ti-am335x-adc))

10
target/linux/generic/pending-5.15/732-14-net-ethernet-mtk_eth_soc-drop-generic-vlan-rx-offloa.patch
View file

@ -111,7 +111,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0); err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0);
if (err) { if (err) {
netdev_err(dev, "%s: could not attach PHY: %d\n", __func__, netdev_err(dev, "%s: could not attach PHY: %d\n", __func__,
@@ -3215,6 +3160,39 @@ static int mtk_open(struct net_device *d @@ -3215,6 +3160,35 @@ static int mtk_open(struct net_device *d
phylink_start(mac->phylink); phylink_start(mac->phylink);
netif_tx_start_all_queues(dev); netif_tx_start_all_queues(dev);
@ -141,17 +141,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ val &= ~MTK_CDMP_STAG_EN; + val &= ~MTK_CDMP_STAG_EN;
+ mtk_w32(eth, val, MTK_CDMP_IG_CTRL); + mtk_w32(eth, val, MTK_CDMP_IG_CTRL);
+ +
+ val = mtk_r32(eth, MTK_CDMQ_IG_CTRL);
+ val &= ~MTK_CDMQ_STAG_EN;
+ mtk_w32(eth, val, MTK_CDMQ_IG_CTRL);
+
+ mtk_w32(eth, 0, MTK_CDMP_EG_CTRL); + mtk_w32(eth, 0, MTK_CDMP_EG_CTRL);
+ } + }
+ +
return 0; return 0;
} }
@@ -3508,10 +3486,9 @@ static int mtk_hw_init(struct mtk_eth *e @@ -3508,10 +3482,9 @@ static int mtk_hw_init(struct mtk_eth *e
if (!MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) { if (!MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
val = mtk_r32(eth, MTK_CDMP_IG_CTRL); val = mtk_r32(eth, MTK_CDMP_IG_CTRL);
mtk_w32(eth, val | MTK_CDMP_STAG_EN, MTK_CDMP_IG_CTRL); mtk_w32(eth, val | MTK_CDMP_STAG_EN, MTK_CDMP_IG_CTRL);
@ -164,7 +160,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* set interrupt delays based on current Net DIM sample */ /* set interrupt delays based on current Net DIM sample */
mtk_dim_rx(&eth->rx_dim.work); mtk_dim_rx(&eth->rx_dim.work);
@@ -4132,7 +4109,7 @@ static int mtk_add_mac(struct mtk_eth *e @@ -4132,7 +4105,7 @@ static int mtk_add_mac(struct mtk_eth *e
eth->netdev[id]->hw_features |= NETIF_F_LRO; eth->netdev[id]->hw_features |= NETIF_F_LRO;
eth->netdev[id]->vlan_features = eth->soc->hw_features & eth->netdev[id]->vlan_features = eth->soc->hw_features &

36
target/linux/ipq40xx/image/generic.mk
View file

@ -4,28 +4,28 @@ DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION
DEVICE_VARS += WRGG_DEVNAME WRGG_SIGNATURE DEVICE_VARS += WRGG_DEVNAME WRGG_SIGNATURE
define Device/FitImage define Device/FitImage
KERNEL_SUFFIX := -fit-uImage.itb KERNEL_SUFFIX := -uImage.itb
KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
KERNEL_NAME := Image KERNEL_NAME := Image
endef endef
define Device/FitImageLzma define Device/FitImageLzma
KERNEL_SUFFIX := -fit-uImage.itb KERNEL_SUFFIX := -uImage.itb
KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb
KERNEL_NAME := Image KERNEL_NAME := Image
endef endef
define Device/FitzImage define Device/FitzImage
KERNEL_SUFFIX := -fit-zImage.itb KERNEL_SUFFIX := -zImage.itb
KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb
KERNEL_NAME := zImage KERNEL_NAME := zImage
endef endef
define Device/UbiFit define Device/UbiFit
KERNEL_IN_UBI := 1 KERNEL_IN_UBI := 1
IMAGES := nand-factory.ubi nand-sysupgrade.bin IMAGES := factory.ubi sysupgrade.bin
IMAGE/nand-factory.ubi := append-ubi IMAGE/factory.ubi := append-ubi
IMAGE/nand-sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef endef
define Device/DniImage define Device/DniImage
@ -160,8 +160,8 @@ define Device/alfa-network_ap120c-ac
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
IMAGE_SIZE := 65536k IMAGE_SIZE := 65536k
IMAGES := nand-factory.bin nand-sysupgrade.bin IMAGES := factory.bin sysupgrade.bin
IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand
endef endef
TARGET_DEVICES += alfa-network_ap120c-ac TARGET_DEVICES += alfa-network_ap120c-ac
@ -312,14 +312,14 @@ endef
#TARGET_DEVICES += buffalo_wtr-m2133hp #TARGET_DEVICES += buffalo_wtr-m2133hp
define Device/cellc_rtl30vw define Device/cellc_rtl30vw
KERNEL_SUFFIX := -fit-zImage.itb KERNEL_SUFFIX := -zImage.itb
KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb | uImage lzma | pad-to 2048 KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb | uImage lzma | pad-to 2048
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL_IN_UBI := KERNEL_IN_UBI :=
IMAGES := nand-factory.bin nand-sysupgrade.bin IMAGES := factory.bin sysupgrade.bin
IMAGE/nand-factory.bin := append-rootfshdr kernel | append-ubi | qsdk-ipq-factory-nand-askey kernel IMAGE/factory.bin := append-rootfshdr kernel | append-ubi | qsdk-ipq-factory-nand-askey kernel
IMAGE/nand-sysupgrade.bin := append-rootfshdr kernel | sysupgrade-tar kernel=$$$$@.kernel | append-metadata IMAGE/sysupgrade.bin := append-rootfshdr kernel | sysupgrade-tar kernel=$$$$@.kernel | append-metadata
DEVICE_VENDOR := Cell C DEVICE_VENDOR := Cell C
DEVICE_MODEL := RTL30VW DEVICE_MODEL := RTL30VW
SOC := qcom-ipq4019 SOC := qcom-ipq4019
@ -442,7 +442,7 @@ define Device/edgecore_oap100
SOC := qcom-ipq4019 SOC := qcom-ipq4019
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
IMAGES := nand-sysupgrade.bin IMAGES := sysupgrade.bin
DEVICE_DTS_CONFIG := config@ap.dk07.1-c1 DEVICE_DTS_CONFIG := config@ap.dk07.1-c1
DEVICE_PACKAGES := ipq-wifi-edgecore_oap100 kmod-usb-acm kmod-usb-net kmod-usb-net-cdc-qmi uqmi DEVICE_PACKAGES := ipq-wifi-edgecore_oap100 kmod-usb-acm kmod-usb-net kmod-usb-net-cdc-qmi uqmi
endef endef
@ -869,8 +869,8 @@ define Device/netgear_wac510
DEVICE_DTS_CONFIG := config@5 DEVICE_DTS_CONFIG := config@5
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
IMAGES += nand-factory.tar IMAGES += factory.tar
IMAGE/nand-factory.tar := append-ubi | wac5xx-netgear-tar IMAGE/factory.tar := append-ubi | wac5xx-netgear-tar
DEVICE_PACKAGES := uboot-envtools DEVICE_PACKAGES := uboot-envtools
endef endef
TARGET_DEVICES += netgear_wac510 TARGET_DEVICES += netgear_wac510
@ -921,8 +921,8 @@ endef
define Device/p2w_r619ac-64m define Device/p2w_r619ac-64m
$(call Device/p2w_r619ac) $(call Device/p2w_r619ac)
DEVICE_VARIANT := 64M NAND DEVICE_VARIANT := 64M NAND
IMAGES += nand-factory.bin IMAGES += factory.bin
IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand
endef endef
TARGET_DEVICES += p2w_r619ac-64m TARGET_DEVICES += p2w_r619ac-64m
@ -1064,7 +1064,7 @@ define Device/teltonika_rutx10
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
FILESYSTEMS := squashfs FILESYSTEMS := squashfs
IMAGE/nand-factory.ubi := append-ubi | qsdk-ipq-factory-nand | append-rutx-metadata IMAGE/factory.ubi := append-ubi | qsdk-ipq-factory-nand | append-rutx-metadata
DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-bluetooth DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-bluetooth
endef endef
# Missing DSA Setup # Missing DSA Setup

4
target/linux/ipq40xx/image/mikrotik.mk
View file

@ -16,8 +16,8 @@ define Device/mikrotik_nand
KERNEL_INITRAMFS := kernel-bin | append-dtb-elf KERNEL_INITRAMFS := kernel-bin | append-dtb-elf
KERNEL := kernel-bin | append-dtb-elf | package-kernel-ubifs | \ KERNEL := kernel-bin | append-dtb-elf | package-kernel-ubifs | \
ubinize-kernel ubinize-kernel
IMAGES := nand-sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/nand-sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef endef
define Device/mikrotik_cap-ac define Device/mikrotik_cap-ac

18
target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac Normal file
View file

@ -0,0 +1,18 @@
[ "$ACTION" == "add" ] || exit 0
PHYNBR=${DEVPATH##*/phy}
[ -n $PHYNBR ] || exit 0
. /lib/functions.sh
. /lib/functions/system.sh
board=$(board_name)
case "$board" in
bananapi,bpi-r3)
addr=$(macaddr_add $(cat /sys/class/net/eth0/address) 2)
[ "$PHYNBR" = "0" ] && macaddr_unsetbit $addr 6 > /sys${DEVPATH}/macaddress
[ "$PHYNBR" = "1" ] && macaddr_setbit $addr 6 > /sys${DEVPATH}/macaddress
;;
esac

3
target/linux/mediatek/mt7622/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
View file

@ -10,6 +10,9 @@ PHYNBR=${DEVPATH##*/phy}
board=$(board_name) board=$(board_name)
case "$board" in case "$board" in
bananapi,bpi-r64)
[ "$PHYNBR" = "0" ] && macaddr_add $(cat /sys/class/net/eth0/address) 2 > /sys${DEVPATH}/macaddress
;;
ruijie,rg-ew3200gx-pro) ruijie,rg-ew3200gx-pro)
[ "$PHYNBR" = "0" ] && macaddr_add $(get_mac_label) 3 > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "0" ] && macaddr_add $(get_mac_label) 3 > /sys${DEVPATH}/macaddress
[ "$PHYNBR" = "1" ] && macaddr_add $(get_mac_label) 2 > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && macaddr_add $(get_mac_label) 2 > /sys${DEVPATH}/macaddress

4
target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
View file

@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -4021,6 +4021,7 @@ static const struct net_device_ops mtk_n @@ -3994,6 +3994,7 @@ static const struct net_device_ops mtk_n
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
{ {
@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
const __be32 *_id = of_get_property(np, "reg", NULL); const __be32 *_id = of_get_property(np, "reg", NULL);
phy_interface_t phy_mode; phy_interface_t phy_mode;
struct phylink *phylink; struct phylink *phylink;
@@ -4149,6 +4150,9 @@ static int mtk_add_mac(struct mtk_eth *e @@ -4122,6 +4123,9 @@ static int mtk_add_mac(struct mtk_eth *e
register_netdevice_notifier(&mac->device_notifier); register_netdevice_notifier(&mac->device_notifier);
} }