Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07d36d29 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

pinctrl: sh-pfc: Improve core and user API separation 



The Renesas Pin Function Controller 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.

Several SoC-specific drivers include core.h, as they need the sh_pfc
structure, which is passed explicitly to the various SoC-specific
callbacks, and used there.

Hence move its definition from core.h to sh_pfc.h, and remove the
inclusion of core.h from all SoC-specific files.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9f4ca14e

drivers/pinctrl/sh-pfc/core.h

+0 −33
Original line number Diff line number Diff line
@@ -10,48 +10,15 @@ 
#ifndef __SH_PFC_CORE_H__

#define __SH_PFC_CORE_H__



#include <linux/compiler.h>

#include <linux/spinlock.h>

#include <linux/types.h>



#include "sh_pfc.h"



struct sh_pfc_window {

	phys_addr_t phys;

	void __iomem *virt;

	unsigned long size;

};



struct sh_pfc_chip;

struct sh_pfc_pinctrl;



struct sh_pfc_pin_range {

	u16 start;

	u16 end;

};



struct sh_pfc {

	struct device *dev;

	const struct sh_pfc_soc_info *info;

	spinlock_t lock;



	unsigned int num_windows;

	struct sh_pfc_window *windows;

	unsigned int num_irqs;

	unsigned int *irqs;



	struct sh_pfc_pin_range *ranges;

	unsigned int nr_ranges;



	unsigned int nr_gpio_pins;



	struct sh_pfc_chip *gpio;

#ifdef CONFIG_SUPERH

	struct sh_pfc_chip *func;

#endif



};



int sh_pfc_register_gpiochip(struct sh_pfc *pfc);

int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc);

drivers/pinctrl/sh-pfc/pfc-r8a73a4.c

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

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



#include "core.h"

#include "sh_pfc.h"



#define CPU_ALL_PORT(fn, pfx, sfx)					\

drivers/pinctrl/sh-pfc/pfc-r8a7740.c

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

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



#include "core.h"

#include "sh_pfc.h"



#define CPU_ALL_PORT(fn, pfx, sfx)					\

drivers/pinctrl/sh-pfc/pfc-r8a7778.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/io.h>

#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/sh-pfc/pfc-r8a7790.c

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

#include <linux/kernel.h>



#include "core.h"

#include "sh_pfc.h"



/*