diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2015-07-14 18:52:00 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2015-07-14 18:52:00 +0100 |
| commit | c3a494ca7b138539d5e74d2d0ab894dccae9bcfe (patch) | |
| tree | bc48dffc2fdab5ab84734506b9d344504aff8002 /amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch | |
| parent | 43c4e9c549b6fdaa76aa7780b480305fffbf5d25 (diff) | |
| download | kernel-c3a494ca7b138539d5e74d2d0ab894dccae9bcfe.tar.gz kernel-c3a494ca7b138539d5e74d2d0ab894dccae9bcfe.tar.xz kernel-c3a494ca7b138539d5e74d2d0ab894dccae9bcfe.zip | |
Update AMD Seattle a0 eth driver for 4.2
Diffstat (limited to 'amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch')
| -rw-r--r-- | amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch | 48 |
1 files changed, 37 insertions, 11 deletions
diff --git a/amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch b/amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch index 6a97ba502..c24edad0a 100644 --- a/amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch +++ b/amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch @@ -1,30 +1,53 @@ +From a3e660ae9fdeb53000eceeaf393e03cd087e37f7 Mon Sep 17 00:00:00 2001 From: Tom Lendacky <thomas.lendacky@amd.com> Date: Tue, 17 Mar 2015 10:58:38 -0500 -Subject: [PATCH] amd-xgbe-phy-a0: Add support for XGBE PHY on A0 +Subject: [PATCH 2/2] amd-xgbe-phy-a0: Add support for XGBE PHY on A0 Add XGBE phy driver support for A0 hardware. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> +[Add back AMD_XGBE_PHY removed upstream for B0 driver] +Signed-off-by: Mark Salter <msalter@redhat.com> --- - drivers/net/phy/Makefile | 2 + + drivers/net/phy/Kconfig | 7 + + drivers/net/phy/Makefile | 1 + drivers/net/phy/amd-xgbe-phy-a0.c | 1814 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 1816 insertions(+) + 3 files changed, 1822 insertions(+) create mode 100644 drivers/net/phy/amd-xgbe-phy-a0.c +diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig +index cb86d7a..a3138b1 100644 +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -24,6 +24,13 @@ config AMD_PHY + ---help--- + Currently supports the am79c874 + ++config AMD_XGBE_PHY ++ tristate "Driver for the AMD 10GbE (amd-xgbe) PHYs" ++ depends on (OF || ACPI) && HAS_IOMEM ++ depends on ARM64 || COMPILE_TEST ++ ---help--- ++ Currently supports the AMD 10GbE PHY ++ + config MARVELL_PHY + tristate "Drivers for Marvell PHYs" + ---help--- diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile -index fcc25a0c45cd..5be1b6f5861b 100644 +index fcc25a0..6ebb9ba 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -34,4 +34,6 @@ obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-mux-gpio.o - obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o - obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o - obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o -+obj-$(CONFIG_AMD_XGBE_PHY) += amd-xgbe-phy.o +@@ -29,6 +29,7 @@ obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o + obj-$(CONFIG_MICREL_KS8995MA) += spi_ks8995.o + obj-$(CONFIG_AT803X_PHY) += at803x.o + obj-$(CONFIG_AMD_PHY) += amd.o +obj-$(CONFIG_AMD_XGBE_PHY) += amd-xgbe-phy-a0.o - obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o + obj-$(CONFIG_MDIO_BUS_MUX) += mdio-mux.o + obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-mux-gpio.o + obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o diff --git a/drivers/net/phy/amd-xgbe-phy-a0.c b/drivers/net/phy/amd-xgbe-phy-a0.c new file mode 100644 -index 000000000000..c352d5c2989b +index 0000000..c352d5c --- /dev/null +++ b/drivers/net/phy/amd-xgbe-phy-a0.c @@ -0,0 +1,1814 @@ @@ -1842,3 +1865,6 @@ index 000000000000..c352d5c2989b + { } +}; +MODULE_DEVICE_TABLE(mdio, amd_xgbe_phy_a0_ids); +-- +2.4.5 + |