diff options
| author | John Crispin <john@phrozen.org> | 2020-02-04 07:46:52 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2020-02-04 07:48:09 +0100 |
| commit | 01c8f2e97cc6dd8d98edd6961b744858a387b7d0 (patch) | |
| tree | 67970bdb24a3517528740fc3bf235f6b36a1f6c4 /target/linux/mediatek/patches-4.19 | |
| parent | df773ead9a8e4ef492a35a0d936fefbe2066e729 (diff) | |
| download | upstream-01c8f2e97cc6dd8d98edd6961b744858a387b7d0.tar.gz upstream-01c8f2e97cc6dd8d98edd6961b744858a387b7d0.tar.bz2 upstream-01c8f2e97cc6dd8d98edd6961b744858a387b7d0.zip | |
mediatek: bump to v4.19
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/mediatek/patches-4.19')
| -rwxr-xr-x | target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch | 35 | ||||
| -rwxr-xr-x | target/linux/mediatek/patches-4.19/0228-arm-dts-bpir2-fix-console.patch | 11 |
2 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch b/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch new file mode 100755 index 0000000000..873dbed817 --- /dev/null +++ b/target/linux/mediatek/patches-4.19/0002-eth-fix-dsa-support.patch @@ -0,0 +1,35 @@ +diff -urN a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2019-12-23 11:42:02.728620670 +0800 ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2019-12-23 11:42:48.747289058 +0800 +@@ -999,11 +999,6 @@ + if (!(trxd.rxd2 & RX_DMA_DONE)) + break; + +- /* find out which mac the packet come from. values start at 1 */ +-#if defined(CONFIG_NET_DSA) +- mac = (trxd.rxd4 >> 22) & 0x1; +- mac = (mac + 1) % 2; +-#else + mac = (trxd.rxd4 >> RX_DMA_FPORT_SHIFT) & + RX_DMA_FPORT_MASK; + /* From QDMA(5). This is a external interface case of HWNAT. +@@ -1017,7 +1012,7 @@ + mac = 0; + else + mac--; +-#endif ++ + if (unlikely(mac < 0 || mac >= MTK_MAC_COUNT || + !eth->netdev[mac])) + goto release_desc; +@@ -2030,10 +2025,6 @@ + /* Disable RX VLan Offloading */ + mtk_w32(eth, 0, MTK_CDMP_EG_CTRL); + +-#if defined(CONFIG_NET_DSA) +- mtk_w32(eth, 0x81000001, MTK_CDMP_IG_CTRL); +-#endif +- + mtk_w32(eth, 0x8f0f8f0f, MTK_PDMA_DELAY_INT); + mtk_w32(eth, 0x8f0f8f0f, MTK_QDMA_DELAY_INT); + diff --git a/target/linux/mediatek/patches-4.19/0228-arm-dts-bpir2-fix-console.patch b/target/linux/mediatek/patches-4.19/0228-arm-dts-bpir2-fix-console.patch new file mode 100755 index 0000000000..8a3d68a405 --- /dev/null +++ b/target/linux/mediatek/patches-4.19/0228-arm-dts-bpir2-fix-console.patch @@ -0,0 +1,11 @@ +diff -urN a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2019-12-17 14:43:47.273940258 +0800 ++++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2019-12-17 14:44:20.300945884 +0800 +@@ -19,6 +19,7 @@ + + chosen { + stdout-path = "serial2:115200n8"; ++ bootargs = "console=ttyS2,115200n8"; + }; + + cpus { |