diff options
| author | John Crispin <john@openwrt.org> | 2016-03-22 21:14:51 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2016-03-22 21:14:51 +0000 |
| commit | 30d3a8c512c259614dd3da9cd1ef8d125c981555 (patch) | |
| tree | de6aa075fcb885d2109e8936a099e2a9f618482f /target/linux/mediatek/patches-4.4/0055-net-mediatek-remove-incorrect-dma_mask-assignment.patch | |
| parent | 1898144b5f0f5cfe45f09222e6ccd1544defb619 (diff) | |
| download | upstream-30d3a8c512c259614dd3da9cd1ef8d125c981555.tar.gz upstream-30d3a8c512c259614dd3da9cd1ef8d125c981555.tar.bz2 upstream-30d3a8c512c259614dd3da9cd1ef8d125c981555.zip | |
mediatek: update patches
fixes trgmii on old eco and adds nand support
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 49066
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0055-net-mediatek-remove-incorrect-dma_mask-assignment.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.4/0055-net-mediatek-remove-incorrect-dma_mask-assignment.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-4.4/0055-net-mediatek-remove-incorrect-dma_mask-assignment.patch b/target/linux/mediatek/patches-4.4/0055-net-mediatek-remove-incorrect-dma_mask-assignment.patch new file mode 100644 index 0000000000..4bf0947db8 --- /dev/null +++ b/target/linux/mediatek/patches-4.4/0055-net-mediatek-remove-incorrect-dma_mask-assignment.patch @@ -0,0 +1,36 @@ +From 9d602a7040c0fe9c81f2beffb3c277442a6d9ea2 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Mon, 14 Mar 2016 15:07:11 +0100 +Subject: [PATCH 55/66] net: mediatek: remove incorrect dma_mask assignment + +Device drivers should not mess with the DMA mask directly, +but instead call dma_set_mask() etc if needed. + +In case of the mtk_eth_soc driver, the mask already gets set +correctly when the device is created, and setting it again +is against the documented API. + +This removes the incorrect setting. + +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +--- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +index a005bc4..fcd4ed7 100644 +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -1678,9 +1678,6 @@ static int mtk_probe(struct platform_device *pdev) + struct mtk_eth *eth; + int err; + +- pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); +- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; +- + device_reset(&pdev->dev); + + match = of_match_device(of_mtk_match, &pdev->dev); +-- +1.7.10.4 + |