mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
a34255b795
Removed upstreamed: bcm27xx/patches-5.15/950-0446-drm-vc4-Fix-timings-for-VEC-modes.patch[1] Manually rebased: patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch All other patches automatically rebased 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.75&id=2810061452f9b748b096ad023d318690ca519aa3 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
67 lines
2.0 KiB
Diff
67 lines
2.0 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
|
|
@@ -18,6 +18,8 @@
|
|
#include <linux/phy/phy.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regmap.h>
|
|
+#include <linux/mfd/syscon.h>
|
|
+#include <linux/regmap.h>
|
|
|
|
/* version V1 sub-banks offset base address */
|
|
/* banks shared by multiple phys */
|
|
@@ -311,6 +313,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,
|
|
@@ -377,6 +382,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 */
|
|
@@ -730,6 +736,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);
|
|
+
|
|
tmp = readl(u3_banks->phya + U3P_U3_PHYA_DA_REG0);
|
|
tmp &= ~(P3A_RG_XTAL_EXT_PE1H | P3A_RG_XTAL_EXT_PE2H);
|
|
tmp |= P3A_RG_XTAL_EXT_PE1H_VAL(0x2) | P3A_RG_XTAL_EXT_PE2H_VAL(0x2);
|
|
@@ -1437,6 +1447,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;
|