mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-30 10:42:22 +00:00
659f4a13dd
With Linux 6.1 many of our downstream patches and out-of-tree files can be removed or at least replaced by backported upstream commits. Signed-off-by: Daniel Golle <daniel@makrotopia.org> [fix CMDLINE_OVERRIDE for arm64] Signed-off-by: Bjørn Mork <bjorn@mork.no>
67 lines
1.9 KiB
Diff
67 lines
1.9 KiB
Diff
From 28f9a5e2a3f5441ab5594669ed82da11e32277a9 Mon Sep 17 00:00:00 2001
|
|
From: Kristian Evensen <kristian.evensen@gmail.com>
|
|
Date: Mon, 30 Apr 2018 14:38:01 +0200
|
|
Subject: [PATCH] phy: phy-mtk-tphy: Add hifsys-support
|
|
|
|
---
|
|
drivers/phy/mediatek/phy-mtk-tphy.c | 20 ++++++++++++++++++++
|
|
1 file changed, 20 insertions(+)
|
|
|
|
--- a/drivers/phy/mediatek/phy-mtk-tphy.c
|
|
+++ b/drivers/phy/mediatek/phy-mtk-tphy.c
|
|
@@ -17,6 +17,8 @@
|
|
#include <linux/phy/phy.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regmap.h>
|
|
+#include <linux/mfd/syscon.h>
|
|
+#include <linux/regmap.h>
|
|
|
|
#include "phy-mtk-io.h"
|
|
|
|
@@ -264,6 +266,9 @@
|
|
|
|
#define TPHY_CLKS_CNT 2
|
|
|
|
+#define HIF_SYSCFG1 0x14
|
|
+#define HIF_SYSCFG1_PHY2_MASK (0x3 << 20)
|
|
+
|
|
enum mtk_phy_version {
|
|
MTK_PHY_V1 = 1,
|
|
MTK_PHY_V2,
|
|
@@ -331,6 +336,7 @@ struct mtk_tphy {
|
|
void __iomem *sif_base; /* only shared sif */
|
|
const struct mtk_phy_pdata *pdata;
|
|
struct mtk_phy_instance **phys;
|
|
+ struct regmap *hif;
|
|
int nphys;
|
|
int src_ref_clk; /* MHZ, reference clock for slew rate calibrate */
|
|
int src_coef; /* coefficient for slew rate calibrate */
|
|
@@ -596,6 +602,10 @@ static void pcie_phy_instance_init(struc
|
|
if (tphy->pdata->version != MTK_PHY_V1)
|
|
return;
|
|
|
|
+ if (tphy->hif)
|
|
+ regmap_update_bits(tphy->hif, HIF_SYSCFG1,
|
|
+ HIF_SYSCFG1_PHY2_MASK, 0);
|
|
+
|
|
mtk_phy_update_bits(phya + U3P_U3_PHYA_DA_REG0,
|
|
P3A_RG_XTAL_EXT_PE1H | P3A_RG_XTAL_EXT_PE2H,
|
|
FIELD_PREP(P3A_RG_XTAL_EXT_PE1H, 0x2) |
|
|
@@ -1241,6 +1251,16 @@ static int mtk_tphy_probe(struct platfor
|
|
&tphy->src_coef);
|
|
}
|
|
|
|
+ if (of_find_property(np, "mediatek,phy-switch", NULL)) {
|
|
+ tphy->hif = syscon_regmap_lookup_by_phandle(np,
|
|
+ "mediatek,phy-switch");
|
|
+ if (IS_ERR(tphy->hif)) {
|
|
+ dev_err(&pdev->dev,
|
|
+ "missing \"mediatek,phy-switch\" phandle\n");
|
|
+ return PTR_ERR(tphy->hif);
|
|
+ }
|
|
+ }
|
|
+
|
|
port = 0;
|
|
for_each_child_of_node(np, child_np) {
|
|
struct mtk_phy_instance *instance;
|