diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-03-02 13:11:44 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-05 21:05:45 +0100 |
| commit | 05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5 (patch) | |
| tree | 68e66de94e62af2e06719bd8e6b56f88ce80993a /target/linux/at91/patches-5.10/223-ARM-at91-pm-do-not-panic-if-ram-controllers-are-not-.patch | |
| parent | ef4bf8b403205062ddb38ebe7b8c4951be346368 (diff) | |
| download | upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.gz upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.bz2 upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.zip | |
kernel: bump 5.10 to 5.10.103
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/at91/patches-5.10/223-ARM-at91-pm-do-not-panic-if-ram-controllers-are-not-.patch')
| -rw-r--r-- | target/linux/at91/patches-5.10/223-ARM-at91-pm-do-not-panic-if-ram-controllers-are-not-.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/at91/patches-5.10/223-ARM-at91-pm-do-not-panic-if-ram-controllers-are-not-.patch b/target/linux/at91/patches-5.10/223-ARM-at91-pm-do-not-panic-if-ram-controllers-are-not-.patch index 302d0e3752..68bf447a03 100644 --- a/target/linux/at91/patches-5.10/223-ARM-at91-pm-do-not-panic-if-ram-controllers-are-not-.patch +++ b/target/linux/at91/patches-5.10/223-ARM-at91-pm-do-not-panic-if-ram-controllers-are-not-.patch @@ -19,11 +19,9 @@ Link: https://lore.kernel.org/r/20210823131915.23857-2-claudiu.beznea@microchip. arch/arm/mach-at91/pm.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) -diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c -index a07e14d89ba4..d92afca64b49 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c -@@ -589,7 +589,7 @@ static const struct of_device_id ramc_phy_ids[] __initconst = { +@@ -589,7 +589,7 @@ static const struct of_device_id ramc_ph { /* Sentinel. */ }, }; @@ -32,7 +30,7 @@ index a07e14d89ba4..d92afca64b49 100644 { struct device_node *np; const struct of_device_id *of_id; -@@ -625,12 +625,18 @@ static __init void at91_dt_ramc(bool phy_mandatory) +@@ -625,12 +625,18 @@ static __init void at91_dt_ramc(bool phy /* Lookup for DDR PHY node, if any. */ for_each_matching_node_and_match(np, ramc_phy_ids, &of_id) { soc_pm.data.ramc_phy = of_iomap(np, 0); @@ -74,6 +72,3 @@ index a07e14d89ba4..d92afca64b49 100644 at91_pm_modes_init(iomaps, ARRAY_SIZE(iomaps)); at91_pm_init(NULL); --- -2.32.0 - |