diff options
author | Claudiu Beznea <claudiu.beznea@microchip.com> | 2022-09-15 17:37:27 +0300 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-22 00:51:25 +0200 |
commit | d0d7771262843bd72bc9ea5441ce73750fd872ff (patch) | |
tree | 59bc1db8f97389793c835d89cf8e3b7b0720f891 /target/linux/at91/patches-5.15/212-ARM-at91-pm-add-sama7g5-ddr-controller.patch | |
parent | eb758a8fec2cee24e528008052fa2bd58482ca3a (diff) | |
download | upstream-d0d7771262843bd72bc9ea5441ce73750fd872ff.tar.gz upstream-d0d7771262843bd72bc9ea5441ce73750fd872ff.tar.bz2 upstream-d0d7771262843bd72bc9ea5441ce73750fd872ff.zip |
at91: kernel v5.15: remove upstreamed patches
Remove patches that are now integrated in kernel v5.15.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Diffstat (limited to 'target/linux/at91/patches-5.15/212-ARM-at91-pm-add-sama7g5-ddr-controller.patch')
-rw-r--r-- | target/linux/at91/patches-5.15/212-ARM-at91-pm-add-sama7g5-ddr-controller.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/target/linux/at91/patches-5.15/212-ARM-at91-pm-add-sama7g5-ddr-controller.patch b/target/linux/at91/patches-5.15/212-ARM-at91-pm-add-sama7g5-ddr-controller.patch deleted file mode 100644 index e496245061..0000000000 --- a/target/linux/at91/patches-5.15/212-ARM-at91-pm-add-sama7g5-ddr-controller.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3f55310c00b8c478da1458704027036c1a414973 Mon Sep 17 00:00:00 2001 -From: Claudiu Beznea <claudiu.beznea@microchip.com> -Date: Thu, 15 Apr 2021 13:50:03 +0300 -Subject: [PATCH 212/247] ARM: at91: pm: add sama7g5 ddr controller - -Add SAMA7G5 DDR controller to the list of DDR controller compatibles. -At the moment there is no standby support. Adapt the code for this. - -Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> -Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com> -Link: https://lore.kernel.org/r/20210415105010.569620-18-claudiu.beznea@microchip.com ---- - arch/arm/mach-at91/pm.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - ---- a/arch/arm/mach-at91/pm.c -+++ b/arch/arm/mach-at91/pm.c -@@ -548,6 +548,7 @@ static const struct of_device_id ramc_id - { .compatible = "atmel,at91sam9260-sdramc", .data = &ramc_infos[1] }, - { .compatible = "atmel,at91sam9g45-ddramc", .data = &ramc_infos[2] }, - { .compatible = "atmel,sama5d3-ddramc", .data = &ramc_infos[3] }, -+ { .compatible = "microchip,sama7g5-uddrc", }, - { /*sentinel*/ } - }; - -@@ -569,9 +570,11 @@ static __init int at91_dt_ramc(void) - } - - ramc = of_id->data; -- if (!standby) -- standby = ramc->idle; -- soc_pm.data.memctrl = ramc->memctrl; -+ if (ramc) { -+ if (!standby) -+ standby = ramc->idle; -+ soc_pm.data.memctrl = ramc->memctrl; -+ } - - idx++; - } |