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

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

ARM: mach-shmobile: sh7367 and G3EVM pinmux support 



Add support for the sh7367 pinmux using drivers/sh/pfc.c
and select serial console pins and some LEDs on G3EVM.

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

arch/arm/mach-shmobile/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ comment "SH-Mobile Board Type" 
config MACH_G3EVM

config MACH_G3EVM

	bool "G3EVM board"

	bool "G3EVM board"

	depends on ARCH_SH7367

	depends on ARCH_SH7367

	select ARCH_REQUIRE_GPIOLIB





config MACH_G4EVM

config MACH_G4EVM

	bool "G4EVM board"

	bool "G4EVM board"

arch/arm/mach-shmobile/Makefile

+4 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,10 @@ obj-$(CONFIG_ARCH_SH7367) += setup-sh7367.o clock-sh7367.o intc-sh7367.o 
obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7367.o intc-sh7377.o

obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7367.o intc-sh7377.o

obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7367.o intc-sh7372.o

obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7367.o intc-sh7372.o





# Pinmux setup

pfc-$(CONFIG_ARCH_SH7367)	:= pfc-sh7367.o

obj-$(CONFIG_GENERIC_GPIO)	+= $(pfc-y)



# Board objects

# Board objects

obj-$(CONFIG_MACH_G3EVM)	+= board-g3evm.o

obj-$(CONFIG_MACH_G3EVM)	+= board-g3evm.o

obj-$(CONFIG_MACH_G4EVM)	+= board-g4evm.o

obj-$(CONFIG_MACH_G4EVM)	+= board-g4evm.o

arch/arm/mach-shmobile/board-g3evm.c

+25 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/physmap.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <mach/sh7367.h>

#include <mach/common.h>

#include <mach/common.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -113,6 +115,29 @@ static void __init g3evm_map_io(void) 




static void __init g3evm_init(void)

static void __init g3evm_init(void)

{

{

	sh7367_pinmux_init();



	/* Lit DS4 LED */

	gpio_request(GPIO_PORT22, NULL);

	gpio_direction_output(GPIO_PORT22, 1);

	gpio_export(GPIO_PORT22, 0);



	/* Lit DS8 LED */

	gpio_request(GPIO_PORT23, NULL);

	gpio_direction_output(GPIO_PORT23, 1);

	gpio_export(GPIO_PORT23, 0);



	/* Lit DS3 LED */

	gpio_request(GPIO_PORT24, NULL);

	gpio_direction_output(GPIO_PORT24, 1);

	gpio_export(GPIO_PORT24, 0);



	/* SCIFA1 */

	gpio_request(GPIO_FN_SCIFA1_TXD, NULL);

	gpio_request(GPIO_FN_SCIFA1_RXD, NULL);

	gpio_request(GPIO_FN_SCIFA1_CTS, NULL);

	gpio_request(GPIO_FN_SCIFA1_RTS, NULL);



	sh7367_add_standard_devices();

	sh7367_add_standard_devices();





	platform_add_devices(g3evm_devices, ARRAY_SIZE(g3evm_devices));

	platform_add_devices(g3evm_devices, ARRAY_SIZE(g3evm_devices));

arch/arm/mach-shmobile/include/mach/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ extern void sh7367_init_irq(void); 
extern void sh7367_add_early_devices(void);

extern void sh7367_add_early_devices(void);

extern void sh7367_add_standard_devices(void);

extern void sh7367_add_standard_devices(void);

extern void sh7367_clock_init(void);

extern void sh7367_clock_init(void);

extern void sh7367_pinmux_init(void);





extern void sh7377_init_irq(void);

extern void sh7377_init_irq(void);

extern void sh7377_add_early_devices(void);

extern void sh7377_add_early_devices(void);

arch/arm/mach-shmobile/include/mach/gpio.h

+48 −1
Original line number Original line Diff line number Diff line 
/* empty */
 
/*

 * Generic GPIO API and pinmux table 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 __ASM_ARCH_GPIO_H

#define __ASM_ARCH_GPIO_H



#include <linux/kernel.h>

#include <linux/errno.h>



#define ARCH_NR_GPIOS 1024

#include <linux/sh_pfc.h>



#ifdef CONFIG_GPIOLIB



static inline int gpio_get_value(unsigned gpio)

{

	return __gpio_get_value(gpio);

}



static inline void gpio_set_value(unsigned gpio, int value)

{

	__gpio_set_value(gpio, value);

}



static inline int gpio_cansleep(unsigned gpio)

{

	return __gpio_cansleep(gpio);

}



static inline int gpio_to_irq(unsigned gpio)

{

	return -ENOSYS;

}



static inline int irq_to_gpio(unsigned int irq)

{

	return -EINVAL;

}



#endif /* CONFIG_GPIOLIB */



#endif /* __ASM_ARCH_GPIO_H */