misc fixes in PHY drivers

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUEpRHAAoJEA5ceFyATYLZe2MP/2fjZw4TFJeWna08IBQq5kwg
 yfcseeAOOBqPxYeHkiwn+thegt+jt+wf7BOe6XxsdIeFRpplz8Jz+hbDxS7aNG1R
 9oUDA4DtNq7yd7M5+q0GBNlgJDkTk7TmKvULhY0LoB9pkPToY5CWuhmC5ZfypwlC
 ZIcUlb6acv/1dzEotOJcHwchWEBjl6erXtmtVFQYRw3b4loLJKncrYDiG4YWmzPv
 9VxEED6wh0DyXU52aXuJlWzJWjreciVw/sLyXSmbvXtH8f4DKhA+xwad16a2LxPq
 Nnp6k4/PaihKAvusketDMH497qzm5wUvnzxV8GdtGhZa9wGX45f86eNtU4JHF7V0
 kWR+DHw0Awlup1rXyVzlVXuu8uHn9kPHGSaqHQx8dbZSfb1vV5Ruxw0ToH1A5385
 m6VecWtUoY2avWOE9/z/dppwW6yLAF/ZH5nnQdL2foA7UYODWyHIEjWsT0x3I/NU
 fhcueASUusHWTgCdKxcmEBdRU/tBubyE4dPR+w/4elGhCU+RIcM178buc7Dt27Py
 xzn9t6cVXSWxLPN70M5fpJ3VwHtvdVg87nkscViMK0idw1r+Ok1HkyaK0J3IbuQK
 a/WWkP+8SW8Ugla9Wxc1/n0aa6bVzbfylcgtF/CIMCmyiR1ABvjt0zlRHBG97k/S
 7QDRzMX3fwYpiBBPDL7V
 =BOdg
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Greg Kroah-Hartman 2014-09-19 14:58:20 -07:00
commit 2d23d8ba31
2 changed files with 3 additions and 0 deletions

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.

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