mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

kernel: bump 5.15 to 5.15.63 

All patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200

Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia 2022-08-25 10:36:19 -04:00 committed by Petr Štetiar
parent 31648c4b59
commit edeae512c0
15 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.15
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .62 LINUX_VERSION-5.15 = .63
LINUX_KERNEL_HASH-5.15.62 = 06817cde8e57cdb6dbf20eaa5122fee110024f6e8b783799c98cb65dc753f141 LINUX_KERNEL_HASH-5.15.63 = 6dd3cd1e5a629d0002bc6c6ec7e8ea96710104f38664122dd56c83dfd4eb7341

6
target/linux/bcm27xx/patches-5.15/950-0424-drm-vc4-Add-FKMS-as-an-acceptable-node-for-dma-range.patch
View File

@ -17,9 +17,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
--- a/drivers/gpu/drm/vc4/vc4_drv.c --- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -227,6 +227,7 @@ static const struct of_device_id vc4_dma @@ -219,6 +219,7 @@ static void vc4_match_add_drivers(struct
static const struct of_device_id vc4_dma_range_matches[] = {
const struct of_device_id vc4_dma_range_matches[] = { { .compatible = "brcm,bcm2711-hvs" },
{ .compatible = "brcm,bcm2835-hvs" }, { .compatible = "brcm,bcm2835-hvs" },
+ { .compatible = "raspberrypi,rpi-firmware-kms" }, + { .compatible = "raspberrypi,rpi-firmware-kms" },
{ .compatible = "brcm,bcm2835-v3d" }, { .compatible = "brcm,bcm2835-v3d" },

6
target/linux/bcm27xx/patches-5.15/950-0428-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch
View File

@ -14,9 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
--- a/drivers/gpu/drm/vc4/vc4_drv.c --- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -227,6 +227,7 @@ static const struct of_device_id vc4_dma @@ -219,6 +219,7 @@ static void vc4_match_add_drivers(struct
static const struct of_device_id vc4_dma_range_matches[] = {
const struct of_device_id vc4_dma_range_matches[] = { { .compatible = "brcm,bcm2711-hvs" },
{ .compatible = "brcm,bcm2835-hvs" }, { .compatible = "brcm,bcm2835-hvs" },
+ { .compatible = "brcm,bcm2711-hvs" }, + { .compatible = "brcm,bcm2711-hvs" },
{ .compatible = "raspberrypi,rpi-firmware-kms" }, { .compatible = "raspberrypi,rpi-firmware-kms" },

8
target/linux/bcm27xx/patches-5.15/950-0452-drm-vc4-Add-firmware-kms-mode.patch
View File

@ -104,7 +104,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
minor->debugfs_root, &vc4->load_tracker_enabled); minor->debugfs_root, &vc4->load_tracker_enabled);
--- a/drivers/gpu/drm/vc4/vc4_drv.c --- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -235,6 +235,18 @@ const struct of_device_id vc4_dma_range_ @@ -227,6 +227,18 @@ static const struct of_device_id vc4_dma
{} {}
}; };
@ -123,7 +123,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
static int vc4_drm_bind(struct device *dev) static int vc4_drm_bind(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
@@ -308,7 +320,7 @@ static int vc4_drm_bind(struct device *d @@ -290,7 +302,7 @@ static int vc4_drm_bind(struct device *d
if (ret) if (ret)
return ret; return ret;
@ -132,7 +132,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
ret = rpi_firmware_property(firmware, ret = rpi_firmware_property(firmware,
RPI_FIRMWARE_NOTIFY_DISPLAY_DONE, RPI_FIRMWARE_NOTIFY_DISPLAY_DONE,
NULL, 0); NULL, 0);
@@ -322,16 +334,20 @@ static int vc4_drm_bind(struct device *d @@ -304,16 +316,20 @@ static int vc4_drm_bind(struct device *d
if (ret) if (ret)
return ret; return ret;
@ -158,7 +158,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
ret = drm_dev_register(drm, 0); ret = drm_dev_register(drm, 0);
if (ret < 0) if (ret < 0)
@@ -378,6 +394,7 @@ static struct platform_driver *const com @@ -360,6 +376,7 @@ static struct platform_driver *const com
&vc4_dsi_driver, &vc4_dsi_driver,
&vc4_txp_driver, &vc4_txp_driver,
&vc4_crtc_driver, &vc4_crtc_driver,

2
target/linux/bcm27xx/patches-5.15/950-0471-sound-usb-call-usb_autopm_get_interface-for-devices-.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- a/sound/usb/card.c --- a/sound/usb/card.c
+++ b/sound/usb/card.c +++ b/sound/usb/card.c
@@ -817,8 +817,14 @@ static int usb_audio_probe(struct usb_in @@ -825,8 +825,14 @@ static int usb_audio_probe(struct usb_in
if (ignore_ctl_error) if (ignore_ctl_error)
chip->quirk_flags |= QUIRK_FLAG_IGNORE_CTL_ERROR; chip->quirk_flags |= QUIRK_FLAG_IGNORE_CTL_ERROR;

4
target/linux/bcm27xx/patches-5.15/950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch
View File

@ -68,7 +68,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
*/ */
--- a/drivers/gpu/drm/vc4/vc4_drv.c --- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -255,10 +255,13 @@ static int vc4_drm_bind(struct device *d @@ -247,10 +247,13 @@ static int vc4_drm_bind(struct device *d
struct vc4_dev *vc4; struct vc4_dev *vc4;
struct device_node *node; struct device_node *node;
struct drm_crtc *crtc; struct drm_crtc *crtc;
@ -82,7 +82,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
/* If VC4 V3D is missing, don't advertise render nodes. */ /* If VC4 V3D is missing, don't advertise render nodes. */
node = of_find_matching_node_and_match(NULL, vc4_v3d_dt_match, NULL); node = of_find_matching_node_and_match(NULL, vc4_v3d_dt_match, NULL);
if (!node || !of_device_is_available(node)) if (!node || !of_device_is_available(node))
@@ -288,6 +291,7 @@ static int vc4_drm_bind(struct device *d @@ -270,6 +273,7 @@ static int vc4_drm_bind(struct device *d
vc4 = devm_drm_dev_alloc(dev, &vc4_drm_driver, struct vc4_dev, base); vc4 = devm_drm_dev_alloc(dev, &vc4_drm_driver, struct vc4_dev, base);
if (IS_ERR(vc4)) if (IS_ERR(vc4))
return PTR_ERR(vc4); return PTR_ERR(vc4);

8
target/linux/bcm27xx/patches-5.15/950-0901-drm-vc4-drv-Register-a-different-driver-on-BCM2711.patch
View File

@ -83,7 +83,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
static int compare_dev(struct device *dev, void *data) static int compare_dev(struct device *dev, void *data)
{ {
return dev == data; return dev == data;
@@ -263,6 +297,7 @@ static bool firmware_kms(void) @@ -255,6 +289,7 @@ static bool firmware_kms(void)
static int vc4_drm_bind(struct device *dev) static int vc4_drm_bind(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
@ -91,7 +91,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
struct rpi_firmware *firmware = NULL; struct rpi_firmware *firmware = NULL;
struct drm_device *drm; struct drm_device *drm;
struct vc4_dev *vc4; struct vc4_dev *vc4;
@@ -274,12 +309,10 @@ static int vc4_drm_bind(struct device *d @@ -266,12 +301,10 @@ static int vc4_drm_bind(struct device *d
dev->coherent_dma_mask = DMA_BIT_MASK(32); dev->coherent_dma_mask = DMA_BIT_MASK(32);
is_vc5 = of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"); is_vc5 = of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5");
@ -108,7 +108,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
node = of_find_matching_node_and_match(NULL, vc4_dma_range_matches, node = of_find_matching_node_and_match(NULL, vc4_dma_range_matches,
NULL); NULL);
@@ -301,7 +334,7 @@ static int vc4_drm_bind(struct device *d @@ -283,7 +316,7 @@ static int vc4_drm_bind(struct device *d
return ret; return ret;
} }
@ -117,7 +117,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
if (IS_ERR(vc4)) if (IS_ERR(vc4))
return PTR_ERR(vc4); return PTR_ERR(vc4);
vc4->is_vc5 = is_vc5; vc4->is_vc5 = is_vc5;
@@ -333,7 +366,7 @@ static int vc4_drm_bind(struct device *d @@ -315,7 +348,7 @@ static int vc4_drm_bind(struct device *d
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }

2
target/linux/bcm27xx/patches-5.15/950-0904-drm-vc4-drv-Skip-BO-Backend-Initialization-on-BCM271.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/vc4/vc4_drv.c --- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -343,19 +343,23 @@ static int vc4_drm_bind(struct device *d @@ -325,19 +325,23 @@ static int vc4_drm_bind(struct device *d
platform_set_drvdata(pdev, drm); platform_set_drvdata(pdev, drm);
INIT_LIST_HEAD(&vc4->debugfs_list); INIT_LIST_HEAD(&vc4->debugfs_list);

2
target/linux/generic/hack-5.15/321-powerpc_crtsavres_prereq.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
--- a/arch/powerpc/Makefile --- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile
@@ -61,19 +61,6 @@ machine-$(CONFIG_PPC64) += 64 @@ -44,19 +44,6 @@ machine-$(CONFIG_PPC64) += 64
machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
UTS_MACHINE := $(subst $(space),,$(machine-y)) UTS_MACHINE := $(subst $(space),,$(machine-y))

2
target/linux/generic/pending-5.15/703-phy-add-detach-callback-to-struct-phy_driver.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/net/phy/phy_device.c --- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c
@@ -1738,6 +1738,9 @@ void phy_detach(struct phy_device *phyde @@ -1744,6 +1744,9 @@ void phy_detach(struct phy_device *phyde
struct module *ndev_owner = NULL; struct module *ndev_owner = NULL;
struct mii_bus *bus; struct mii_bus *bus;

8
target/linux/generic/pending-5.15/850-0023-PCI-aardvark-Make-main-irq_chip-structure-a-static-d.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
--- a/drivers/pci/controller/pci-aardvark.c --- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c
@@ -274,7 +274,6 @@ struct advk_pcie { @@ -275,7 +275,6 @@ struct advk_pcie {
u8 wins_count; u8 wins_count;
struct irq_domain *rp_irq_domain; struct irq_domain *rp_irq_domain;
struct irq_domain *irq_domain; struct irq_domain *irq_domain;
@ -41,7 +41,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
raw_spinlock_t irq_lock; raw_spinlock_t irq_lock;
struct irq_domain *msi_domain; struct irq_domain *msi_domain;
struct irq_domain *msi_inner_domain; struct irq_domain *msi_inner_domain;
@@ -1330,14 +1329,19 @@ static void advk_pcie_irq_unmask(struct @@ -1345,14 +1344,19 @@ static void advk_pcie_irq_unmask(struct
raw_spin_unlock_irqrestore(&pcie->irq_lock, flags); raw_spin_unlock_irqrestore(&pcie->irq_lock, flags);
} }
@ -63,7 +63,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
irq_set_chip_data(virq, pcie); irq_set_chip_data(virq, pcie);
return 0; return 0;
@@ -1396,7 +1400,6 @@ static int advk_pcie_init_irq_domain(str @@ -1411,7 +1415,6 @@ static int advk_pcie_init_irq_domain(str
struct device *dev = &pcie->pdev->dev; struct device *dev = &pcie->pdev->dev;
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
struct device_node *pcie_intc_node; struct device_node *pcie_intc_node;
@ -71,7 +71,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
int ret = 0; int ret = 0;
raw_spin_lock_init(&pcie->irq_lock); raw_spin_lock_init(&pcie->irq_lock);
@@ -1407,28 +1410,14 @@ static int advk_pcie_init_irq_domain(str @@ -1422,28 +1425,14 @@ static int advk_pcie_init_irq_domain(str
return -ENODEV; return -ENODEV;
} }

2
target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch
View File

@ -23,7 +23,7 @@ Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
--- a/drivers/pci/controller/pci-aardvark.c --- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c
@@ -1616,9 +1616,7 @@ static int advk_pcie_enable_phy(struct a @@ -1631,9 +1631,7 @@ static int advk_pcie_enable_phy(struct a
} }
ret = phy_power_on(pcie->phy); ret = phy_power_on(pcie->phy);

2
target/linux/octeon/patches-5.15/130-add_itus_support.patch
View File

@ -1,6 +1,6 @@
--- a/arch/mips/cavium-octeon/octeon-platform.c --- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -773,7 +773,7 @@ int __init octeon_prune_device_tree(void @@ -774,7 +774,7 @@ int __init octeon_prune_device_tree(void
if (fdt_check_header(initial_boot_params)) if (fdt_check_header(initial_boot_params))
panic("Corrupt Device Tree."); panic("Corrupt Device Tree.");

2
target/linux/octeon/patches-5.15/150-ubnt_usg_support.patch
View File

@ -18,7 +18,7 @@
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD)
--- a/arch/mips/cavium-octeon/octeon-platform.c --- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -634,6 +634,7 @@ static void __init octeon_rx_tx_delay(in @@ -635,6 +635,7 @@ static void __init octeon_rx_tx_delay(in
} }
break; break;
case CVMX_BOARD_TYPE_UBNT_E100: case CVMX_BOARD_TYPE_UBNT_E100:

2
target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch
View File

@ -71,7 +71,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
break; break;
--- a/drivers/net/phy/phy_device.c --- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c
@@ -1023,14 +1023,16 @@ struct phy_device *phy_find_first(struct @@ -1029,14 +1029,16 @@ struct phy_device *phy_find_first(struct
} }
EXPORT_SYMBOL(phy_find_first); EXPORT_SYMBOL(phy_find_first);