Commit 4b6e6c19 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

pinctrl: renesas: Move R-Car bias helpers to sh_pfc.h 



The Renesas Pin Function Controller driver uses two header files:
  - sh_pfc.h, for use by both core code and SoC-specific drivers,
  - core.h, for internal use by the core code only.

Hence move the R-Car bias helper declarations from core.h to sh_pfc.h,
and drop the inclusion of core.h from SoC-specific drivers that no
longer need it.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/20210303132619.3938128-3-geert+renesas@glider.be
parent b82fd2df

drivers/pinctrl/renesas/core.h

+0 −4
Original line number Diff line number Diff line
@@ -29,8 +29,4 @@ void sh_pfc_write(struct sh_pfc *pfc, u32 reg, u32 data); 
int sh_pfc_get_pin_index(struct sh_pfc *pfc, unsigned int pin);

int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type);



unsigned int rcar_pinmux_get_bias(struct sh_pfc *pfc, unsigned int pin);

void rcar_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,

			  unsigned int bias);



#endif /* __SH_PFC_CORE_H__ */

drivers/pinctrl/renesas/pfc-r8a7778.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/kernel.h>

#include <linux/pinctrl/pinconf-generic.h>



#include "core.h"

#include "sh_pfc.h"



#define PORT_GP_PUP_1(bank, pin, fn, sfx)	\

drivers/pinctrl/renesas/pfc-r8a7792.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 


#include <linux/kernel.h>



#include "core.h"

#include "sh_pfc.h"



#define CPU_ALL_GP(fn, sfx)						\

drivers/pinctrl/renesas/pfc-r8a77950.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/errno.h>

#include <linux/kernel.h>



#include "core.h"

#include "sh_pfc.h"



#define CFG_FLAGS (SH_PFC_PIN_CFG_DRIVE_STRENGTH | SH_PFC_PIN_CFG_PULL_UP_DOWN)

drivers/pinctrl/renesas/pfc-r8a77951.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/kernel.h>

#include <linux/sys_soc.h>



#include "core.h"

#include "sh_pfc.h"



#define CFG_FLAGS (SH_PFC_PIN_CFG_DRIVE_STRENGTH | SH_PFC_PIN_CFG_PULL_UP_DOWN)