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

Commit f9165132 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

sh-pfc: Move private definitions and declarations to private header 



Move all private structure definitions and function declarations from
include/linux/sh_pfc.h to drivers/sh/pfc/core.h.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent d4e62d00

drivers/sh/pfc/core.c

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <linux/ioport.h>

#include <linux/pinctrl/machine.h>



#include "core.h"



static struct sh_pfc sh_pfc __read_mostly;



static void pfc_iounmap(struct sh_pfc *pfc)

drivers/sh/pfc/core.h

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * SuperH Pin Function Controller support.

 *

 * Copyright (C) 2012  Renesas Solutions Corp.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#ifndef __SH_PFC_CORE_H__

#define __SH_PFC_CORE_H__



#include <linux/compiler.h>

#include <linux/sh_pfc.h>

#include <linux/types.h>



struct pfc_window {

	phys_addr_t phys;

	void __iomem *virt;

	unsigned long size;

};



struct sh_pfc {

	struct sh_pfc_platform_data *pdata;

	spinlock_t lock;



	struct pfc_window *window;

};



int sh_pfc_register_gpiochip(struct sh_pfc *pfc);



int sh_pfc_register_pinctrl(struct sh_pfc *pfc);



int sh_pfc_read_bit(struct pinmux_data_reg *dr, unsigned long in_pos);

void sh_pfc_write_bit(struct pinmux_data_reg *dr, unsigned long in_pos,

		      unsigned long value);

int sh_pfc_get_data_reg(struct sh_pfc *pfc, unsigned gpio,

			struct pinmux_data_reg **drp, int *bitp);

int sh_pfc_gpio_to_enum(struct sh_pfc *pfc, unsigned gpio, int pos,

			pinmux_enum_t *enum_idp);

int sh_pfc_config_gpio(struct sh_pfc *pfc, unsigned gpio, int pinmux_type,

		       int cfg_mode);



#endif /* __SH_PFC_CORE_H__ */

drivers/sh/pfc/gpio.c

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <linux/pinctrl/consumer.h>

#include <linux/sh_pfc.h>



#include "core.h"



struct sh_pfc_chip {

	struct sh_pfc		*pfc;

	struct gpio_chip	gpio_chip;

drivers/sh/pfc/pinctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include <linux/pinctrl/pinmux.h>

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



#include "core.h"



struct sh_pfc_pinctrl {

	struct pinctrl_dev *pctl;

	struct sh_pfc *pfc;

include/linux/sh_pfc.h

+0 −29
Original line number Diff line number Diff line
@@ -88,12 +88,6 @@ struct pinmux_range { 
	pinmux_enum_t force;

};



struct pfc_window {

	phys_addr_t phys;

	void __iomem *virt;

	unsigned long size;

};



struct sh_pfc_platform_data {

	char *name;

	pinmux_enum_t reserved_id;
@@ -123,35 +117,12 @@ struct sh_pfc_platform_data { 
	unsigned long unlock_reg;

};



struct sh_pfc {

	struct sh_pfc_platform_data *pdata;

	spinlock_t lock;



	struct pfc_window *window;

};



/* XXX compat for now */

#define pinmux_info sh_pfc_platform_data



/* drivers/sh/pfc/gpio.c */

int sh_pfc_register_gpiochip(struct sh_pfc *pfc);



/* drivers/sh/pfc/pinctrl.c */

int sh_pfc_register_pinctrl(struct sh_pfc *pfc);



/* drivers/sh/pfc/core.c */

int register_sh_pfc(struct sh_pfc_platform_data *pfc);



int sh_pfc_read_bit(struct pinmux_data_reg *dr, unsigned long in_pos);

void sh_pfc_write_bit(struct pinmux_data_reg *dr, unsigned long in_pos,

		      unsigned long value);

int sh_pfc_get_data_reg(struct sh_pfc *pfc, unsigned gpio,

			struct pinmux_data_reg **drp, int *bitp);

int sh_pfc_gpio_to_enum(struct sh_pfc *pfc, unsigned gpio, int pos,

			pinmux_enum_t *enum_idp);

int sh_pfc_config_gpio(struct sh_pfc *pfc, unsigned gpio, int pinmux_type,

		       int cfg_mode);



/* xxx */

static inline int register_pinmux(struct pinmux_info *pip)

{