forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: bcm53xx: build a single device per profile ramips: fix mt7621 kernel compilation mediatek: configure TUF-AX4200 LAN LEDs mediatek: apply stock configuration for WAN-LED generic: add hack for MT753x LED configuration generic: mt7530: enable PHY configuration using OF r8125: update to 9.012.03-1 r8152: update to 2.17.1-3 r8168: update to 8.052.01 mediatek: fix gl-mt6000 wireless kernel: bump 6.1 to 6.1.61 (coolsnowwolf#11637)
- Loading branch information
Showing
18 changed files
with
231 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-6.1 = .60 | ||
| LINUX_KERNEL_HASH-6.1.60 = 58520e7ae5a6af254ddf7ddbfc42e4373b0d36c67d467f6e35a3bd1672f5fb0a | ||
| LINUX_VERSION-6.1 = .61 | ||
| LINUX_KERNEL_HASH-6.1.61 = ad2c9d12fc36e2dde4796a3eec8f4ddca2e278098f4e555b6e6f5f03ef6964ce |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk | |
| include $(INCLUDE_DIR)/kernel.mk | ||
|
|
||
| PKG_NAME:=r8152 | ||
| PKG_VERSION:=2.16.3-4 | ||
| PKG_RELEASE:=3 | ||
| PKG_VERSION:=2.17.1-3 | ||
| PKG_RELEASE:=1 | ||
|
|
||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | ||
| PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8152-dkms/tar.gz/$(PKG_VERSION)? | ||
| PKG_HASH:=a80563c6abb05f4aeab5be9d63b0497859878c86e0f72c49dd527de2adec7b68 | ||
| PKG_HASH:=3e0486d412cb05ede0571b19fa6d402c1448b0220e5ae54aa5b11af918ad9a43 | ||
| PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-dkms-$(PKG_VERSION) | ||
|
|
||
| PKG_MAINTAINER:=Tianling Shen <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
target/linux/generic/hack-5.15/766-net-phy-mediatek-ge-add-LED-configuration-interface.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| From cc225d163b5a4f7a0d1968298bf7927306646a47 Mon Sep 17 00:00:00 2001 | ||
| From: David Bauer <[email protected]> | ||
| Date: Fri, 28 Apr 2023 01:53:01 +0200 | ||
| Subject: [PATCH] net: phy: mediatek-ge: add LED configuration interface | ||
|
|
||
| This adds a small hack similar to the one used for ar8xxx switches to | ||
| read a reg:value map for configuring the LED configuration registers. | ||
|
|
||
| This allows OpenWrt to write device-specific LED action as well as blink | ||
| configurations. It is unlikely to be accepted upstream, as upstream | ||
| plans on integrating their own framework for handling these LEDs. | ||
|
|
||
| Signed-off-by: David Bauer <[email protected]> | ||
| --- | ||
| drivers/net/phy/mediatek-ge.c | 33 +++++++++++++++++++++++++++++++++ | ||
| 1 file changed, 33 insertions(+) | ||
|
|
||
| --- a/drivers/net/phy/mediatek-ge.c | ||
| +++ b/drivers/net/phy/mediatek-ge.c | ||
| @@ -1,4 +1,5 @@ | ||
| // SPDX-License-Identifier: GPL-2.0+ | ||
| +#include <linux/of.h> | ||
| #include <linux/bitfield.h> | ||
| #include <linux/module.h> | ||
| #include <linux/phy.h> | ||
| @@ -53,6 +54,36 @@ static int mt7530_phy_config_init(struct | ||
| return 0; | ||
| } | ||
|
|
||
| +static int mt7530_led_config_of(struct phy_device *phydev) | ||
| +{ | ||
| + struct device_node *np = phydev->mdio.dev.of_node; | ||
| + const __be32 *paddr; | ||
| + int len; | ||
| + int i; | ||
| + | ||
| + paddr = of_get_property(np, "mediatek,led-config", &len); | ||
| + if (!paddr) | ||
| + return 0; | ||
| + | ||
| + if (len < (2 * sizeof(*paddr))) | ||
| + return -EINVAL; | ||
| + | ||
| + len /= sizeof(*paddr); | ||
| + | ||
| + phydev_warn(phydev, "Configure LED registers (num=%d)\n", len); | ||
| + for (i = 0; i < len - 1; i += 2) { | ||
| + u32 reg; | ||
| + u32 val; | ||
| + | ||
| + reg = be32_to_cpup(paddr + i); | ||
| + val = be32_to_cpup(paddr + i + 1); | ||
| + | ||
| + phy_write_mmd(phydev, MDIO_MMD_VEND2, reg, val); | ||
| + } | ||
| + | ||
| + return 0; | ||
| +} | ||
| + | ||
| static int mt7531_phy_config_init(struct phy_device *phydev) | ||
| { | ||
| mtk_gephy_config_init(phydev); | ||
| @@ -65,6 +96,9 @@ static int mt7531_phy_config_init(struct | ||
| phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x13, 0x404); | ||
| phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x14, 0x404); | ||
|
|
||
| + /* LED Config*/ | ||
| + mt7530_led_config_of(phydev); | ||
| + | ||
| return 0; | ||
| } | ||
|
|
43 changes: 43 additions & 0 deletions
43
target/linux/generic/pending-5.15/795-mt7530-register-OF-node-for-internal-MDIO-bus.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| From 1d81e51d6d79d9098013b2e8cdd677bae998c5d8 Mon Sep 17 00:00:00 2001 | ||
| From: David Bauer <[email protected]> | ||
| Date: Fri, 28 Apr 2023 02:22:59 +0200 | ||
| Subject: [PATCH 1/2] mt7530: register OF node for internal MDIO bus | ||
|
|
||
| The MT753x switches provide a switch-internal MDIO bus for the embedded | ||
| PHYs. | ||
|
|
||
| Register a OF sub-node on the switch OF-node for this internal MDIO bus. | ||
| This allows to configure the embedded PHYs using device-tree. | ||
|
|
||
| Signed-off-by: David Bauer <[email protected]> | ||
| --- | ||
| drivers/net/dsa/mt7530.c | 7 ++++++- | ||
| 1 file changed, 6 insertions(+), 1 deletion(-) | ||
|
|
||
| --- a/drivers/net/dsa/mt7530.c | ||
| +++ b/drivers/net/dsa/mt7530.c | ||
| @@ -2081,10 +2081,13 @@ mt7530_setup_mdio(struct mt7530_priv *pr | ||
| { | ||
| struct dsa_switch *ds = priv->ds; | ||
| struct device *dev = priv->dev; | ||
| + struct device_node *np, *mnp; | ||
| struct mii_bus *bus; | ||
| static int idx; | ||
| int ret; | ||
|
|
||
| + np = priv->dev->of_node; | ||
| + | ||
| bus = devm_mdiobus_alloc(dev); | ||
| if (!bus) | ||
| return -ENOMEM; | ||
| @@ -2101,7 +2104,9 @@ mt7530_setup_mdio(struct mt7530_priv *pr | ||
| if (priv->irq) | ||
| mt7530_setup_mdio_irq(priv); | ||
|
|
||
| - ret = devm_mdiobus_register(dev, bus); | ||
| + mnp = of_get_child_by_name(np, "mdio"); | ||
| + ret = devm_of_mdiobus_register(dev, bus, mnp); | ||
| + of_node_put(mnp); | ||
| if (ret) { | ||
| dev_err(dev, "failed to register MDIO bus: %d\n", ret); | ||
| if (priv->irq) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| . /lib/functions/caldata.sh | ||
|
|
||
| preinit_fix_eeprom() { | ||
| case $(board_name) in | ||
| glinet,gl-mt6000) | ||
| mmc_part=$(find_mmc_part factory) | ||
| FIRMWARE="mediatek/mt7986_eeprom_mt7976_dual.bin" | ||
| [ ! -e /lib/firmware/"$FIRMWARE" ] && \ | ||
| export FIRMWARE="$FIRMWARE" && \ | ||
| caldata_extract_mmc "factory" 0x0 0x1000 | ||
| ;; | ||
| mercusys,mr90x-v1) | ||
| eeprom="/lib/firmware/mediatek/mt7986_eeprom_mt7975_dual.bin" | ||
| [ ! -e $eeprom ] && \ | ||
| ln -sf /tmp/tp_data/MT7986_EEPROM.bin $eeprom | ||
| ;; | ||
| *) | ||
| ;; | ||
| esac | ||
| } | ||
|
|
||
| boot_hook_add preinit_main preinit_fix_eeprom |
Oops, something went wrong.