From: Tom Rini <trini@konsulko.com>
Date: Tue, 27 Jun 2017 13:32:37 +0000 (-0400)
Subject: Merge git://www.denx.de/git/u-boot-imx
X-Git-Tag: v2025.01-rc5-pxa1908~6505
X-Git-Url: http://git.dujemihanovic.xyz/html/%7B%7B%20.RelPermalink%20%7D%7D?a=commitdiff_plain;h=821560fd8e43eecc208c1c52ad24faadb6b52703;p=u-boot.git

Merge git://www.denx.de/git/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	include/configs/imx6qdl_icore_rqs.h
	include/configs/imx6ul_geam.h
	include/configs/imx6ul_isiot.h
---

821560fd8e43eecc208c1c52ad24faadb6b52703
diff --cc drivers/net/phy/Kconfig
index 1afd8097b2,ce1b30a4b6..0230852244
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@@ -57,41 -57,15 +57,49 @@@ config PHY_MARVEL
  
  config PHY_MICREL
  	bool "Micrel Ethernet PHYs support"
 +	help
 +	  Enable support for the GbE PHYs manufactured by Micrel (now
 +	  a part of Microchip). This includes drivers for the KSZ804,
 +	  KSZ8031, KSZ8051, KSZ8081, KSZ8895, KSZ886x, KSZ8721
 +	  either/or KSZ9021 (see the "Micrel KSZ9021 family support"
 +	  config option for details), and KSZ9031 (if configured).
 +
 +if PHY_MICREL
 +
 +config PHY_MICREL_KSZ9021
 +	bool "Micrel KSZ9021 family support"
 +	select PHY_GIGE
 +	help
 +	  Enable support for the Micrel KSZ9021 GbE PHY family.  If
 +	  enabled, the extended register read/write for KSZ9021 PHYs
 +	  is supported through the 'mdio' command and any RGMII signal
 +	  delays configured in the device tree will be applied to the
 +	  PHY during initialisation.
 +
 +	  Note that the KSZ9021 uses the same part number os the
 +	  KSZ8921BL, so enabling this option disables support for the
 +	  KSZ8721BL.
 +
 +config PHY_MICREL_KSZ9031
 +	bool "Micrel KSZ9031 family support"
 +	select PHY_GIGE
 +	help
 +	  Enable support for the Micrel KSZ9031 GbE PHY family.  If
 +	  enabled, the extended register read/write for KSZ9021 PHYs
 +	  is supported through the 'mdio' command and any RGMII signal
 +	  delays configured in the device tree will be applied to the
 +	  PHY during initialisatioin.
 +
 +endif # PHY_MICREL
  
+ config PHY_MICREL_KSZ9021
+ 	bool "Micrel KSZ9021 Ethernet PHYs support"
+ 	depends on PHY_MICREL
+ 	help
+           KSZ9021 is a completely integrated triple speed (10Base-T/100Base-TX/1000Base-T)
+ 	  Ethernet Physical Layer Transceiver for transmission and reception of data over
+ 	  standard CAT-5 unshielded twisted pair (UTP) cable.
+ 
  config PHY_MSCC
  	bool "Microsemi Corp Ethernet PHYs support"