diff options
| author | Tejun Heo <tj@kernel.org> | 2013-12-03 16:39:51 +0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-12-03 16:39:51 +0400 |
| commit | c869325a45ce3369d456d7632409b675c3adb7ce (patch) | |
| tree | 4d71e7eee6dfbf94770fd5be829a241b2f83dc62 /drivers/ata/ahci_imx.c | |
| parent | 80361fa02e59cbc4ddfd4ceae18441092797149f (diff) | |
| parent | 10becdb402af4fd4808a0491a726b96128c41076 (diff) | |
| download | linux-c869325a45ce3369d456d7632409b675c3adb7ce.tar.xz | |
libata: Merge branch 'for-3.13-fixes' into for-3.14
Pulling in for-3.13-fixes for the ahci_imx fix as further changes
depend on it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/ahci_imx.c')
| -rw-r--r-- | drivers/ata/ahci_imx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c index ae2d73fe321e..3e23e9941dad 100644 --- a/drivers/ata/ahci_imx.c +++ b/drivers/ata/ahci_imx.c @@ -113,7 +113,7 @@ static int imx6q_sata_init(struct device *dev, void __iomem *mmio) /* * set PHY Paremeters, two steps to configure the GPR13, * one write for rest of parameters, mask of first write - * is 0x07fffffd, and the other one write for setting + * is 0x07ffffff, and the other one write for setting * the mpll_clk_en. */ regmap_update_bits(imxpriv->gpr, 0x34, IMX6Q_GPR13_SATA_RX_EQ_VAL_MASK @@ -124,6 +124,7 @@ static int imx6q_sata_init(struct device *dev, void __iomem *mmio) | IMX6Q_GPR13_SATA_TX_ATTEN_MASK | IMX6Q_GPR13_SATA_TX_BOOST_MASK | IMX6Q_GPR13_SATA_TX_LVL_MASK + | IMX6Q_GPR13_SATA_MPLL_CLK_EN | IMX6Q_GPR13_SATA_TX_EDGE_RATE , IMX6Q_GPR13_SATA_RX_EQ_VAL_3_0_DB | IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2M |