diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-13 14:56:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-13 14:56:05 +0200 |
| commit | dd534571bdabeea50e32399b7661b3204275e724 (patch) | |
| tree | d1cb34ffde79a411c5054630b505afb4bd4906d4 /drivers | |
| parent | ebe2e918c2f8d9afb309f941f516eee3d41e6c3d (diff) | |
| parent | faf2ec64e7442fda2e2330c0df047bcd902c5927 (diff) | |
| download | barebox-dd534571bdabeea50e32399b7661b3204275e724.tar.gz barebox-dd534571bdabeea50e32399b7661b3204275e724.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mci/mmci.c | 3 | ||||
| -rw-r--r-- | drivers/mfd/mc13xxx.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/phy.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mci/mmci.c b/drivers/mci/mmci.c index 9d1e858917..7489ee03a1 100644 --- a/drivers/mci/mmci.c +++ b/drivers/mci/mmci.c @@ -212,7 +212,7 @@ static u64 mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int host struct variant_data *variant = host->variant; do { - int count = readl(base + MMCIFIFOCNT) << 2; + int count = host_remain - (readl(base + MMCIFIFOCNT) << 2); if (count > host_remain) count = host_remain; @@ -264,7 +264,6 @@ static int read_bytes(struct mci_host *mci, char *dest, unsigned int blkcount, u dev_dbg(host->hw_dev, "read_bytes: blkcount=%u blksize=%u\n", blkcount, blksize); do { - mmci_writel(host, MMCIDATACTRL, mmci_readl(host, MMCIDATACTRL)); len = mmci_pio_read(host, dest, xfercount); xfercount -= len; dest += len; diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c index b2fcd95516..f6aa922425 100644 --- a/drivers/mfd/mc13xxx.c +++ b/drivers/mfd/mc13xxx.c @@ -219,6 +219,7 @@ static struct __init { { 0x0a, MC13892_REVISION_1_2, "1.2" }, { 0x10, MC13892_REVISION_2_0, "2.0" }, { 0x11, MC13892_REVISION_2_1, "2.1" }, + { 0x14, MC13892_REVISION_2_4, "2.4" }, { 0x18, MC13892_REVISION_3_0, "3.0" }, { 0x19, MC13892_REVISION_3_1, "3.1" }, { 0x1a, MC13892_REVISION_3_2, "3.2" }, diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 13b8324709..7132516aa1 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -311,8 +311,6 @@ static struct phy_device *of_phy_register_fixed_link(struct device_node *np, phydev->registered = 1; phydev->speed = 1000; phydev->duplex = 1; - phydev->pause = phydev->asym_pause = 0; - phydev->link = 1; return phydev; } |