- Refreshed all patches - Removed upstreamed - Adapted 4 patches: 473-fix-marvell-phy-initialization-issues.patch ----------------------------------------------- Removed hunk 5 which got upstreamed 403-net-phy-avoid-setting-unsupported-EEE-advertisments.patch 404-net-phy-restart-phy-autonegotiation-after-EEE-advert.patch -------------------------------------------------------------- Adapted these 2 RFC patches, merging the delta's from an upstream commit (see below) which made it before these 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux- stable.git/commit/?h=v4.9.36&id=97ace183074d306942b903a148aebd5d061758f0 180-usb-xhci-add-support-for-performing-fake-doorbell.patch ----------------------------------------------------------- - Moved fake_doorbell bitmask due to new item Compile tested on: cns3xxx, imx6 Run tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>master
Koen Vandeputte
7 years ago
committed by
Hauke Mehrtens
parent
027aea8af7
commit
cd54b2d42b
@ -1,48 +0,0 @@ |
||||
From bb1a619735b4660f21bce3e728b937640024b4ad Mon Sep 17 00:00:00 2001
|
||||
From: Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com>
|
||||
Date: Wed, 8 Feb 2017 17:14:26 -0500
|
||||
Subject: [PATCH] net: phy: Initialize mdio clock at probe function
|
||||
|
||||
USB PHYs need the MDIO clock divisor enabled earlier to work.
|
||||
Initialize mdio clock divisor in probe function. The ext bus
|
||||
bit available in the same register will be used by mdio mux
|
||||
to enable external mdio.
|
||||
|
||||
Signed-off-by: Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com>
|
||||
Fixes: ddc24ae1 ("net: phy: Broadcom iProc MDIO bus driver")
|
||||
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/phy/mdio-bcm-iproc.c | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/drivers/net/phy/mdio-bcm-iproc.c
|
||||
+++ b/drivers/net/phy/mdio-bcm-iproc.c
|
||||
@@ -81,8 +81,6 @@ static int iproc_mdio_read(struct mii_bu
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
- iproc_mdio_config_clk(priv->base);
|
||||
-
|
||||
/* Prepare the read operation */
|
||||
cmd = (MII_DATA_TA_VAL << MII_DATA_TA_SHIFT) |
|
||||
(reg << MII_DATA_RA_SHIFT) |
|
||||
@@ -112,8 +110,6 @@ static int iproc_mdio_write(struct mii_b
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
- iproc_mdio_config_clk(priv->base);
|
||||
-
|
||||
/* Prepare the write operation */
|
||||
cmd = (MII_DATA_TA_VAL << MII_DATA_TA_SHIFT) |
|
||||
(reg << MII_DATA_RA_SHIFT) |
|
||||
@@ -163,6 +159,8 @@ static int iproc_mdio_probe(struct platf
|
||||
bus->read = iproc_mdio_read;
|
||||
bus->write = iproc_mdio_write;
|
||||
|
||||
+ iproc_mdio_config_clk(priv->base);
|
||||
+
|
||||
rc = of_mdiobus_register(bus, pdev->dev.of_node);
|
||||
if (rc) {
|
||||
dev_err(&pdev->dev, "MDIO bus registration failed\n");
|
||||
@ -1,39 +0,0 @@ |
||||
From 9fd7a158ec098ab05b8d3ec2c2973b3dc7e498f3 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Mon, 20 Feb 2017 20:01:16 +0100
|
||||
Subject: [PATCH] dmaengine: bcm2835: Fix cyclic DMA period splitting
|
||||
|
||||
The code responsible for splitting periods into chunks that
|
||||
can be handled by the DMA controller missed to update total_len,
|
||||
the number of bytes processed in the current period, when there
|
||||
are more chunks to follow.
|
||||
|
||||
Therefore total_len was stuck at 0 and the code didn't work at all.
|
||||
This resulted in a wrong control block layout and audio issues because
|
||||
the cyclic DMA callback wasn't executing on period boundaries.
|
||||
|
||||
Fix this by adding the missing total_len update.
|
||||
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
||||
Tested-by: Clive Messer <clive.messer@digitaldreamtime.co.uk>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
drivers/dma/bcm2835-dma.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/dma/bcm2835-dma.c
|
||||
+++ b/drivers/dma/bcm2835-dma.c
|
||||
@@ -253,8 +253,11 @@ static void bcm2835_dma_create_cb_set_le
|
||||
*/
|
||||
|
||||
/* have we filled in period_length yet? */
|
||||
- if (*total_len + control_block->length < period_len)
|
||||
+ if (*total_len + control_block->length < period_len) {
|
||||
+ /* update number of bytes in this period so far */
|
||||
+ *total_len += control_block->length;
|
||||
return;
|
||||
+ }
|
||||
|
||||
/* calculate the length that remains to reach period_length */
|
||||
control_block->length = period_len - *total_len;
|
||||
@ -1,30 +0,0 @@ |
||||
From: Tobias Wolf <dev-NTEO@vplace.de>
|
||||
Date: Wed, 23 Nov 2016 10:40:07 +0100
|
||||
Subject: [PATCH] of: Add check to of_scan_flat_dt() before accessing
|
||||
initial_boot_params
|
||||
|
||||
An empty __dtb_start to __dtb_end section might result in initial_boot_params
|
||||
being null for arch/mips/ralink. This showed that the boot process hangs
|
||||
indefinitely in of_scan_flat_dt().
|
||||
|
||||
Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
|
||||
---
|
||||
|
||||
--- a/drivers/of/fdt.c
|
||||
+++ b/drivers/of/fdt.c
|
||||
@@ -741,9 +741,12 @@ int __init of_scan_flat_dt(int (*it)(uns
|
||||
const char *pathp;
|
||||
int offset, rc = 0, depth = -1;
|
||||
|
||||
- for (offset = fdt_next_node(blob, -1, &depth);
|
||||
- offset >= 0 && depth >= 0 && !rc;
|
||||
- offset = fdt_next_node(blob, offset, &depth)) {
|
||||
+ if (!blob)
|
||||
+ return 0;
|
||||
+
|
||||
+ for (offset = fdt_next_node(blob, -1, &depth);
|
||||
+ offset >= 0 && depth >= 0 && !rc;
|
||||
+ offset = fdt_next_node(blob, offset, &depth)) {
|
||||
|
||||
pathp = fdt_get_name(blob, offset, NULL);
|
||||
if (*pathp == '/')
|
||||
@ -1,51 +0,0 @@ |
||||
From e7748d641ae37081e2034869491f1629461ae13c Mon Sep 17 00:00:00 2001
|
||||
From: Christian Lamparter <chunkeey@gmail.com>
|
||||
Date: Thu, 16 Mar 2017 21:00:18 +0100
|
||||
Subject: [PATCH] pinctrl: ipq4019: Add missing pingroups
|
||||
|
||||
This patch adds the missing PINGROUP for GPIO70-99.
|
||||
This fixes a crash that happens in pinctrl-msm, if any
|
||||
of the GPIO70-99 are accessed.
|
||||
|
||||
Fixes: 5303f7827fcd41d ("pinctrl: qcom: ipq4019: set ngpios to correct value")
|
||||
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
||||
---
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-ipq4019.c
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-ipq4019.c
|
||||
@@ -405,6 +405,36 @@ static const struct msm_pingroup ipq4019
|
||||
PINGROUP(67, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
PINGROUP(68, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
PINGROUP(69, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(70, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(71, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(72, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(73, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(74, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(75, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(76, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(77, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(78, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(79, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(80, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(81, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(82, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(83, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(84, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(85, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(86, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(87, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(88, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(89, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(90, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(91, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(92, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(93, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(94, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(95, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(96, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(97, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(98, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
+ PINGROUP(99, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
|
||||
};
|
||||
|
||||
static const struct msm_pinctrl_soc_data ipq4019_pinctrl = {
|
||||
@ -1,37 +0,0 @@ |
||||
From 833bfade96561216aa2129516a5926a0326860a2 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Mon, 17 Apr 2017 01:38:05 +0200
|
||||
Subject: spi: double time out tolerance
|
||||
|
||||
The generic SPI code calculates how long the issued transfer would take
|
||||
and adds 100ms in addition to the timeout as tolerance. On my 500 MHz
|
||||
Lantiq Mips SoC I am getting timeouts from the SPI like this when the
|
||||
system boots up:
|
||||
|
||||
m25p80 spi32766.4: SPI transfer timed out
|
||||
blk_update_request: I/O error, dev mtdblock3, sector 2
|
||||
SQUASHFS error: squashfs_read_data failed to read block 0x6e
|
||||
|
||||
After increasing the tolerance for the timeout to 200ms I haven't seen
|
||||
these SPI transfer time outs any more.
|
||||
The Lantiq SPI driver in use here has an extra work queue in between,
|
||||
which gets triggered when the controller send the last word and the
|
||||
hardware FIFOs used for reading and writing are only 8 words long.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
---
|
||||
drivers/spi/spi.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/spi/spi.c
|
||||
+++ b/drivers/spi/spi.c
|
||||
@@ -1004,7 +1004,7 @@ static int spi_transfer_one_message(stru
|
||||
ret = 0;
|
||||
ms = 8LL * 1000LL * xfer->len;
|
||||
do_div(ms, xfer->speed_hz);
|
||||
- ms += ms + 100; /* some tolerance */
|
||||
+ ms += ms + 200; /* some tolerance */
|
||||
|
||||
if (ms > UINT_MAX)
|
||||
ms = UINT_MAX;
|
||||
@ -1,26 +0,0 @@ |
||||
From: Russell King <rmk+kernel@armlinux.org.uk>
|
||||
Date: Fri, 23 Dec 2016 18:54:01 +0000
|
||||
Subject: [PATCH] net: phy: fix marvell phy status reading
|
||||
|
||||
The Marvell driver incorrectly provides phydev->lp_advertising as the
|
||||
logical and of the link partner's advert and our advert. This is
|
||||
incorrect - this field is supposed to store the link parter's unmodified
|
||||
advertisment.
|
||||
|
||||
This allows ethtool to report the correct link partner auto-negotiation
|
||||
status.
|
||||
|
||||
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
||||
---
|
||||
|
||||
--- a/drivers/net/phy/marvell.c
|
||||
+++ b/drivers/net/phy/marvell.c
|
||||
@@ -1114,8 +1114,6 @@ static int marvell_read_status_page(stru
|
||||
if (adv < 0)
|
||||
return adv;
|
||||
|
||||
- lpa &= adv;
|
||||
-
|
||||
if (status & MII_M1011_PHY_STATUS_FULLDUPLEX)
|
||||
phydev->duplex = DUPLEX_FULL;
|
||||
else
|
||||
Loading…
Reference in new issue