diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-21 14:21:08 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-27 00:27:56 +0200 |
| commit | a2a75c21bdb1afc6786d01693c8a52f34197ea9b (patch) | |
| tree | a20ada2bbaabe985c2a6c67590ca6e476a3f6c64 /target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch | |
| parent | 8b0278a17eea57558ff38e825f37c538af3827e2 (diff) | |
| download | upstream-a2a75c21bdb1afc6786d01693c8a52f34197ea9b.tar.gz upstream-a2a75c21bdb1afc6786d01693c8a52f34197ea9b.tar.bz2 upstream-a2a75c21bdb1afc6786d01693c8a52f34197ea9b.zip | |
kernel: Update kernel 4.14 to version 4.14.195
Compile and runtime tested on lantiq/xrx200 and x86/64.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch')
| -rw-r--r-- | target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch index 30f2ea720f..f4893afb7a 100644 --- a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch @@ -1736,7 +1736,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> static void enable_rams_ecc(struct fman_fpm_regs __iomem *fpm_rg) { -@@ -1919,7 +1941,10 @@ _return: +@@ -1918,7 +1940,10 @@ _return: static int fman_init(struct fman *fman) { struct fman_cfg *cfg = NULL; @@ -1748,7 +1748,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> if (is_init_done(fman->cfg)) return -EINVAL; -@@ -1939,6 +1964,7 @@ static int fman_init(struct fman *fman) +@@ -1938,6 +1963,7 @@ static int fman_init(struct fman *fman) memset_io((void __iomem *)(fman->base_addr + CGP_OFFSET), 0, fman->state->fm_port_num_of_cg); @@ -1756,7 +1756,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> /* Save LIODN info before FMan reset * Skipping non-existent port 0 (i = 1) */ -@@ -1958,6 +1984,9 @@ static int fman_init(struct fman *fman) +@@ -1957,6 +1983,9 @@ static int fman_init(struct fman *fman) } fman->liodn_base[i] = liodn_base; } @@ -1766,7 +1766,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> err = fman_reset(fman); if (err) -@@ -2186,8 +2215,12 @@ int fman_set_port_params(struct fman *fm +@@ -2185,8 +2214,12 @@ int fman_set_port_params(struct fman *fm if (err) goto return_err; @@ -1779,7 +1779,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> if (fman->state->rev_info.major < 6) set_port_order_restoration(fman->fpm_regs, port_id); -@@ -2813,7 +2846,8 @@ static struct fman *read_dts_node(struct +@@ -2812,7 +2845,8 @@ static struct fman *read_dts_node(struct of_node_put(muram_node); @@ -1899,7 +1899,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> }; static void add_addr_in_paddr(struct memac_regs __iomem *regs, u8 *adr, -@@ -940,6 +941,34 @@ int memac_add_hash_mac_address(struct fm +@@ -939,6 +940,34 @@ int memac_add_hash_mac_address(struct fm return 0; } @@ -1934,7 +1934,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr) { struct memac_regs __iomem *regs = memac->regs; -@@ -963,8 +992,12 @@ int memac_del_hash_mac_address(struct fm +@@ -962,8 +991,12 @@ int memac_del_hash_mac_address(struct fm break; } } |