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

Commit f23c144d authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: make duplicated ColdFire GPIO init code common for all 



The code that adds each ColdFire platforms GPIO signals is duplicated in
each platforms specific code. Remove it from each platforms code and put
a single version in the existing ColdFire gpio subsystem init code.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarSteven King <sfking@fdwdc.com>
parent 943c0cd0

arch/m68k/include/asm/mcfgpio.h

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ struct mcf_gpio_chip { 
	const u8 *gpio_to_pinmux;

};



extern struct mcf_gpio_chip mcf_gpio_chips[];

extern unsigned int mcf_gpio_chips_size;



int mcf_gpio_direction_input(struct gpio_chip *, unsigned);

int mcf_gpio_get_value(struct gpio_chip *, unsigned);

int mcf_gpio_direction_output(struct gpio_chip *, unsigned, int);

arch/m68k/platform/5206/gpio.c

+2 −10
Original line number Diff line number Diff line
@@ -20,16 +20,8 @@ 
#include <asm/mcfsim.h>

#include <asm/mcfgpio.h>



static struct mcf_gpio_chip mcf_gpio_chips[] = {

struct mcf_gpio_chip mcf_gpio_chips[] = {

	MCFGPS(PP, 0, 8, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),

};



static int __init mcf_gpio_init(void)

{

	unsigned i = 0;

	while (i < ARRAY_SIZE(mcf_gpio_chips))

		(void)gpiochip_add((struct gpio_chip *)&mcf_gpio_chips[i++]);

	return 0;

}



core_initcall(mcf_gpio_init);
 
unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);

arch/m68k/platform/520x/gpio.c

+2 −10
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/mcfsim.h>

#include <asm/mcfgpio.h>



static struct mcf_gpio_chip mcf_gpio_chips[] = {

struct mcf_gpio_chip mcf_gpio_chips[] = {

	MCFGPS(PIRQ, 0, 8, MCFEPORT_EPDDR, MCFEPORT_EPDR, MCFEPORT_EPPDR),

	MCFGPF(CS, 9, 3),

	MCFGPF(FECI2C, 16, 4),
@@ -31,12 +31,4 @@ static struct mcf_gpio_chip mcf_gpio_chips[] = { 
	MCFGPF(FECL, 56, 8),

};



static int __init mcf_gpio_init(void)

{

	unsigned i = 0;

	while (i < ARRAY_SIZE(mcf_gpio_chips))

		(void)gpiochip_add((struct gpio_chip *)&mcf_gpio_chips[i++]);

	return 0;

}



core_initcall(mcf_gpio_init);
 
unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);

arch/m68k/platform/523x/gpio.c

+2 −10
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/mcfsim.h>

#include <asm/mcfgpio.h>



static struct mcf_gpio_chip mcf_gpio_chips[] = {

struct mcf_gpio_chip mcf_gpio_chips[] = {

	MCFGPS(PIRQ, 1, 7, MCFEPORT_EPDDR, MCFEPORT_EPDR, MCFEPORT_EPPDR),

	MCFGPF(ADDR, 13, 3),

	MCFGPF(DATAH, 16, 8),
@@ -37,12 +37,4 @@ static struct mcf_gpio_chip mcf_gpio_chips[] = { 
	MCFGPF(ETPU, 104, 3),

};



static int __init mcf_gpio_init(void)

{

	unsigned i = 0;

	while (i < ARRAY_SIZE(mcf_gpio_chips))

		(void)gpiochip_add((struct gpio_chip *)&mcf_gpio_chips[i++]);

	return 0;

}



core_initcall(mcf_gpio_init);
 
unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);

arch/m68k/platform/5249/gpio.c

+2 −10
Original line number Diff line number Diff line
@@ -20,17 +20,9 @@ 
#include <asm/mcfsim.h>

#include <asm/mcfgpio.h>



static struct mcf_gpio_chip mcf_gpio_chips[] = {

struct mcf_gpio_chip mcf_gpio_chips[] = {

	MCFGPS(GPIO0, 0, 32, MCFSIM2_GPIOENABLE, MCFSIM2_GPIOWRITE, MCFSIM2_GPIOREAD),

	MCFGPS(GPIO1, 32, 32, MCFSIM2_GPIO1ENABLE, MCFSIM2_GPIO1WRITE, MCFSIM2_GPIO1READ),

};



static int __init mcf_gpio_init(void)

{

	unsigned i = 0;

	while (i < ARRAY_SIZE(mcf_gpio_chips))

		(void)gpiochip_add((struct gpio_chip *)&mcf_gpio_chips[i++]);

	return 0;

}



core_initcall(mcf_gpio_init);
 
unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);