64b53247c4
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
86 lines
2.4 KiB
Diff
86 lines
2.4 KiB
Diff
From d42ebed1aa669c5a897ec0aa5e1ede8d9069894a Mon Sep 17 00:00:00 2001
|
|
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Date: Thu, 21 Sep 2017 18:31:49 +0800
|
|
Subject: [PATCH 125/224] phy: phy-mtk-tphy: add set_mode callback
|
|
|
|
This is used to force PHY with USB OTG function to enter a specific
|
|
mode, and override OTG IDPIN(or IDDIG) signal.
|
|
|
|
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
|
|
---
|
|
drivers/phy/mediatek/phy-mtk-tphy.c | 39 +++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 39 insertions(+)
|
|
|
|
--- a/drivers/phy/mediatek/phy-mtk-tphy.c
|
|
+++ b/drivers/phy/mediatek/phy-mtk-tphy.c
|
|
@@ -96,9 +96,11 @@
|
|
|
|
#define U3P_U2PHYDTM1 0x06C
|
|
#define P2C_RG_UART_EN BIT(16)
|
|
+#define P2C_FORCE_IDDIG BIT(9)
|
|
#define P2C_RG_VBUSVALID BIT(5)
|
|
#define P2C_RG_SESSEND BIT(4)
|
|
#define P2C_RG_AVALID BIT(2)
|
|
+#define P2C_RG_IDDIG BIT(1)
|
|
|
|
#define U3P_U3_CHIP_GPIO_CTLD 0x0c
|
|
#define P3C_REG_IP_SW_RST BIT(31)
|
|
@@ -585,6 +587,31 @@ static void u2_phy_instance_exit(struct
|
|
}
|
|
}
|
|
|
|
+static void u2_phy_instance_set_mode(struct mtk_tphy *tphy,
|
|
+ struct mtk_phy_instance *instance,
|
|
+ enum phy_mode mode)
|
|
+{
|
|
+ struct u2phy_banks *u2_banks = &instance->u2_banks;
|
|
+ u32 tmp;
|
|
+
|
|
+ tmp = readl(u2_banks->com + U3P_U2PHYDTM1);
|
|
+ switch (mode) {
|
|
+ case PHY_MODE_USB_DEVICE:
|
|
+ tmp |= P2C_FORCE_IDDIG | P2C_RG_IDDIG;
|
|
+ break;
|
|
+ case PHY_MODE_USB_HOST:
|
|
+ tmp |= P2C_FORCE_IDDIG;
|
|
+ tmp &= ~P2C_RG_IDDIG;
|
|
+ break;
|
|
+ case PHY_MODE_USB_OTG:
|
|
+ tmp &= ~(P2C_FORCE_IDDIG | P2C_RG_IDDIG);
|
|
+ break;
|
|
+ default:
|
|
+ return;
|
|
+ }
|
|
+ writel(tmp, u2_banks->com + U3P_U2PHYDTM1);
|
|
+}
|
|
+
|
|
static void pcie_phy_instance_init(struct mtk_tphy *tphy,
|
|
struct mtk_phy_instance *instance)
|
|
{
|
|
@@ -881,6 +908,17 @@ static int mtk_phy_exit(struct phy *phy)
|
|
return 0;
|
|
}
|
|
|
|
+static int mtk_phy_set_mode(struct phy *phy, enum phy_mode mode)
|
|
+{
|
|
+ struct mtk_phy_instance *instance = phy_get_drvdata(phy);
|
|
+ struct mtk_tphy *tphy = dev_get_drvdata(phy->dev.parent);
|
|
+
|
|
+ if (instance->type == PHY_TYPE_USB2)
|
|
+ u2_phy_instance_set_mode(tphy, instance, mode);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static struct phy *mtk_phy_xlate(struct device *dev,
|
|
struct of_phandle_args *args)
|
|
{
|
|
@@ -931,6 +969,7 @@ static const struct phy_ops mtk_tphy_ops
|
|
.exit = mtk_phy_exit,
|
|
.power_on = mtk_phy_power_on,
|
|
.power_off = mtk_phy_power_off,
|
|
+ .set_mode = mtk_phy_set_mode,
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|