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/149-ARM-at91-pm-Move-prototypes-to-mutually-included-hea.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/149-ARM-at91-pm-Move-prototypes-to-mutually-included-hea.patch')
| -rw-r--r-- | target/linux/at91/patches-5.10/149-ARM-at91-pm-Move-prototypes-to-mutually-included-hea.patch | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/target/linux/at91/patches-5.10/149-ARM-at91-pm-Move-prototypes-to-mutually-included-hea.patch b/target/linux/at91/patches-5.10/149-ARM-at91-pm-Move-prototypes-to-mutually-included-hea.patch index 892e8be295..cc7f6583aa 100644 --- a/target/linux/at91/patches-5.10/149-ARM-at91-pm-Move-prototypes-to-mutually-included-hea.patch +++ b/target/linux/at91/patches-5.10/149-ARM-at91-pm-Move-prototypes-to-mutually-included-hea.patch @@ -34,8 +34,6 @@ Link: https://lore.kernel.org/r/20210303124149.3149511-1-lee.jones@linaro.org 3 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 include/soc/at91/pm.h -diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c -index 3f015cb6ec2b..2dee383f9050 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -17,6 +17,8 @@ @@ -65,7 +63,7 @@ index 3f015cb6ec2b..2dee383f9050 100644 struct at91_soc_pm { int (*config_shdwc_ws)(void __iomem *shdwc, u32 *mode, u32 *polarity); int (*config_pmc_ws)(void __iomem *pmc, u32 mode, u32 polarity); -@@ -326,6 +317,12 @@ static void at91_pm_suspend(suspend_state_t state) +@@ -326,6 +317,12 @@ static void at91_pm_suspend(suspend_stat static int at91_pm_enter(suspend_state_t state) { #ifdef CONFIG_PINCTRL_AT91 @@ -78,8 +76,6 @@ index 3f015cb6ec2b..2dee383f9050 100644 at91_pinctrl_gpio_suspend(); #endif -diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c -index 9015486e38c1..dcbb71fa1b2b 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -23,6 +23,8 @@ @@ -91,9 +87,6 @@ index 9015486e38c1..dcbb71fa1b2b 100644 #include "pinctrl-at91.h" #include "core.h" -diff --git a/include/soc/at91/pm.h b/include/soc/at91/pm.h -new file mode 100644 -index 000000000000..7a41e53a3ffa --- /dev/null +++ b/include/soc/at91/pm.h @@ -0,0 +1,16 @@ @@ -113,6 +106,3 @@ index 000000000000..7a41e53a3ffa +void at91_pinctrl_gpio_resume(void); + +#endif /* __SOC_ATMEL_PM_H */ --- -2.32.0 - |