aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/216-ARM-at91-pm-add-sama7g5-s-pmc.patch
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-03-02 13:11:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-03-05 21:05:45 +0100
commit05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5 (patch)
tree68e66de94e62af2e06719bd8e6b56f88ce80993a /target/linux/at91/patches-5.10/216-ARM-at91-pm-add-sama7g5-s-pmc.patch
parentef4bf8b403205062ddb38ebe7b8c4951be346368 (diff)
downloadupstream-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/216-ARM-at91-pm-add-sama7g5-s-pmc.patch')
-rw-r--r--target/linux/at91/patches-5.10/216-ARM-at91-pm-add-sama7g5-s-pmc.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/at91/patches-5.10/216-ARM-at91-pm-add-sama7g5-s-pmc.patch b/target/linux/at91/patches-5.10/216-ARM-at91-pm-add-sama7g5-s-pmc.patch
index f52478aaf7..a471195fbc 100644
--- a/target/linux/at91/patches-5.10/216-ARM-at91-pm-add-sama7g5-s-pmc.patch
+++ b/target/linux/at91/patches-5.10/216-ARM-at91-pm-add-sama7g5-s-pmc.patch
@@ -12,11 +12,9 @@ Link: https://lore.kernel.org/r/20210415105010.569620-22-claudiu.beznea@microchi
arch/arm/mach-at91/pm.c | 6 ++++++
1 file changed, 6 insertions(+)
-diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
-index 653350eec9b6..687ce8582b4f 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
-@@ -912,6 +912,11 @@ static const struct pmc_info pmc_infos[] __initconst = {
+@@ -912,6 +912,11 @@ static const struct pmc_info pmc_infos[]
.mckr = 0x28,
.version = AT91_PMC_V2,
},
@@ -28,7 +26,7 @@ index 653350eec9b6..687ce8582b4f 100644
};
static const struct of_device_id atmel_pmc_ids[] __initconst = {
-@@ -927,6 +932,7 @@ static const struct of_device_id atmel_pmc_ids[] __initconst = {
+@@ -927,6 +932,7 @@ static const struct of_device_id atmel_p
{ .compatible = "atmel,sama5d4-pmc", .data = &pmc_infos[1] },
{ .compatible = "atmel,sama5d2-pmc", .data = &pmc_infos[1] },
{ .compatible = "microchip,sam9x60-pmc", .data = &pmc_infos[4] },
@@ -36,6 +34,3 @@ index 653350eec9b6..687ce8582b4f 100644
{ /* sentinel */ },
};
---
-2.32.0
-