switch to mainline kernel + add corresponding config + patchfiles (for v5.9)

This commit is contained in:
Christian Zimmermann 2020-11-28 15:51:51 +01:00
parent 56850cd209
commit 63611ecac8
2 changed files with 9281 additions and 0 deletions

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,53 @@
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 1aaf47a0da2b..a2b5372d9dd6 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1223,6 +1223,7 @@ mt7530_setup(struct dsa_switch *ds)
ds->configure_vlan_while_not_filtering = true;
if (priv->id == ID_MT7530) {
+ /*
regulator_set_voltage(priv->core_pwr, 1000000, 1000000);
ret = regulator_enable(priv->core_pwr);
if (ret < 0) {
@@ -1238,6 +1239,7 @@ mt7530_setup(struct dsa_switch *ds)
ret);
return ret;
}
+ */
}
/* Reset whole chip through gpio pin or memory-mapped registers for
@@ -1633,6 +1635,7 @@ mt7530_probe(struct mdio_device *mdiodev)
priv->id = (unsigned int)(unsigned long)
of_device_get_match_data(&mdiodev->dev);
+ /*
if (priv->id == ID_MT7530) {
priv->core_pwr = devm_regulator_get(&mdiodev->dev, "core");
if (IS_ERR(priv->core_pwr))
@@ -1642,6 +1645,7 @@ mt7530_probe(struct mdio_device *mdiodev)
if (IS_ERR(priv->io_pwr))
return PTR_ERR(priv->io_pwr);
}
+ */
/* Not MCM that indicates switch works as the remote standalone
* integrated circuit so the GPIO pin would be used to complete
@@ -1673,6 +1677,7 @@ mt7530_remove(struct mdio_device *mdiodev)
struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);
int ret = 0;
+ /*
ret = regulator_disable(priv->core_pwr);
if (ret < 0)
dev_err(priv->dev,
@@ -1682,7 +1687,7 @@ mt7530_remove(struct mdio_device *mdiodev)
if (ret < 0)
dev_err(priv->dev, "Failed to disable io pwr: %d\n",
ret);
-
+ */
dsa_unregister_switch(priv->ds);
mutex_destroy(&priv->reg_mutex);
}