uefi-arm64-6.17: rebase against v6.17
This commit is contained in:
parent
4aadf67cb7
commit
4088a0e6fd
@ -368,7 +368,7 @@ index 111111111111..222222222222 100644
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/module.h>
|
||||
@@ -727,6 +730,249 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat,
|
||||
@@ -730,6 +733,249 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat,
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(stmmac_pltfr_find_clk);
|
||||
|
||||
@ -618,7 +618,7 @@ index 111111111111..222222222222 100644
|
||||
int stmmac_get_platform_resources(struct platform_device *pdev,
|
||||
struct stmmac_resources *stmmac_res)
|
||||
{
|
||||
@@ -734,8 +980,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
|
||||
@@ -737,8 +983,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
|
||||
|
||||
/* Get IRQ information early to have an ability to ask for deferred
|
||||
* probe if needed before we went too far with resource allocation.
|
||||
@ -634,7 +634,7 @@ index 111111111111..222222222222 100644
|
||||
if (stmmac_res->irq < 0)
|
||||
return stmmac_res->irq;
|
||||
|
||||
@@ -753,6 +1005,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
|
||||
@@ -756,6 +1008,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
|
||||
return -EPROBE_DEFER;
|
||||
dev_info(&pdev->dev, "IRQ eth_wake_irq not found\n");
|
||||
stmmac_res->wol_irq = stmmac_res->irq;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user