diff --git a/patch/kernel/sunxi-dev/board-pine-h6-pine-h6-0026-phy-sun4i-usb-add-support-for-H6-USB2-PHY.patch b/patch/kernel/sunxi-dev/board-pine-h6-pine-h6-0026-phy-sun4i-usb-add-support-for-H6-USB2-PHY.patch deleted file mode 100644 index 75091d92e1..0000000000 --- a/patch/kernel/sunxi-dev/board-pine-h6-pine-h6-0026-phy-sun4i-usb-add-support-for-H6-USB2-PHY.patch +++ /dev/null @@ -1,76 +0,0 @@ -From bd356126b12ba97fd56f9d662c1f8f5ac8fd97e9 Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Fri, 5 Jan 2018 18:32:55 +0800 -Subject: [PATCH 26/35] phy: sun4i-usb: add support for H6 USB2 PHY - -The USB 2.0 PHY on Allwinner H6 SoC is similar to older Allwinner SoCs, -with some USB0 quirk like A83T and PHY index 1/2 missing. - -Add support for it. - -Signed-off-by: Icenowy Zheng ---- - drivers/phy/allwinner/phy-sun4i-usb.c | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c -index d243695..5a253c1 100644 ---- a/drivers/phy/allwinner/phy-sun4i-usb.c -+++ b/drivers/phy/allwinner/phy-sun4i-usb.c -@@ -114,6 +114,7 @@ enum sun4i_usb_phy_type { - sun8i_h3_phy, - sun8i_v3s_phy, - sun50i_a64_phy, -+ sun50i_h6_phy, - }; - - struct sun4i_usb_phy_cfg { -@@ -294,7 +295,8 @@ static int sun4i_usb_phy_init(struct phy *_phy) - return ret; - } - -- if (data->cfg->type == sun8i_a83t_phy) { -+ if (data->cfg->type == sun8i_a83t_phy || -+ data->cfg->type == sun50i_h6_phy) { - if (phy->index == 0) { - val = readl(data->base + data->cfg->phyctl_offset); - val |= PHY_CTL_VBUSVLDEXT; -@@ -343,7 +345,8 @@ static int sun4i_usb_phy_exit(struct phy *_phy) - struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy); - - if (phy->index == 0) { -- if (data->cfg->type == sun8i_a83t_phy) { -+ if (data->cfg->type == sun8i_a83t_phy || -+ data->cfg->type == sun50i_h6_phy) { - void __iomem *phyctl = data->base + - data->cfg->phyctl_offset; - -@@ -946,6 +949,17 @@ static const struct sun4i_usb_phy_cfg sun50i_a64_cfg = { - .phy0_dual_route = true, - }; - -+static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { -+ .num_phys = 4, -+ .type = sun50i_h6_phy, -+ .disc_thresh = 3, -+ .phyctl_offset = REG_PHYCTL_A33, -+ .dedicated_clocks = true, -+ .enable_pmu_unk1 = true, -+ .phy0_dual_route = true, -+ .missing_phys = BIT(1) | BIT(2), -+}; -+ - static const struct of_device_id sun4i_usb_phy_of_match[] = { - { .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg }, - { .compatible = "allwinner,sun5i-a13-usb-phy", .data = &sun5i_a13_cfg }, -@@ -958,6 +972,7 @@ static const struct of_device_id sun4i_usb_phy_of_match[] = { - { .compatible = "allwinner,sun8i-v3s-usb-phy", .data = &sun8i_v3s_cfg }, - { .compatible = "allwinner,sun50i-a64-usb-phy", - .data = &sun50i_a64_cfg}, -+ { .compatible = "allwinner,sun50i-h6-usb-phy", .data = &sun50i_h6_cfg }, - { }, - }; - MODULE_DEVICE_TABLE(of, sun4i_usb_phy_of_match); --- -2.7.4 -