LINUX_VERSION-3.18 = .136
LINUX_VERSION-4.9 = .162
-LINUX_VERSION-4.14 = .104
+LINUX_VERSION-4.14 = .105
LINUX_VERSION-4.19 = .25
LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c
LINUX_KERNEL_HASH-4.9.162 = b946f44edcc4e1b1ccf51ce17dd8f494556555b31b0663bbaabfad99100dacd5
-LINUX_KERNEL_HASH-4.14.104 = dd430e3e65138da5799b5ff7353e1a9c72f2f9dc957ac53d2aea3dd8ca7be067
+LINUX_KERNEL_HASH-4.14.105 = 398bdb98b4e4d0ad0e60f4fa530f3f8451ef8dafdf512b7754aa29953263f6e9
LINUX_KERNEL_HASH-4.19.25 = 7ec71d90d6e96e6f741676d157ac06f30c75be4eaf1649143a3c8b7d4f919731
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
reg &= ~DWC3_DCTL_INITU2ENA;
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
-@@ -3209,6 +3209,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
+@@ -3210,6 +3210,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
{
int ret;
int irq;
irq = dwc3_gadget_get_irq(dwc);
if (irq < 0) {
-@@ -3285,6 +3286,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
+@@ -3286,6 +3287,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
goto err4;
}
/* H3/A64 specific bits */
#define SYSCON_RMII_EN BIT(13) /* 1: enable RMII (overrides EPIT) */
-@@ -634,6 +640,159 @@ static int sun8i_dwmac_reset(struct stmm
+@@ -635,6 +641,159 @@ static int sun8i_dwmac_reset(struct stmm
return 0;
}
static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv)
{
struct sunxi_priv_data *gmac = priv->plat->bsp_priv;
-@@ -648,35 +807,25 @@ static int sun8i_dwmac_set_syscon(struct
+@@ -649,35 +808,25 @@ static int sun8i_dwmac_set_syscon(struct
"Current syscon value is not the default %x (expect %x)\n",
val, reg);
}
if (!of_property_read_u32(node, "allwinner,tx-delay-ps", &val)) {
-@@ -746,81 +895,21 @@ static void sun8i_dwmac_unset_syscon(str
+@@ -747,81 +896,21 @@ static void sun8i_dwmac_unset_syscon(str
regmap_write(gmac->regmap, SYSCON_EMAC_REG, reg);
}
clk_disable_unprepare(gmac->tx_clk);
-@@ -849,7 +938,7 @@ static struct mac_device_info *sun8i_dwm
+@@ -850,7 +939,7 @@ static struct mac_device_info *sun8i_dwm
if (!mac)
return NULL;
if (ret)
return NULL;
-@@ -889,6 +978,8 @@ static int sun8i_dwmac_probe(struct plat
+@@ -890,6 +979,8 @@ static int sun8i_dwmac_probe(struct plat
struct sunxi_priv_data *gmac;
struct device *dev = &pdev->dev;
int ret;
ret = stmmac_get_platform_resources(pdev, &stmmac_res);
if (ret)
-@@ -932,29 +1023,6 @@ static int sun8i_dwmac_probe(struct plat
+@@ -933,29 +1024,6 @@ static int sun8i_dwmac_probe(struct plat
}
plat_dat->interface = of_get_phy_mode(dev->of_node);
/* platform data specifying hardware features and callbacks.
* hardware features were copied from Allwinner drivers.
-@@ -973,9 +1041,34 @@ static int sun8i_dwmac_probe(struct plat
+@@ -974,9 +1042,34 @@ static int sun8i_dwmac_probe(struct plat
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
if (ret)