lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Kishon writes:

misc fixes in PHY drivers
This commit is contained in:
Greg Kroah-Hartman
2014-09-19 14:58:20 -07:00
parent 9e82bf0141 7652d35f98
commit 2d23d8ba31
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/phy/Kconfig
View File

@@ -214,12 +214,14 @@ config PHY_QCOM_IPQ806X_SATA
config PHY_ST_SPEAR1310_MIPHY config PHY_ST_SPEAR1310_MIPHY
tristate "ST SPEAR1310-MIPHY driver" tristate "ST SPEAR1310-MIPHY driver"
select GENERIC_PHY select GENERIC_PHY
depends on MACH_SPEAR1310 || COMPILE_TEST
help help
Support for ST SPEAr1310 MIPHY which can be used for PCIe and SATA. Support for ST SPEAr1310 MIPHY which can be used for PCIe and SATA.
config PHY_ST_SPEAR1340_MIPHY config PHY_ST_SPEAR1340_MIPHY
tristate "ST SPEAR1340-MIPHY driver" tristate "ST SPEAR1340-MIPHY driver"
select GENERIC_PHY select GENERIC_PHY
depends on MACH_SPEAR1340 || COMPILE_TEST
help help
Support for ST SPEAr1340 MIPHY which can be used for PCIe and SATA. Support for ST SPEAr1340 MIPHY which can be used for PCIe and SATA.

1
drivers/phy/phy-miphy365x.c
View File

@@ -163,6 +163,7 @@ enum miphy_sata_gen {
}; };
static u8 rx_tx_spd[] = { static u8 rx_tx_spd[] = {
0, /* GEN0 doesn't exist. */
TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL, TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL,
TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL, TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL,
TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL