ARM: Samsung: move iomux definitions to iomux.h
mach/gpio.h is for the gpio API, so move unrelated stuff away. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
fcf4ed08a8
commit
a8ead3b9dd
|
@ -35,6 +35,7 @@
|
||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <gpio.h>
|
#include <gpio.h>
|
||||||
|
#include <mach/iomux.h>
|
||||||
#include <mach/s3c-iomap.h>
|
#include <mach/s3c-iomap.h>
|
||||||
#include <mach/devices-s3c24xx.h>
|
#include <mach/devices-s3c24xx.h>
|
||||||
#include <mach/s3c24xx-nand.h>
|
#include <mach/s3c24xx-nand.h>
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <mach/s3c-iomap.h>
|
#include <mach/s3c-iomap.h>
|
||||||
#include <mach/devices-s3c64xx.h>
|
#include <mach/devices-s3c64xx.h>
|
||||||
#include <mach/s3c-generic.h>
|
#include <mach/s3c-generic.h>
|
||||||
|
#include <mach/iomux.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* dm9000 network controller onboard
|
* dm9000 network controller onboard
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <nand.h>
|
#include <nand.h>
|
||||||
#include <asm/armlinux.h>
|
#include <asm/armlinux.h>
|
||||||
|
#include <mach/iomux.h>
|
||||||
#include <mach/s3c-iomap.h>
|
#include <mach/s3c-iomap.h>
|
||||||
#include <mach/s3c-clocks.h>
|
#include <mach/s3c-clocks.h>
|
||||||
#include <mach/s3c-generic.h>
|
#include <mach/s3c-generic.h>
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include <dm9000.h>
|
#include <dm9000.h>
|
||||||
#include <mach/devices-s3c64xx.h>
|
#include <mach/devices-s3c64xx.h>
|
||||||
#include <mach/s3c-generic.h>
|
#include <mach/s3c-generic.h>
|
||||||
|
#include <mach/iomux.h>
|
||||||
|
|
||||||
#include "tiny6410.h"
|
#include "tiny6410.h"
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include <asm/armlinux.h>
|
#include <asm/armlinux.h>
|
||||||
#include <mach/s3c-iomap.h>
|
#include <mach/s3c-iomap.h>
|
||||||
#include <mach/s3c-generic.h>
|
#include <mach/s3c-generic.h>
|
||||||
|
#include <mach/iomux.h>
|
||||||
|
|
||||||
static const unsigned tiny6410_pin_usage[] = {
|
static const unsigned tiny6410_pin_usage[] = {
|
||||||
/* UART0 */
|
/* UART0 */
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include <mach/s3c-iomap.h>
|
#include <mach/s3c-iomap.h>
|
||||||
#include <mach/gpio.h>
|
#include <mach/gpio.h>
|
||||||
#include <mach/s3c24xx-gpio.h>
|
#include <mach/s3c24xx-gpio.h>
|
||||||
|
#include <mach/iomux.h>
|
||||||
|
|
||||||
static const unsigned char group_offset[] =
|
static const unsigned char group_offset[] =
|
||||||
{
|
{
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <gpio.h>
|
#include <gpio.h>
|
||||||
|
#include <mach/iomux.h>
|
||||||
#include <mach/s3c-iomap.h>
|
#include <mach/s3c-iomap.h>
|
||||||
|
|
||||||
#define S3C_GPACON (S3C_GPIO_BASE)
|
#define S3C_GPACON (S3C_GPIO_BASE)
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <gpio.h>
|
#include <gpio.h>
|
||||||
|
#include <mach/iomux.h>
|
||||||
#include <mach/s3c-iomap.h>
|
#include <mach/s3c-iomap.h>
|
||||||
|
|
||||||
#define S3C_GPACON (S3C_GPIO_BASE)
|
#define S3C_GPACON (S3C_GPIO_BASE)
|
||||||
|
|
|
@ -13,18 +13,6 @@
|
||||||
#ifndef __ASM_MACH_GPIO_H
|
#ifndef __ASM_MACH_GPIO_H
|
||||||
#define __ASM_MACH_GPIO_H
|
#define __ASM_MACH_GPIO_H
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_S3C24xx
|
|
||||||
# include <mach/iomux-s3c24x0.h>
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_ARCH_S3C64xx
|
|
||||||
# include <mach/iomux-s3c64xx.h>
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_ARCH_S5PCxx
|
|
||||||
# include <mach/iomux-s5pcxx.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <asm-generic/gpio.h>
|
#include <asm-generic/gpio.h>
|
||||||
|
|
||||||
void s3c_gpio_mode(unsigned);
|
|
||||||
|
|
||||||
#endif /* __ASM_MACH_GPIO_H */
|
#endif /* __ASM_MACH_GPIO_H */
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __ASM_MACH_IOMUX_H
|
||||||
|
#define __ASM_MACH_IOMUX_H
|
||||||
|
|
||||||
|
#ifdef CONFIG_ARCH_S3C24xx
|
||||||
|
# include <mach/iomux-s3c24x0.h>
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_ARCH_S3C64xx
|
||||||
|
# include <mach/iomux-s3c64xx.h>
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_ARCH_S5PCxx
|
||||||
|
# include <mach/iomux-s5pcxx.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void s3c_gpio_mode(unsigned);
|
||||||
|
|
||||||
|
#endif /* __ASM_MACH_IOMUX_H */
|
Loading…
Reference in New Issue