Commit 6f35f629 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/soc 

AT91 soc for 5.13:

- Fixing a W=1 warning

* tag 'at91-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: at91: pm: Move prototypes to mutually included header

Link: https://lore.kernel.org/r/20210401174544.32193-1-nicolas.ferre@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4f9c62d1 41dbf4a1

arch/arm/mach-at91/pm.c

+8 −11
Original line number Diff line number Diff line
@@ -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_state_t state) 
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

drivers/pinctrl/pinctrl-at91.c

+2 −0
Original line number Diff line number Diff line
@@ -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"

include/soc/at91/pm.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
/* 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 */