mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-13 10:49:13 +02:00
109 lines
3.5 KiB
Diff
109 lines
3.5 KiB
Diff
From 746aba88c64e409cbc3757a5f81fad5b5c74bbcc Mon Sep 17 00:00:00 2001
|
||
From: Lee Jones <lee.jones@linaro.org>
|
||
Date: Wed, 3 Mar 2021 12:41:49 +0000
|
||
Subject: [PATCH 149/247] ARM: at91: pm: Move prototypes to mutually included
|
||
header
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Both the caller and the supplier's source file should have access to
|
||
the include file containing the prototypes.
|
||
|
||
Fixes the following W=1 kernel build warning(s):
|
||
|
||
drivers/pinctrl/pinctrl-at91.c:1637:6: warning: no previous prototype for ‘at91_pinctrl_gpio_suspend’ [-Wmissing-prototypes]
|
||
1637 | void at91_pinctrl_gpio_suspend(void)
|
||
| ^~~~~~~~~~~~~~~~~~~~~~~~~
|
||
drivers/pinctrl/pinctrl-at91.c:1661:6: warning: no previous prototype for ‘at91_pinctrl_gpio_resume’ [-Wmissing-prototypes]
|
||
1661 | void at91_pinctrl_gpio_resume(void)
|
||
| ^~~~~~~~~~~~~~~~~~~~~~~~
|
||
|
||
Cc: Russell King <linux@armlinux.org.uk>
|
||
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
|
||
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
|
||
Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
|
||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||
Acked-by: Linus Walleij <linus.walleij@linaro.org>
|
||
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
|
||
Link: https://lore.kernel.org/r/20210303124149.3149511-1-lee.jones@linaro.org
|
||
---
|
||
arch/arm/mach-at91/pm.c | 19 ++++++++-----------
|
||
drivers/pinctrl/pinctrl-at91.c | 2 ++
|
||
include/soc/at91/pm.h | 16 ++++++++++++++++
|
||
3 files changed, 26 insertions(+), 11 deletions(-)
|
||
create mode 100644 include/soc/at91/pm.h
|
||
|
||
--- a/arch/arm/mach-at91/pm.c
|
||
+++ b/arch/arm/mach-at91/pm.c
|
||
@@ -17,6 +17,8 @@
|
||
#include <linux/clk/at91_pmc.h>
|
||
#include <linux/platform_data/atmel.h>
|
||
|
||
+#include <soc/at91/pm.h>
|
||
+
|
||
#include <asm/cacheflush.h>
|
||
#include <asm/fncpy.h>
|
||
#include <asm/system_misc.h>
|
||
@@ -25,17 +27,6 @@
|
||
#include "generic.h"
|
||
#include "pm.h"
|
||
|
||
-/*
|
||
- * FIXME: this is needed to communicate between the pinctrl driver and
|
||
- * the PM implementation in the machine. Possibly part of the PM
|
||
- * implementation should be moved down into the pinctrl driver and get
|
||
- * called as part of the generic suspend/resume path.
|
||
- */
|
||
-#ifdef CONFIG_PINCTRL_AT91
|
||
-extern void at91_pinctrl_gpio_suspend(void);
|
||
-extern void at91_pinctrl_gpio_resume(void);
|
||
-#endif
|
||
-
|
||
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_stat
|
||
static int at91_pm_enter(suspend_state_t state)
|
||
{
|
||
#ifdef CONFIG_PINCTRL_AT91
|
||
+ /*
|
||
+ * FIXME: this is needed to communicate between the pinctrl driver and
|
||
+ * the PM implementation in the machine. Possibly part of the PM
|
||
+ * implementation should be moved down into the pinctrl driver and get
|
||
+ * called as part of the generic suspend/resume path.
|
||
+ */
|
||
at91_pinctrl_gpio_suspend();
|
||
#endif
|
||
|
||
--- a/drivers/pinctrl/pinctrl-at91.c
|
||
+++ b/drivers/pinctrl/pinctrl-at91.c
|
||
@@ -23,6 +23,8 @@
|
||
/* Since we request GPIOs from ourself */
|
||
#include <linux/pinctrl/consumer.h>
|
||
|
||
+#include <soc/at91/pm.h>
|
||
+
|
||
#include "pinctrl-at91.h"
|
||
#include "core.h"
|
||
|
||
--- /dev/null
|
||
+++ b/include/soc/at91/pm.h
|
||
@@ -0,0 +1,16 @@
|
||
+/* SPDX-License-Identifier: GPL-2.0-only */
|
||
+/*
|
||
+ * Atmel Power Management
|
||
+ *
|
||
+ * Copyright (C) 2020 Atmel
|
||
+ *
|
||
+ * Author: Lee Jones <lee.jones@linaro.org>
|
||
+ */
|
||
+
|
||
+#ifndef __SOC_ATMEL_PM_H
|
||
+#define __SOC_ATMEL_PM_H
|
||
+
|
||
+void at91_pinctrl_gpio_suspend(void);
|
||
+void at91_pinctrl_gpio_resume(void);
|
||
+
|
||
+#endif /* __SOC_ATMEL_PM_H */
|