kernel: refresh patches
Fixes: 098690ddf3 ("Merge Official Source")
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
+2
-2
@@ -31,7 +31,7 @@ Signed-off-by: Yangyu Chen <cyy@cyyself.name>
|
||||
#define RTL8366RB_POWER_SAVE 0x15
|
||||
#define RTL8366RB_POWER_SAVE_ON BIT(12)
|
||||
|
||||
@@ -1436,6 +1442,45 @@ static int rtl822x_config_init(struct ph
|
||||
@@ -1442,6 +1448,45 @@ static int rtl822x_config_init(struct ph
|
||||
return rtl822x_set_serdes_option_mode(phydev, true);
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ Signed-off-by: Yangyu Chen <cyy@cyyself.name>
|
||||
static int rtl822xb_config_init(struct phy_device *phydev)
|
||||
{
|
||||
return rtl822x_set_serdes_option_mode(phydev, false);
|
||||
@@ -1585,7 +1630,7 @@ static int rtl822x_read_status(struct ph
|
||||
@@ -1591,7 +1636,7 @@ static int rtl822x_read_status(struct ph
|
||||
|
||||
mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, lpadv);
|
||||
|
||||
|
||||
+6
-6
@@ -13,8 +13,8 @@ Signed-off-by: Jensen Huang <jensenhuang@friendlyarm.com>
|
||||
|
||||
--- a/drivers/mmc/core/card.h
|
||||
+++ b/drivers/mmc/core/card.h
|
||||
@@ -300,4 +300,9 @@ static inline int mmc_card_no_uhs_ddr50_
|
||||
return c->quirks & MMC_QUIRK_NO_UHS_DDR50_TUNING;
|
||||
@@ -305,4 +305,9 @@ static inline int mmc_card_fixed_secure_
|
||||
return c->quirks & MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME;
|
||||
}
|
||||
|
||||
+static inline int mmc_card_broken_rocr_s18a(const struct mmc_card *c)
|
||||
@@ -25,7 +25,7 @@ Signed-off-by: Jensen Huang <jensenhuang@friendlyarm.com>
|
||||
#endif
|
||||
--- a/drivers/mmc/core/quirks.h
|
||||
+++ b/drivers/mmc/core/quirks.h
|
||||
@@ -207,6 +207,9 @@ static const struct mmc_fixup __maybe_un
|
||||
@@ -216,6 +216,9 @@ static const struct mmc_fixup __maybe_un
|
||||
MMC_QUIRK_LENIENT_FN0 |
|
||||
MMC_QUIRK_BLKSZ_FOR_BYTE_MODE),
|
||||
|
||||
@@ -50,11 +50,11 @@ Signed-off-by: Jensen Huang <jensenhuang@friendlyarm.com>
|
||||
* to switch to 1.8V signaling level. No 1.8v signalling if
|
||||
--- a/include/linux/mmc/card.h
|
||||
+++ b/include/linux/mmc/card.h
|
||||
@@ -296,6 +296,7 @@ struct mmc_card {
|
||||
#define MMC_QUIRK_BROKEN_CACHE_FLUSH (1<<16) /* Don't flush cache until the write has occurred */
|
||||
@@ -297,6 +297,7 @@ struct mmc_card {
|
||||
#define MMC_QUIRK_BROKEN_SD_POWEROFF_NOTIFY (1<<17) /* Disable broken SD poweroff notify support */
|
||||
#define MMC_QUIRK_NO_UHS_DDR50_TUNING (1<<18) /* Disable DDR50 tuning */
|
||||
+#define MMC_QUIRK_BROKEN_ROCR_S18A (1<<19) /* Disable broken S18A (1) in the R4 response */
|
||||
#define MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME (1<<20) /* Secure erase/trim time is fixed regardless of size */
|
||||
+#define MMC_QUIRK_BROKEN_ROCR_S18A (1<<21) /* Disable broken S18A (1) in the R4 response */
|
||||
|
||||
bool written_flag; /* Indicates eMMC has been written since power on */
|
||||
bool reenable_cmdq; /* Re-enable Command Queue */
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ Signed-off-by: jensen <jensenhuang@friendlyarm.com>
|
||||
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
@@ -7681,7 +7681,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||
@@ -7686,7 +7686,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||
ndev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;
|
||||
priv->hw->hw_vlan_en = true;
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
@@ -7505,6 +7505,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||
@@ -7510,6 +7510,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||
{
|
||||
struct net_device *ndev = NULL;
|
||||
struct stmmac_priv *priv;
|
||||
@@ -8,7 +8,7 @@
|
||||
u32 rxq;
|
||||
int i, ret = 0;
|
||||
|
||||
@@ -7513,6 +7514,9 @@ int stmmac_dvr_probe(struct device *devi
|
||||
@@ -7518,6 +7519,9 @@ int stmmac_dvr_probe(struct device *devi
|
||||
if (!ndev)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ Signed-off-by: Jensen Huang <jensenhuang@friendlyarm.com>
|
||||
|
||||
--- a/drivers/mmc/core/card.h
|
||||
+++ b/drivers/mmc/core/card.h
|
||||
@@ -316,4 +316,9 @@ static inline int mmc_card_no_uhs_ddr50_
|
||||
@@ -316,4 +316,9 @@ static inline int mmc_card_fixed_secure_
|
||||
return c->quirks & MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ Signed-off-by: jensen <jensenhuang@friendlyarm.com>
|
||||
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
@@ -7587,7 +7587,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||
@@ -7596,7 +7596,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||
ndev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;
|
||||
priv->hw->hw_vlan_en = true;
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
@@ -7409,6 +7409,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||
@@ -7418,6 +7418,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||
{
|
||||
struct net_device *ndev = NULL;
|
||||
struct stmmac_priv *priv;
|
||||
@@ -8,7 +8,7 @@
|
||||
u32 rxq;
|
||||
int i, ret = 0;
|
||||
|
||||
@@ -7417,6 +7418,9 @@ int stmmac_dvr_probe(struct device *devi
|
||||
@@ -7426,6 +7427,9 @@ int stmmac_dvr_probe(struct device *devi
|
||||
if (!ndev)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
|
||||
--- a/drivers/spi/spi-sun6i.c
|
||||
+++ b/drivers/spi/spi-sun6i.c
|
||||
@@ -795,10 +795,13 @@ static const struct sun6i_spi_cfg sun50i
|
||||
@@ -801,10 +801,13 @@ static const struct sun6i_spi_cfg sun50i
|
||||
static const struct of_device_id sun6i_spi_match[] = {
|
||||
{ .compatible = "allwinner,sun6i-a31-spi", .data = &sun6i_a31_spi_cfg },
|
||||
{ .compatible = "allwinner,sun8i-h3-spi", .data = &sun8i_h3_spi_cfg },
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
/* As long as the interface is active, we keep the timestamping counter enabled
|
||||
* with fine resolution and binary rollover. This avoid non-monotonic behavior
|
||||
* (clock jumps) when changing timestamping settings at runtime.
|
||||
@@ -7899,6 +7902,16 @@ int stmmac_resume(struct device *dev)
|
||||
@@ -7908,6 +7911,16 @@ int stmmac_resume(struct device *dev)
|
||||
stmmac_free_tx_skbufs(priv);
|
||||
stmmac_clear_descriptors(priv, &priv->dma_conf);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user