mirror of
https://github.com/Fishwaldo/build.git
synced 2025-04-02 04:01:23 +00:00
Marvell NEXT patch adjustments
This commit is contained in:
parent
4e2da08c27
commit
0abd7c2015
3 changed files with 1402 additions and 45 deletions
|
@ -22,8 +22,8 @@ index 5de8d5827536..9a5329bfd0fd 100644
|
||||||
.phy_id = MARVELL_PHY_ID_88E1510,
|
.phy_id = MARVELL_PHY_ID_88E1510,
|
||||||
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
||||||
.name = "Marvell 88E1510",
|
.name = "Marvell 88E1510",
|
||||||
- .features = PHY_GBIT_FEATURES,
|
- .features = PHY_GBIT_FEATURES | SUPPORTED_FIBRE,
|
||||||
+ .features = PHY_GBIT_FEATURES | SUPPORTED_Pause,
|
+ .features = PHY_GBIT_FEATURES | SUPPORTED_FIBRE | SUPPORTED_Pause,
|
||||||
.flags = PHY_HAS_INTERRUPT,
|
.flags = PHY_HAS_INTERRUPT,
|
||||||
.config_aneg = &m88e1510_config_aneg,
|
.config_aneg = &m88e1510_config_aneg,
|
||||||
.read_status = &marvell_read_status,
|
.read_status = &marvell_read_status,
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,43 +0,0 @@
|
||||||
From 31c0a49bb770afe520a0a7380da428b2af1f6fb9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
||||||
Date: Sun, 10 Jul 2016 16:27:38 +0100
|
|
||||||
Subject: [PATCH] ARM: dts: armada-388-clearfog: remove duplicate mdio entry
|
|
||||||
|
|
||||||
The clearfog DTS should not be defining the on-board phy, this device
|
|
||||||
is located on the microsom. Remove the duplicated definition.
|
|
||||||
|
|
||||||
Reported-by: Jon Nettleton <jon@solid-run.com>
|
|
||||||
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
||||||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
||||||
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/armada-388-clearfog.dts | 16 ----------------
|
|
||||||
1 file changed, 16 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
|
|
||||||
index 8a13265..74cc941 100644
|
|
||||||
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
|
|
||||||
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
|
|
||||||
@@ -201,22 +201,6 @@
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
- mdio@72004 {
|
|
||||||
- pinctrl-0 = <&mdio_pins>;
|
|
||||||
- pinctrl-names = "default";
|
|
||||||
-
|
|
||||||
- phy_dedicated: ethernet-phy@0 {
|
|
||||||
- /*
|
|
||||||
- * Annoyingly, the marvell phy driver
|
|
||||||
- * configures the LED register, rather
|
|
||||||
- * than preserving reset-loaded setting.
|
|
||||||
- * We undo that rubbish here.
|
|
||||||
- */
|
|
||||||
- marvell,reg-init = <3 16 0 0x101e>;
|
|
||||||
- reg = <0>;
|
|
||||||
- };
|
|
||||||
- };
|
|
||||||
-
|
|
||||||
pinctrl@18000 {
|
|
||||||
clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {
|
|
||||||
marvell,pins = "mpp46";
|
|
Loading…
Add table
Reference in a new issue