uboot-kirkwood: refresh patches

This is only cosmetic, but the next one adding a patch here would
have to do it anyway, and thus will get a smaller diff for review
now.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2021-06-06 19:06:29 +02:00
parent 03d66d6b8f
commit 482e65a16d
10 changed files with 35 additions and 45 deletions

View File

@ -206,7 +206,7 @@
#endif /* _CONFIG_NSA310S_H */ #endif /* _CONFIG_NSA310S_H */
--- a/configs/sheevaplug_defconfig --- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig
@@ -49,4 +49,7 @@ @@ -49,4 +49,7 @@ CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

View File

@ -17,8 +17,6 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
drivers/net/phy/mv88e61xx.c | 11 ++++++++++- drivers/net/phy/mv88e61xx.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-) 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 5aff7ed397..889327639d 100644
--- a/drivers/net/phy/mv88e61xx.c --- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c
@@ -94,6 +94,8 @@ @@ -94,6 +94,8 @@
@ -30,7 +28,7 @@ index 5aff7ed397..889327639d 100644
#define PORT_REG_PHYS_CTRL_PCS_AN_EN BIT(10) #define PORT_REG_PHYS_CTRL_PCS_AN_EN BIT(10)
#define PORT_REG_PHYS_CTRL_PCS_AN_RST BIT(9) #define PORT_REG_PHYS_CTRL_PCS_AN_RST BIT(9)
#define PORT_REG_PHYS_CTRL_FC_VALUE BIT(7) #define PORT_REG_PHYS_CTRL_FC_VALUE BIT(7)
@@ -747,9 +749,16 @@ static int mv88e61xx_fixed_port_setup(struct phy_device *phydev, u8 port) @@ -747,9 +749,16 @@ static int mv88e61xx_fixed_port_setup(st
PORT_REG_PHYS_CTRL_SPD1000; PORT_REG_PHYS_CTRL_SPD1000;
} }
@ -48,6 +46,3 @@ index 5aff7ed397..889327639d 100644
return mv88e61xx_port_write(phydev, port, PORT_REG_PHYS_CTRL, return mv88e61xx_port_write(phydev, port, PORT_REG_PHYS_CTRL,
val); val);
--
2.20.1

View File

@ -16,8 +16,6 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
drivers/net/phy/mv88e61xx.c | 14 ++++++++++++++ drivers/net/phy/mv88e61xx.c | 14 ++++++++++++++
1 file changed, 14 insertions(+) 1 file changed, 14 insertions(+)
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 889327639d..e0b648a54e 100644
--- a/drivers/net/phy/mv88e61xx.c --- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c
@@ -180,6 +180,7 @@ @@ -180,6 +180,7 @@
@ -28,7 +26,7 @@ index 889327639d..e0b648a54e 100644
#define PORT_SWITCH_ID_6172 0x1720 #define PORT_SWITCH_ID_6172 0x1720
#define PORT_SWITCH_ID_6176 0x1760 #define PORT_SWITCH_ID_6176 0x1760
#define PORT_SWITCH_ID_6220 0x2200 #define PORT_SWITCH_ID_6220 0x2200
@@ -997,6 +998,7 @@ static int mv88e61xx_probe(struct phy_device *phydev) @@ -997,6 +998,7 @@ static int mv88e61xx_probe(struct phy_de
switch (priv->id) { switch (priv->id) {
case PORT_SWITCH_ID_6096: case PORT_SWITCH_ID_6096:
case PORT_SWITCH_ID_6097: case PORT_SWITCH_ID_6097:
@ -36,7 +34,7 @@ index 889327639d..e0b648a54e 100644
case PORT_SWITCH_ID_6172: case PORT_SWITCH_ID_6172:
case PORT_SWITCH_ID_6176: case PORT_SWITCH_ID_6176:
case PORT_SWITCH_ID_6240: case PORT_SWITCH_ID_6240:
@@ -1152,6 +1154,17 @@ static struct phy_driver mv88e61xx_driver = { @@ -1152,6 +1154,17 @@ static struct phy_driver mv88e61xx_drive
.shutdown = &genphy_shutdown, .shutdown = &genphy_shutdown,
}; };
@ -54,7 +52,7 @@ index 889327639d..e0b648a54e 100644
static struct phy_driver mv88e609x_driver = { static struct phy_driver mv88e609x_driver = {
.name = "Marvell MV88E609x", .name = "Marvell MV88E609x",
.uid = 0x1410c89, .uid = 0x1410c89,
@@ -1177,6 +1190,7 @@ static struct phy_driver mv88e6071_driver = { @@ -1177,6 +1190,7 @@ static struct phy_driver mv88e6071_drive
int phy_mv88e61xx_init(void) int phy_mv88e61xx_init(void)
{ {
phy_register(&mv88e61xx_driver); phy_register(&mv88e61xx_driver);
@ -62,6 +60,3 @@ index 889327639d..e0b648a54e 100644
phy_register(&mv88e609x_driver); phy_register(&mv88e609x_driver);
phy_register(&mv88e6071_driver); phy_register(&mv88e6071_driver);
--
2.20.1