forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 1
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: base-files: fixes x86 sysupgrade (coolsnowwolf#10992) rockchip: replace yt8531 patches with upstream kernel: rtl8367b: remove wrong parameter
- Loading branch information
Showing
16 changed files
with
1,888 additions
and
537 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
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
38 changes: 38 additions & 0 deletions
38
target/linux/rockchip/patches-5.15/074-v6.3-net-phy-motorcomm-change-the-phy-id-of.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,38 @@ | ||
| From 3c1dc22162d673d595855d24f95200ed2643f88f Mon Sep 17 00:00:00 2001 | ||
| From: Frank Sae <Frank.Sae@motor-comm.com> | ||
| Date: Sat, 28 Jan 2023 14:35:58 +0800 | ||
| Subject: [PATCH] net: phy: motorcomm: change the phy id of yt8521 and yt8531s | ||
| to lowercase | ||
|
|
||
| The phy id is usually defined in lower case. | ||
|
|
||
| Signed-off-by: Frank Sae <Frank.Sae@motor-comm.com> | ||
| Reviewed-by: Andrew Lunn <andrew@lunn.ch> | ||
| Link: https://lore.kernel.org/r/20230128063558.5850-2-Frank.Sae@motor-comm.com | ||
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> | ||
| --- | ||
| drivers/net/phy/motorcomm.c | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| --- a/drivers/net/phy/motorcomm.c | ||
| +++ b/drivers/net/phy/motorcomm.c | ||
| @@ -12,8 +12,8 @@ | ||
| #include <linux/phy.h> | ||
|
|
||
| #define PHY_ID_YT8511 0x0000010a | ||
| -#define PHY_ID_YT8521 0x0000011A | ||
| -#define PHY_ID_YT8531S 0x4F51E91A | ||
| +#define PHY_ID_YT8521 0x0000011a | ||
| +#define PHY_ID_YT8531S 0x4f51e91a | ||
|
|
||
| /* YT8521/YT8531S Register Overview | ||
| * UTP Register space | FIBER Register space | ||
| @@ -1804,7 +1804,7 @@ static const struct mdio_device_id __maybe_unused motorcomm_tbl[] = { | ||
| { PHY_ID_MATCH_EXACT(PHY_ID_YT8511) }, | ||
| { PHY_ID_MATCH_EXACT(PHY_ID_YT8521) }, | ||
| { PHY_ID_MATCH_EXACT(PHY_ID_YT8531S) }, | ||
| - { /* sentinal */ } | ||
| + { /* sentinel */ } | ||
| }; | ||
|
|
||
| MODULE_DEVICE_TABLE(mdio, motorcomm_tbl); |
107 changes: 107 additions & 0 deletions
107
...et/linux/rockchip/patches-5.15/075-v6.3-net-phy-Add-BIT-macro-for-Motorcomm-gigabit.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,107 @@ | ||
| From 4869a146cd60fc8115230f0a45e15e534c531922 Mon Sep 17 00:00:00 2001 | ||
| From: Frank Sae <Frank.Sae@motor-comm.com> | ||
| Date: Thu, 2 Feb 2023 11:00:34 +0800 | ||
| Subject: [PATCH] net: phy: Add BIT macro for Motorcomm yt8521/yt8531 gigabit | ||
| ethernet phy | ||
|
|
||
| Add BIT macro for Motorcomm yt8521/yt8531 gigabit ethernet phy. | ||
| This is a preparatory patch. Add BIT macro for 0xA012 reg, and | ||
| supplement for 0xA001 and 0xA003 reg. These will be used to support dts. | ||
|
|
||
| Signed-off-by: Frank Sae <Frank.Sae@motor-comm.com> | ||
| Reviewed-by: Andrew Lunn <andrew@lunn.ch> | ||
| Signed-off-by: David S. Miller <davem@davemloft.net> | ||
| --- | ||
| drivers/net/phy/motorcomm.c | 55 ++++++++++++++++++++++++++++++++++--- | ||
| 1 file changed, 51 insertions(+), 4 deletions(-) | ||
|
|
||
| --- a/drivers/net/phy/motorcomm.c | ||
| +++ b/drivers/net/phy/motorcomm.c | ||
| @@ -161,6 +161,11 @@ | ||
|
|
||
| #define YT8521_CHIP_CONFIG_REG 0xA001 | ||
| #define YT8521_CCR_SW_RST BIT(15) | ||
| +/* 1b0 disable 1.9ns rxc clock delay *default* | ||
| + * 1b1 enable 1.9ns rxc clock delay | ||
| + */ | ||
| +#define YT8521_CCR_RXC_DLY_EN BIT(8) | ||
| +#define YT8521_CCR_RXC_DLY_1_900_NS 1900 | ||
|
|
||
| #define YT8521_CCR_MODE_SEL_MASK (BIT(2) | BIT(1) | BIT(0)) | ||
| #define YT8521_CCR_MODE_UTP_TO_RGMII 0 | ||
| @@ -178,22 +183,41 @@ | ||
| #define YT8521_MODE_POLL 0x3 | ||
|
|
||
| #define YT8521_RGMII_CONFIG1_REG 0xA003 | ||
| - | ||
| +/* 1b0 use original tx_clk_rgmii *default* | ||
| + * 1b1 use inverted tx_clk_rgmii. | ||
| + */ | ||
| +#define YT8521_RC1R_TX_CLK_SEL_INVERTED BIT(14) | ||
| /* TX Gig-E Delay is bits 3:0, default 0x1 | ||
| * TX Fast-E Delay is bits 7:4, default 0xf | ||
| * RX Delay is bits 13:10, default 0x0 | ||
| * Delay = 150ps * N | ||
| * On = 2250ps, off = 0ps | ||
| */ | ||
| -#define YT8521_RC1R_RX_DELAY_MASK (0xF << 10) | ||
| +#define YT8521_RC1R_RX_DELAY_MASK GENMASK(13, 10) | ||
| #define YT8521_RC1R_RX_DELAY_EN (0xF << 10) | ||
| #define YT8521_RC1R_RX_DELAY_DIS (0x0 << 10) | ||
| -#define YT8521_RC1R_FE_TX_DELAY_MASK (0xF << 4) | ||
| +#define YT8521_RC1R_FE_TX_DELAY_MASK GENMASK(7, 4) | ||
| #define YT8521_RC1R_FE_TX_DELAY_EN (0xF << 4) | ||
| #define YT8521_RC1R_FE_TX_DELAY_DIS (0x0 << 4) | ||
| -#define YT8521_RC1R_GE_TX_DELAY_MASK (0xF << 0) | ||
| +#define YT8521_RC1R_GE_TX_DELAY_MASK GENMASK(3, 0) | ||
| #define YT8521_RC1R_GE_TX_DELAY_EN (0xF << 0) | ||
| #define YT8521_RC1R_GE_TX_DELAY_DIS (0x0 << 0) | ||
| +#define YT8521_RC1R_RGMII_0_000_NS 0 | ||
| +#define YT8521_RC1R_RGMII_0_150_NS 1 | ||
| +#define YT8521_RC1R_RGMII_0_300_NS 2 | ||
| +#define YT8521_RC1R_RGMII_0_450_NS 3 | ||
| +#define YT8521_RC1R_RGMII_0_600_NS 4 | ||
| +#define YT8521_RC1R_RGMII_0_750_NS 5 | ||
| +#define YT8521_RC1R_RGMII_0_900_NS 6 | ||
| +#define YT8521_RC1R_RGMII_1_050_NS 7 | ||
| +#define YT8521_RC1R_RGMII_1_200_NS 8 | ||
| +#define YT8521_RC1R_RGMII_1_350_NS 9 | ||
| +#define YT8521_RC1R_RGMII_1_500_NS 10 | ||
| +#define YT8521_RC1R_RGMII_1_650_NS 11 | ||
| +#define YT8521_RC1R_RGMII_1_800_NS 12 | ||
| +#define YT8521_RC1R_RGMII_1_950_NS 13 | ||
| +#define YT8521_RC1R_RGMII_2_100_NS 14 | ||
| +#define YT8521_RC1R_RGMII_2_250_NS 15 | ||
|
|
||
| #define YTPHY_MISC_CONFIG_REG 0xA006 | ||
| #define YTPHY_MCR_FIBER_SPEED_MASK BIT(0) | ||
| @@ -222,6 +246,29 @@ | ||
| */ | ||
| #define YTPHY_WCR_TYPE_PULSE BIT(0) | ||
|
|
||
| +#define YTPHY_SYNCE_CFG_REG 0xA012 | ||
| +#define YT8521_SCR_SYNCE_ENABLE BIT(5) | ||
| +/* 1b0 output 25m clock | ||
| + * 1b1 output 125m clock *default* | ||
| + */ | ||
| +#define YT8521_SCR_CLK_FRE_SEL_125M BIT(3) | ||
| +#define YT8521_SCR_CLK_SRC_MASK GENMASK(2, 1) | ||
| +#define YT8521_SCR_CLK_SRC_PLL_125M 0 | ||
| +#define YT8521_SCR_CLK_SRC_UTP_RX 1 | ||
| +#define YT8521_SCR_CLK_SRC_SDS_RX 2 | ||
| +#define YT8521_SCR_CLK_SRC_REF_25M 3 | ||
| +#define YT8531_SCR_SYNCE_ENABLE BIT(6) | ||
| +/* 1b0 output 25m clock *default* | ||
| + * 1b1 output 125m clock | ||
| + */ | ||
| +#define YT8531_SCR_CLK_FRE_SEL_125M BIT(4) | ||
| +#define YT8531_SCR_CLK_SRC_MASK GENMASK(3, 1) | ||
| +#define YT8531_SCR_CLK_SRC_PLL_125M 0 | ||
| +#define YT8531_SCR_CLK_SRC_UTP_RX 1 | ||
| +#define YT8531_SCR_CLK_SRC_SDS_RX 2 | ||
| +#define YT8531_SCR_CLK_SRC_CLOCK_FROM_DIGITAL 3 | ||
| +#define YT8531_SCR_CLK_SRC_REF_25M 4 | ||
| +#define YT8531_SCR_CLK_SRC_SSC_25M 5 | ||
| #define YT8531S_SYNCE_CFG_REG 0xA012 | ||
| #define YT8531S_SCR_SYNCE_ENABLE BIT(6) | ||
|
|
Oops, something went wrong.