diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-19 13:25:42 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-20 14:19:39 +0200 |
| commit | 83b1e40561d2e243b757bb5608b0feeb839fe1fa (patch) | |
| tree | da7cc783b54b0b0b9dfa7591ece03535a7e0533a /target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch | |
| parent | cf7c101135934710b1958092da9a0c9ad446de4b (diff) | |
| download | upstream-83b1e40561d2e243b757bb5608b0feeb839fe1fa.tar.gz upstream-83b1e40561d2e243b757bb5608b0feeb839fe1fa.tar.bz2 upstream-83b1e40561d2e243b757bb5608b0feeb839fe1fa.zip | |
kernel: bump 5.4 to 5.4.59
Removed since added upstream:
bcm27xx:
950-0428-staging-vchiq_arm-Add-a-matching-unregister-call.patch
lantiq:
0800-spi-lantiq-ssc-Fix-warning-by-using-WQ_MEM_RECLAI.patch
Manually adjusted patches:
layerscape:
801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch
Build-tested: ath79/generic, ramips, lantiq/xrx200, lantiq/xway,
mvebu/cortexa9, sunxi/a53
Run-tested: ipq806x (R7800), layerscape (LS1012A-FRDM, LS1046A-RDB)
Building on layerscape is only possible with workaround from PR #3179.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-By: John Audia <graysky@archlinux.us> [ipq806x]
Tested-by: Pawel Dembicki <paweldembicki@gmail.com> [layerscape]
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch b/target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch index 3b5acba46e..a1ac7af5c3 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0089-fsl-fman-backup-and-restore-ICID-registers.patch @@ -56,7 +56,7 @@ Acked-by: Madalin Bucur <madalin.bucur@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; @@ -68,7 +68,7 @@ Acked-by: Madalin Bucur <madalin.bucur@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); @@ -76,7 +76,7 @@ Acked-by: Madalin Bucur <madalin.bucur@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; } @@ -86,7 +86,7 @@ Acked-by: Madalin Bucur <madalin.bucur@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; |