diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-04-21 11:09:30 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-04-21 22:16:33 +0200 |
| commit | faf668be354af76b8b9f93921b426dc5e9782a98 (patch) | |
| tree | dadddb8dbaa2d6a825cbdfab5cb0015d17c91f91 /target/linux/ramips/patches-5.4 | |
| parent | 8d9b36270b1faecdf8c9632e0f18251df9a0990c (diff) | |
| download | upstream-faf668be354af76b8b9f93921b426dc5e9782a98.tar.gz upstream-faf668be354af76b8b9f93921b426dc5e9782a98.tar.bz2 upstream-faf668be354af76b8b9f93921b426dc5e9782a98.zip | |
kernel: bump 5.4 to 5.4.34
Refreshed patches.
Run tested: qemu-x86-64, apalis, a64-olinuxino
Build tested: x86/64, imx6, sunxi/a53
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/ramips/patches-5.4')
| -rw-r--r-- | target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch | 2 | ||||
| -rw-r--r-- | target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch b/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch index c92ab5164d..aa69f32968 100644 --- a/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch +++ b/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -2270,6 +2270,11 @@ static const struct flash_info spi_nor_i +@@ -2296,6 +2296,11 @@ static const struct flash_info spi_nor_i SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) .fixups = &gd25q256_fixups, }, diff --git a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch index e3035b95f3..69e3c296ca 100644 --- a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch @@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2757,6 +2757,7 @@ static const struct net_device_ops mtk_n +@@ -2779,6 +2779,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com> const __be32 *_id = of_get_property(np, "reg", NULL); struct phylink *phylink; int phy_mode, id, err; -@@ -2847,6 +2848,9 @@ static int mtk_add_mac(struct mtk_eth *e +@@ -2869,6 +2870,9 @@ static int mtk_add_mac(struct mtk_eth *e eth->netdev[id]->irq = eth->irq[0]; eth->netdev[id]->dev.of_node = np; |