Commit 2d23d8ba authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for_3.17-rc' of... 

Merge tag 'for_3.17-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus

Kishon writes:

misc fixes in PHY drivers
parents 9e82bf01 7652d35f

drivers/phy/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -214,12 +214,14 @@ config PHY_QCOM_IPQ806X_SATA 
config PHY_ST_SPEAR1310_MIPHY

	tristate "ST SPEAR1310-MIPHY driver"

	select GENERIC_PHY

	depends on MACH_SPEAR1310 || COMPILE_TEST

	help

	  Support for ST SPEAr1310 MIPHY which can be used for PCIe and SATA.



config PHY_ST_SPEAR1340_MIPHY

	tristate "ST SPEAR1340-MIPHY driver"

	select GENERIC_PHY

	depends on MACH_SPEAR1340 || COMPILE_TEST

	help

	  Support for ST SPEAr1340 MIPHY which can be used for PCIe and SATA.

drivers/phy/phy-miphy365x.c

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ enum miphy_sata_gen { 
};



static u8 rx_tx_spd[] = {

	0, /* GEN0 doesn't exist. */

	TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL,

	TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL,

	TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL