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

Commit fae43399 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: Break out SuperH PFC code 



This file breaks out the SuperH PFC code from
arch/sh/kernel/gpio.c + arch/sh/include/asm/gpio.h
to drivers/sh/pfc.c + include/linux/sh_pfc.h.

Similar to the INTC stuff. The non-SuperH specific
file location makes it possible to share the code
between multiple architectures.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent fc1d003d

arch/sh/include/asm/gpio.h

+1 −81
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#endif



#define ARCH_NR_GPIOS 512

#include <asm-generic/gpio.h>

#include <linux/sh_pfc.h>



#ifdef CONFIG_GPIOLIB
@@ -53,84 +53,4 @@ static inline int irq_to_gpio(unsigned int irq) 


#endif /* CONFIG_GPIOLIB */



typedef unsigned short pinmux_enum_t;

typedef unsigned short pinmux_flag_t;



#define PINMUX_TYPE_NONE            0

#define PINMUX_TYPE_FUNCTION        1

#define PINMUX_TYPE_GPIO            2

#define PINMUX_TYPE_OUTPUT          3

#define PINMUX_TYPE_INPUT           4

#define PINMUX_TYPE_INPUT_PULLUP    5

#define PINMUX_TYPE_INPUT_PULLDOWN  6



#define PINMUX_FLAG_TYPE            (0x7)

#define PINMUX_FLAG_WANT_PULLUP     (1 << 3)

#define PINMUX_FLAG_WANT_PULLDOWN   (1 << 4)



#define PINMUX_FLAG_DBIT_SHIFT      5

#define PINMUX_FLAG_DBIT            (0x1f << PINMUX_FLAG_DBIT_SHIFT)

#define PINMUX_FLAG_DREG_SHIFT      10

#define PINMUX_FLAG_DREG            (0x3f << PINMUX_FLAG_DREG_SHIFT)



struct pinmux_gpio {

	pinmux_enum_t enum_id;

	pinmux_flag_t flags;

};



#define PINMUX_GPIO(gpio, data_or_mark) [gpio] = { data_or_mark }

#define PINMUX_DATA(data_or_mark, ids...) data_or_mark, ids, 0



struct pinmux_cfg_reg {

	unsigned long reg, reg_width, field_width;

	unsigned long *cnt;

	pinmux_enum_t *enum_ids;

};



#define PINMUX_CFG_REG(name, r, r_width, f_width) \

	.reg = r, .reg_width = r_width, .field_width = f_width,		\

	.cnt = (unsigned long [r_width / f_width]) {}, \

	.enum_ids = (pinmux_enum_t [(r_width / f_width) * (1 << f_width)]) \



struct pinmux_data_reg {

	unsigned long reg, reg_width, reg_shadow;

	pinmux_enum_t *enum_ids;

};



#define PINMUX_DATA_REG(name, r, r_width) \

	.reg = r, .reg_width = r_width,	\

	.enum_ids = (pinmux_enum_t [r_width]) \



struct pinmux_range {

	pinmux_enum_t begin;

	pinmux_enum_t end;

	pinmux_enum_t force;

};



struct pinmux_info {

	char *name;

	pinmux_enum_t reserved_id;

	struct pinmux_range data;

	struct pinmux_range input;

	struct pinmux_range input_pd;

	struct pinmux_range input_pu;

	struct pinmux_range output;

	struct pinmux_range mark;

	struct pinmux_range function;



	unsigned first_gpio, last_gpio;



	struct pinmux_gpio *gpios;

	struct pinmux_cfg_reg *cfg_regs;

	struct pinmux_data_reg *data_regs;



	pinmux_enum_t *gpio_data;

	unsigned int gpio_data_size;



	unsigned long *gpio_in_use;

	struct gpio_chip chip;

};



int register_pinmux(struct pinmux_info *pip);



#endif /* __ASM_SH_GPIO_H */

arch/sh/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 
obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_IO_TRAPPED)	+= io_trapped.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_GENERIC_GPIO)	+= gpio.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o

obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o

drivers/sh/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ 
#

obj-$(CONFIG_SUPERHYWAY)	+= superhyway/

obj-$(CONFIG_MAPLE)		+= maple/

obj-$(CONFIG_GENERIC_GPIO)	+= pfc.o

obj-y				+= intc.o

arch/sh/kernel/gpio.c→drivers/sh/pfc.c

+0 −0

File moved.

View file

include/linux/sh_pfc.h

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

 * SuperH Pin Function Controller Support

 *

 * Copyright (c) 2008 Magnus Damm

 *

 * 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_H

#define __SH_PFC_H



#include <asm-generic/gpio.h>



typedef unsigned short pinmux_enum_t;

typedef unsigned short pinmux_flag_t;



#define PINMUX_TYPE_NONE            0

#define PINMUX_TYPE_FUNCTION        1

#define PINMUX_TYPE_GPIO            2

#define PINMUX_TYPE_OUTPUT          3

#define PINMUX_TYPE_INPUT           4

#define PINMUX_TYPE_INPUT_PULLUP    5

#define PINMUX_TYPE_INPUT_PULLDOWN  6



#define PINMUX_FLAG_TYPE            (0x7)

#define PINMUX_FLAG_WANT_PULLUP     (1 << 3)

#define PINMUX_FLAG_WANT_PULLDOWN   (1 << 4)



#define PINMUX_FLAG_DBIT_SHIFT      5

#define PINMUX_FLAG_DBIT            (0x1f << PINMUX_FLAG_DBIT_SHIFT)

#define PINMUX_FLAG_DREG_SHIFT      10

#define PINMUX_FLAG_DREG            (0x3f << PINMUX_FLAG_DREG_SHIFT)



struct pinmux_gpio {

	pinmux_enum_t enum_id;

	pinmux_flag_t flags;

};



#define PINMUX_GPIO(gpio, data_or_mark) [gpio] = { data_or_mark }

#define PINMUX_DATA(data_or_mark, ids...) data_or_mark, ids, 0



struct pinmux_cfg_reg {

	unsigned long reg, reg_width, field_width;

	unsigned long *cnt;

	pinmux_enum_t *enum_ids;

};



#define PINMUX_CFG_REG(name, r, r_width, f_width) \

	.reg = r, .reg_width = r_width, .field_width = f_width,		\

	.cnt = (unsigned long [r_width / f_width]) {}, \

	.enum_ids = (pinmux_enum_t [(r_width / f_width) * (1 << f_width)]) \



struct pinmux_data_reg {

	unsigned long reg, reg_width, reg_shadow;

	pinmux_enum_t *enum_ids;

};



#define PINMUX_DATA_REG(name, r, r_width) \

	.reg = r, .reg_width = r_width,	\

	.enum_ids = (pinmux_enum_t [r_width]) \



struct pinmux_range {

	pinmux_enum_t begin;

	pinmux_enum_t end;

	pinmux_enum_t force;

};



struct pinmux_info {

	char *name;

	pinmux_enum_t reserved_id;

	struct pinmux_range data;

	struct pinmux_range input;

	struct pinmux_range input_pd;

	struct pinmux_range input_pu;

	struct pinmux_range output;

	struct pinmux_range mark;

	struct pinmux_range function;



	unsigned first_gpio, last_gpio;



	struct pinmux_gpio *gpios;

	struct pinmux_cfg_reg *cfg_regs;

	struct pinmux_data_reg *data_regs;



	pinmux_enum_t *gpio_data;

	unsigned int gpio_data_size;



	unsigned long *gpio_in_use;

	struct gpio_chip chip;

};



int register_pinmux(struct pinmux_info *pip);



#endif /* __SH_PFC_H */