diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:38:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:38:53 +0200 |
| commit | 8f9d4007c53cefc513619b83b5b81b146423b11b (patch) | |
| tree | 88242ae77da977fca2a8777936509534bf8f0b45 /arch/arm | |
| parent | ec102f635b41a7613a034c84e85559b46ed1c1f3 (diff) | |
| parent | 8c1180c3eda1c4c50ffa31fdd6a764026ce51a65 (diff) | |
| download | barebox-8f9d4007c53cefc513619b83b5b81b146423b11b.tar.gz barebox-8f9d4007c53cefc513619b83b5b81b146423b11b.tar.xz | |
Merge branch 'for-next/arm-gpio'
Diffstat (limited to 'arch/arm')
91 files changed, 419 insertions, 365 deletions
diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c index d8f9796d46..c240767bae 100644 --- a/arch/arm/boards/animeo_ip/init.c +++ b/arch/arm/boards/animeo_ip/init.c @@ -22,6 +22,7 @@ #include <mach/board.h> #include <mach/at91sam9_smc.h> #include <gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> diff --git a/arch/arm/boards/at91rm9200ek/init.c b/arch/arm/boards/at91rm9200ek/init.c index cd8a1650c4..16f33e0c95 100644 --- a/arch/arm/boards/at91rm9200ek/init.c +++ b/arch/arm/boards/at91rm9200ek/init.c @@ -22,13 +22,14 @@ #include <generated/mach-types.h> #include <partition.h> #include <fs.h> +#include <gpio.h> #include <fcntl.h> #include <io.h> #include <sizes.h> #include <asm/hardware.h> #include <mach/at91_pmc.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <spi/spi.h> diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c index d2ace1dd28..d7a28ccfc4 100644 --- a/arch/arm/boards/at91sam9260ek/init.c +++ b/arch/arm/boards/at91sam9260ek/init.c @@ -23,6 +23,7 @@ #include <mach/at91sam9_smc.h> #include <gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91_rstc.h> #include <linux/clk.h> diff --git a/arch/arm/boards/at91sam9261ek/init.c b/arch/arm/boards/at91sam9261ek/init.c index 91640f936e..01a0215067 100644 --- a/arch/arm/boards/at91sam9261ek/init.c +++ b/arch/arm/boards/at91sam9261ek/init.c @@ -32,6 +32,7 @@ #include <mach/board.h> #include <gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91sam9_smc.h> #include <dm9000.h> #include <gpio_keys.h> diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c index ebc1697019..c4269a3279 100644 --- a/arch/arm/boards/at91sam9263ek/init.c +++ b/arch/arm/boards/at91sam9263ek/init.c @@ -32,6 +32,7 @@ #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> +#include <mach/iomux.h> #include <gpio.h> #include <mach/io.h> #include <mach/at91sam9_smc.h> diff --git a/arch/arm/boards/at91sam9m10g45ek/init.c b/arch/arm/boards/at91sam9m10g45ek/init.c index 5aa86953b2..539cbee0c3 100644 --- a/arch/arm/boards/at91sam9m10g45ek/init.c +++ b/arch/arm/boards/at91sam9m10g45ek/init.c @@ -20,6 +20,7 @@ #include <net.h> #include <mci.h> #include <init.h> +#include <gpio.h> #include <environment.h> #include <asm/armlinux.h> #include <generated/mach-types.h> @@ -33,7 +34,7 @@ #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <mach/at91sam9_smc.h> #include <gpio_keys.h> diff --git a/arch/arm/boards/at91sam9m10ihd/init.c b/arch/arm/boards/at91sam9m10ihd/init.c index 9135b0c3c1..7fa6afbdfe 100644 --- a/arch/arm/boards/at91sam9m10ihd/init.c +++ b/arch/arm/boards/at91sam9m10ihd/init.c @@ -22,6 +22,7 @@ #include <mach/board.h> #include <gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91sam9_smc.h> #include <input/qt1070.h> #include <readkey.h> diff --git a/arch/arm/boards/at91sam9n12ek/init.c b/arch/arm/boards/at91sam9n12ek/init.c index 0267a7d994..440d39d3dc 100644 --- a/arch/arm/boards/at91sam9n12ek/init.c +++ b/arch/arm/boards/at91sam9n12ek/init.c @@ -33,6 +33,7 @@ #include <mach/at91sam9_smc.h> #include <gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> #include <mach/at91sam9x5_matrix.h> diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c index 3d4d95b00f..c7948764c9 100644 --- a/arch/arm/boards/at91sam9x5ek/init.c +++ b/arch/arm/boards/at91sam9x5ek/init.c @@ -33,6 +33,7 @@ #include <mach/at91sam9_smc.h> #include <gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> #include <mach/at91sam9x5_matrix.h> diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index 2485e12ac7..89d8f6c857 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/arch/arm/boards/ccxmx51/ccxmx51.c @@ -25,7 +25,6 @@ #include <environment.h> #include <mach/imx51-regs.h> #include <fec.h> -#include <mach/gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/ccxmx51/ccxmx51js.c b/arch/arm/boards/ccxmx51/ccxmx51js.c index 3bd50ac369..189e9a554c 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51js.c +++ b/arch/arm/boards/ccxmx51/ccxmx51js.c @@ -18,9 +18,9 @@ #include <common.h> #include <io.h> #include <init.h> +#include <gpio.h> #include <mci.h> #include <asm/armlinux.h> -#include <mach/gpio.h> #include <mach/generic.h> #include <mach/imx51-regs.h> #include <mach/iomux-mx51.h> diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index b0292618f3..3b97551cba 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/arch/arm/boards/chumby_falconwing/falconwing.c @@ -30,6 +30,7 @@ #include <mach/mci.h> #include <mach/fb.h> #include <mach/usb.h> +#include <mach/iomux.h> static struct mxs_mci_platform_data mci_pdata = { .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED, diff --git a/arch/arm/boards/dss11/init.c b/arch/arm/boards/dss11/init.c index e53ae8807f..f769f4f681 100644 --- a/arch/arm/boards/dss11/init.c +++ b/arch/arm/boards/dss11/init.c @@ -31,6 +31,7 @@ #include <mach/at91sam9_smc.h> #include <gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91_rstc.h> #include <linux/clk.h> diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c index a6f27dc32d..0de30e8c5d 100644 --- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c +++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c @@ -21,12 +21,12 @@ #include <common.h> #include <init.h> #include <driver.h> +#include <gpio.h> #include <environment.h> #include <mach/imx25-regs.h> #include <asm/armlinux.h> #include <asm/barebox-arm.h> #include <asm/sections.h> -#include <mach/gpio.h> #include <io.h> #include <asm/mmu.h> #include <led.h> diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index 75f32395ea..81ac6540f1 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -24,7 +24,7 @@ #include <mach/imx27-regs.h> #include <fec.h> #include <notifier.h> -#include <mach/gpio.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/sections.h> #include <asm/barebox-arm.h> diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c index e406fe8fc9..8db2ab114a 100644 --- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c +++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c @@ -33,13 +33,13 @@ #include <nand.h> #include <net.h> #include <partition.h> +#include <gpio.h> #include <asm/armlinux.h> #include <io.h> #include <generated/mach-types.h> #include <asm/mmu.h> -#include <mach/gpio.h> #include <mach/imx-nand.h> #include <mach/imx35-regs.h> #include <mach/iomux-mx35.h> diff --git a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c index 523a805dcb..ceabac64ab 100644 --- a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c +++ b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c @@ -21,7 +21,7 @@ #include <environment.h> #include <mach/imx51-regs.h> #include <fec.h> -#include <mach/gpio.h> +#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c index 47f7031668..3b82760ff8 100644 --- a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c +++ b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c @@ -26,6 +26,7 @@ #include <mach/mci.h> #include <usb/fsl_usb2.h> #include <mach/usb.h> +#include <mach/iomux.h> static struct mxs_mci_platform_data mci_pdata = { .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED, diff --git a/arch/arm/boards/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3-stack/3stack.c index 6620a86770..cba5cce0d9 100644 --- a/arch/arm/boards/freescale-mx25-3-stack/3stack.c +++ b/arch/arm/boards/freescale-mx25-3-stack/3stack.c @@ -20,12 +20,12 @@ #include <common.h> #include <init.h> #include <driver.h> +#include <gpio.h> #include <environment.h> #include <mach/imx25-regs.h> #include <asm/armlinux.h> #include <asm/sections.h> #include <asm/barebox-arm.h> -#include <mach/gpio.h> #include <io.h> #include <partition.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c index dfb187863f..606ff46afe 100644 --- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c +++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c @@ -29,6 +29,7 @@ #include <mach/iomux-imx28.h> #include <mach/mci.h> #include <mach/fb.h> +#include <mach/iomux.h> #include <mach/ocotp.h> #include <mach/devices.h> #include <spi/spi.h> diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3-stack/3stack.c index f30d77dd9c..c8358da7b2 100644 --- a/arch/arm/boards/freescale-mx35-3-stack/3stack.c +++ b/arch/arm/boards/freescale-mx35-3-stack/3stack.c @@ -32,6 +32,7 @@ #include <net.h> #include <sizes.h> #include <partition.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/sections.h> @@ -39,7 +40,6 @@ #include <io.h> #include <generated/mach-types.h> -#include <mach/gpio.h> #include <mach/weim.h> #include <mach/imx-nand.h> #include <mach/imx35-regs.h> diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c index cafcf37590..ad09781ccd 100644 --- a/arch/arm/boards/freescale-mx51-pdk/board.c +++ b/arch/arm/boards/freescale-mx51-pdk/board.c @@ -19,7 +19,7 @@ #include <environment.h> #include <mach/imx51-regs.h> #include <fec.h> -#include <mach/gpio.h> +#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/freescale-mx53-smd/board.c b/arch/arm/boards/freescale-mx53-smd/board.c index d7f6e8b816..8c29e90d94 100644 --- a/arch/arm/boards/freescale-mx53-smd/board.c +++ b/arch/arm/boards/freescale-mx53-smd/board.c @@ -24,6 +24,7 @@ #include <net.h> #include <partition.h> #include <sizes.h> +#include <gpio.h> #include <generated/mach-types.h> @@ -31,7 +32,6 @@ #include <mach/iomux-mx53.h> #include <mach/devices-imx53.h> #include <mach/generic.h> -#include <mach/gpio.h> #include <mach/imx-nand.h> #include <mach/iim.h> #include <mach/imx5.h> diff --git a/arch/arm/boards/freescale-mx6-arm2/board.c b/arch/arm/boards/freescale-mx6-arm2/board.c index 538ab7f38b..7dbcecc329 100644 --- a/arch/arm/boards/freescale-mx6-arm2/board.c +++ b/arch/arm/boards/freescale-mx6-arm2/board.c @@ -17,7 +17,7 @@ #include <environment.h> #include <mach/imx6-regs.h> #include <fec.h> -#include <mach/gpio.h> +#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index 39f465b6d6..8bbeecdcea 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -19,7 +19,7 @@ #include <environment.h> #include <mach/imx6-regs.h> #include <fec.h> -#include <mach/gpio.h> +#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> @@ -33,7 +33,6 @@ #include <mach/imx6.h> #include <mach/devices-imx6.h> #include <mach/iomux-mx6.h> -#include <mach/gpio.h> #include <spi/spi.h> #include <mach/spi.h> #include <mach/usb.h> diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c index 422c0d9302..0b6bf69362 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/board.c +++ b/arch/arm/boards/freescale-mx6-sabresd/board.c @@ -20,7 +20,7 @@ #include <environment.h> #include <mach/imx6-regs.h> #include <fec.h> -#include <mach/gpio.h> +#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> @@ -33,7 +33,6 @@ #include <mach/imx6.h> #include <mach/devices-imx6.h> #include <mach/iomux-mx6.h> -#include <mach/gpio.h> #include <spi/spi.h> #include <mach/spi.h> #include <mach/usb.h> diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c index de07bda755..cf96183100 100644 --- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c +++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c @@ -34,7 +34,8 @@ #include <asm/armlinux.h> #include <asm/sections.h> #include <io.h> -#include <mach/gpio.h> +#include <gpio.h> +#include <mach/iomux.h> #include <mach/s3c-iomap.h> #include <mach/devices-s3c24xx.h> #include <mach/s3c24xx-nand.h> diff --git a/arch/arm/boards/friendlyarm-mini6410/mini6410.c b/arch/arm/boards/friendlyarm-mini6410/mini6410.c index 01437ac559..ebe97f089a 100644 --- a/arch/arm/boards/friendlyarm-mini6410/mini6410.c +++ b/arch/arm/boards/friendlyarm-mini6410/mini6410.c @@ -21,6 +21,7 @@ #include <mach/s3c-iomap.h> #include <mach/devices-s3c64xx.h> #include <mach/s3c-generic.h> +#include <mach/iomux.h> /* * dm9000 network controller onboard diff --git a/arch/arm/boards/friendlyarm-tiny210/tiny210.c b/arch/arm/boards/friendlyarm-tiny210/tiny210.c index fb144f554f..c78e9df4f3 100644 --- a/arch/arm/boards/friendlyarm-tiny210/tiny210.c +++ b/arch/arm/boards/friendlyarm-tiny210/tiny210.c @@ -35,6 +35,7 @@ #include <io.h> #include <nand.h> #include <asm/armlinux.h> +#include <mach/iomux.h> #include <mach/s3c-iomap.h> #include <mach/s3c-clocks.h> #include <mach/s3c-generic.h> diff --git a/arch/arm/boards/friendlyarm-tiny6410/development-board.c b/arch/arm/boards/friendlyarm-tiny6410/development-board.c index bf339d3928..2bcb7df35f 100644 --- a/arch/arm/boards/friendlyarm-tiny6410/development-board.c +++ b/arch/arm/boards/friendlyarm-tiny6410/development-board.c @@ -26,6 +26,7 @@ #include <dm9000.h> #include <mach/devices-s3c64xx.h> #include <mach/s3c-generic.h> +#include <mach/iomux.h> #include "tiny6410.h" diff --git a/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c b/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c index db13c066cf..97dc322d0d 100644 --- a/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c +++ b/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c @@ -19,6 +19,7 @@ #include <asm/armlinux.h> #include <mach/s3c-iomap.h> #include <mach/s3c-generic.h> +#include <mach/iomux.h> static const unsigned tiny6410_pin_usage[] = { /* UART0 */ diff --git a/arch/arm/boards/guf-cupid/board.c b/arch/arm/boards/guf-cupid/board.c index 67a4b1d29f..32a3ed4dcf 100644 --- a/arch/arm/boards/guf-cupid/board.c +++ b/arch/arm/boards/guf-cupid/board.c @@ -27,8 +27,8 @@ #include <fs.h> #include <mach/imx35-regs.h> #include <asm/armlinux.h> -#include <mach/gpio.h> #include <io.h> +#include <gpio.h> #include <partition.h> #include <nand.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c index 00e0d210f4..055da540c4 100644 --- a/arch/arm/boards/guf-neso/board.c +++ b/arch/arm/boards/guf-neso/board.c @@ -21,6 +21,7 @@ #include <fec.h> #include <notifier.h> #include <partition.h> +#include <gpio.h> #include <fs.h> #include <fcntl.h> #include <nand.h> @@ -33,7 +34,6 @@ #include <asm/armlinux.h> #include <generated/mach-types.h> -#include <mach/gpio.h> #include <mach/spi.h> #include <mach/imx27-regs.h> #include <mach/iomux-mx27.h> diff --git a/arch/arm/boards/imx21ads/imx21ads.c b/arch/arm/boards/imx21ads/imx21ads.c index 8717774d18..3d110f9a47 100644 --- a/arch/arm/boards/imx21ads/imx21ads.c +++ b/arch/arm/boards/imx21ads/imx21ads.c @@ -26,7 +26,7 @@ #include <asm/sections.h> #include <asm/barebox-arm.h> #include <io.h> -#include <mach/gpio.h> +#include <gpio.h> #include <mach/weim.h> #include <partition.h> #include <fs.h> diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c index ce59a2ae56..dc8a099e22 100644 --- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c +++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c @@ -35,6 +35,7 @@ #include <mach/imx-regs.h> #include <mach/clock.h> #include <mach/mci.h> +#include <mach/iomux.h> static struct mxs_mci_platform_data mci_pdata = { .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED, diff --git a/arch/arm/boards/imx27ads/imx27ads.c b/arch/arm/boards/imx27ads/imx27ads.c index fc8cf4a5e2..71749dc97a 100644 --- a/arch/arm/boards/imx27ads/imx27ads.c +++ b/arch/arm/boards/imx27ads/imx27ads.c @@ -22,7 +22,7 @@ #include <asm/armlinux.h> #include <io.h> #include <fec.h> -#include <mach/gpio.h> +#include <gpio.h> #include <mach/weim.h> #include <partition.h> #include <fs.h> diff --git a/arch/arm/boards/karo-tx25/board.c b/arch/arm/boards/karo-tx25/board.c index bffa11edb5..d9669f112f 100644 --- a/arch/arm/boards/karo-tx25/board.c +++ b/arch/arm/boards/karo-tx25/board.c @@ -21,12 +21,12 @@ #include <init.h> #include <driver.h> #include <sizes.h> +#include <gpio.h> #include <environment.h> #include <mach/imx25-regs.h> #include <asm/armlinux.h> #include <asm/sections.h> #include <asm/barebox-arm.h> -#include <mach/gpio.h> #include <io.h> #include <partition.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index a1b161a5c5..8e8b62cbe3 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/arch/arm/boards/karo-tx28/tx28-stk5.c @@ -28,6 +28,7 @@ #include <mach/mci.h> #include <mach/fb.h> #include <mach/ocotp.h> +#include <mach/iomux.h> static struct mxs_mci_platform_data mci_pdata = { .caps = MMC_CAP_4_BIT_DATA, diff --git a/arch/arm/boards/karo-tx28/tx28.c b/arch/arm/boards/karo-tx28/tx28.c index 4cacca3d0c..198d2125ee 100644 --- a/arch/arm/boards/karo-tx28/tx28.c +++ b/arch/arm/boards/karo-tx28/tx28.c @@ -22,6 +22,7 @@ #include <generated/mach-types.h> #include <mach/imx-regs.h> #include <mach/devices.h> +#include <mach/iomux.h> #include <asm/mmu.h> /* setup the CPU card internal signals */ diff --git a/arch/arm/boards/karo-tx51/tx51.c b/arch/arm/boards/karo-tx51/tx51.c index d1407a8f33..55643f2e92 100644 --- a/arch/arm/boards/karo-tx51/tx51.c +++ b/arch/arm/boards/karo-tx51/tx51.c @@ -20,7 +20,7 @@ #include <environment.h> #include <mach/imx51-regs.h> #include <fec.h> -#include <mach/gpio.h> +#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/karo-tx53/board.c b/arch/arm/boards/karo-tx53/board.c index 6ead6a9f76..ad867cb121 100644 --- a/arch/arm/boards/karo-tx53/board.c +++ b/arch/arm/boards/karo-tx53/board.c @@ -23,6 +23,7 @@ #include <net.h> #include <partition.h> #include <sizes.h> +#include <gpio.h> #include <generated/mach-types.h> @@ -30,7 +31,6 @@ #include <mach/iomux-mx53.h> #include <mach/devices-imx53.h> #include <mach/generic.h> -#include <mach/gpio.h> #include <mach/imx-nand.h> #include <mach/iim.h> #include <mach/imx5.h> diff --git a/arch/arm/boards/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c index 1569487153..b695741436 100644 --- a/arch/arm/boards/mmccpu/init.c +++ b/arch/arm/boards/mmccpu/init.c @@ -19,6 +19,7 @@ #include <init.h> #include <environment.h> #include <fec.h> +#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> @@ -30,7 +31,7 @@ #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> static struct macb_platform_data macb_pdata = { diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index d1f9a5ef05..951fc5af53 100644 --- a/arch/arm/boards/panda/board.c +++ b/arch/arm/boards/panda/board.c @@ -3,6 +3,7 @@ #include <init.h> #include <driver.h> #include <io.h> +#include <gpio.h> #include <ns16550.h> #include <asm/armlinux.h> #include <generated/mach-types.h> @@ -16,7 +17,6 @@ #include <linux/err.h> #include <sizes.h> #include <asm/mmu.h> -#include <mach/gpio.h> #include <envfs.h> #include <i2c/i2c.h> #include <gpio.h> diff --git a/arch/arm/boards/pcm037/pcm037.c b/arch/arm/boards/pcm037/pcm037.c index de83c99b93..ed3525c8f2 100644 --- a/arch/arm/boards/pcm037/pcm037.c +++ b/arch/arm/boards/pcm037/pcm037.c @@ -22,13 +22,13 @@ #include <init.h> #include <driver.h> #include <fs.h> +#include <gpio.h> #include <environment.h> #include <usb/ulpi.h> #include <mach/imx31-regs.h> #include <mach/iomux-mx31.h> #include <asm/armlinux.h> #include <asm/sections.h> -#include <mach/gpio.h> #include <mach/weim.h> #include <io.h> #include <smc911x.h> diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index b573289dd8..1800dd0f80 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/arch/arm/boards/pcm038/pcm038.c @@ -24,7 +24,7 @@ #include <fec.h> #include <sizes.h> #include <notifier.h> -#include <mach/gpio.h> +#include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/pcm038/pcm970.c b/arch/arm/boards/pcm038/pcm970.c index b176d8dd09..2b2483b0a6 100644 --- a/arch/arm/boards/pcm038/pcm970.c +++ b/arch/arm/boards/pcm038/pcm970.c @@ -15,11 +15,11 @@ #include <io.h> #include <init.h> #include <sizes.h> +#include <gpio.h> #include <platform_ide.h> #include <mach/imx27-regs.h> #include <mach/iomux-mx27.h> #include <mach/weim.h> -#include <mach/gpio.h> #include <mach/devices-imx27.h> #include <usb/chipidea-imx.h> diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c index 68b7864aa1..e6987daa4c 100644 --- a/arch/arm/boards/pcm043/pcm043.c +++ b/arch/arm/boards/pcm043/pcm043.c @@ -25,10 +25,10 @@ #include <driver.h> #include <environment.h> #include <fs.h> +#include <gpio.h> #include <sizes.h> #include <mach/imx35-regs.h> #include <asm/armlinux.h> -#include <mach/gpio.h> #include <io.h> #include <partition.h> #include <nand.h> diff --git a/arch/arm/boards/pcm049/board.c b/arch/arm/boards/pcm049/board.c index 6e4dbf62ff..e7d947f5d2 100644 --- a/arch/arm/boards/pcm049/board.c +++ b/arch/arm/boards/pcm049/board.c @@ -18,6 +18,7 @@ #include <console.h> #include <init.h> #include <driver.h> +#include <gpio.h> #include <io.h> #include <ns16550.h> #include <asm/armlinux.h> @@ -35,7 +36,6 @@ #include <partition.h> #include <nand.h> #include <asm/mmu.h> -#include <mach/gpio.h> #include <mach/gpmc.h> #include <mach/gpmc_nand.h> #include <i2c/i2c.h> diff --git a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c b/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c index 8f79d98fb5..7bb614021a 100644 --- a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c +++ b/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c @@ -19,6 +19,7 @@ #include <init.h> #include <driver.h> #include <io.h> +#include <gpio.h> #include <ns16550.h> #include <asm/armlinux.h> #include <generated/mach-types.h> @@ -32,7 +33,6 @@ #include <partition.h> #include <nand.h> #include <asm/mmu.h> -#include <mach/gpio.h> #include <mach/gpmc.h> #include <mach/gpmc_nand.h> #include <mach/omap_hsmmc.h> diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c index 47407565ba..1a64fc0f55 100644 --- a/arch/arm/boards/phycard-i.MX27/pca100.c +++ b/arch/arm/boards/phycard-i.MX27/pca100.c @@ -20,7 +20,7 @@ #include <environment.h> #include <mach/imx27-regs.h> #include <fec.h> -#include <mach/gpio.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/sections.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/pm9261/init.c b/arch/arm/boards/pm9261/init.c index 51dc3511a6..d23e8343c0 100644 --- a/arch/arm/boards/pm9261/init.c +++ b/arch/arm/boards/pm9261/init.c @@ -19,6 +19,7 @@ #include <common.h> #include <net.h> #include <init.h> +#include <gpio.h> #include <environment.h> #include <asm/armlinux.h> #include <generated/mach-types.h> @@ -31,7 +32,7 @@ #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <mach/at91sam9_smc.h> #include <dm9000.h> diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c index 559e321457..76fef7d264 100644 --- a/arch/arm/boards/pm9263/init.c +++ b/arch/arm/boards/pm9263/init.c @@ -25,6 +25,7 @@ #include <generated/mach-types.h> #include <partition.h> #include <fs.h> +#include <gpio.h> #include <fcntl.h> #include <io.h> #include <asm/hardware.h> @@ -32,8 +33,8 @@ #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91sam9_smc.h> #include <linux/w1-gpio.h> #include <w1_mac_address.h> diff --git a/arch/arm/boards/pm9g45/init.c b/arch/arm/boards/pm9g45/init.c index 9bb1f1f5a3..1a902ac913 100644 --- a/arch/arm/boards/pm9g45/init.c +++ b/arch/arm/boards/pm9g45/init.c @@ -25,13 +25,14 @@ #include <partition.h> #include <fs.h> #include <fcntl.h> +#include <gpio.h> #include <io.h> #include <asm/hardware.h> #include <nand.h> #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <mach/at91sam9_smc.h> #include <linux/w1-gpio.h> diff --git a/arch/arm/boards/qil-a926x/init.c b/arch/arm/boards/qil-a926x/init.c index 58ab386837..30aa64ae1e 100644 --- a/arch/arm/boards/qil-a926x/init.c +++ b/arch/arm/boards/qil-a926x/init.c @@ -25,6 +25,7 @@ #include <gpio.h> #include <led.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> diff --git a/arch/arm/boards/sama5d3xek/init.c b/arch/arm/boards/sama5d3xek/init.c index 6aae16759c..fa57f18678 100644 --- a/arch/arm/boards/sama5d3xek/init.c +++ b/arch/arm/boards/sama5d3xek/init.c @@ -33,6 +33,7 @@ #include <mach/at91sam9_smc.h> #include <gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> #include <mach/at91sam9x5_matrix.h> diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c index d91b21d97e..541dddfa9d 100644 --- a/arch/arm/boards/scb9328/scb9328.c +++ b/arch/arm/boards/scb9328/scb9328.c @@ -21,7 +21,6 @@ #include <generated/mach-types.h> #include <mach/imx1-regs.h> #include <asm/armlinux.h> -#include <mach/gpio.h> #include <mach/weim.h> #include <io.h> #include <partition.h> diff --git a/arch/arm/boards/telit-evk-pro3/init.c b/arch/arm/boards/telit-evk-pro3/init.c index b933f9fefc..38e3900690 100644 --- a/arch/arm/boards/telit-evk-pro3/init.c +++ b/arch/arm/boards/telit-evk-pro3/init.c @@ -22,6 +22,7 @@ #include <mach/at91sam9_smc.h> #include <mach/board.h> #include <mach/io.h> +#include <mach/iomux.h> #include <nand.h> #define BOOTSTRAP_SIZE 0xC0000 diff --git a/arch/arm/boards/tny-a926x/init.c b/arch/arm/boards/tny-a926x/init.c index cdfe046b27..6ad049daf6 100644 --- a/arch/arm/boards/tny-a926x/init.c +++ b/arch/arm/boards/tny-a926x/init.c @@ -34,6 +34,7 @@ #include <mach/at91sam9_sdramc.h> #include <gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> #include <spi/eeprom.h> diff --git a/arch/arm/boards/tqma53/board.c b/arch/arm/boards/tqma53/board.c index 19ad37efcf..5173ca4552 100644 --- a/arch/arm/boards/tqma53/board.c +++ b/arch/arm/boards/tqma53/board.c @@ -23,6 +23,7 @@ #include <net.h> #include <partition.h> #include <sizes.h> +#include <gpio.h> #include <mci.h> #include <io.h> @@ -34,7 +35,6 @@ #include <mach/iomux-mx53.h> #include <mach/devices-imx53.h> #include <mach/generic.h> -#include <mach/gpio.h> #include <mach/imx-nand.h> #include <mach/iim.h> #include <mach/imx5.h> diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c index 74d4867a9a..edeee4ed3b 100644 --- a/arch/arm/boards/usb-a926x/init.c +++ b/arch/arm/boards/usb-a926x/init.c @@ -35,6 +35,7 @@ #include <gpio.h> #include <led.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> #include <gpio_keys.h> diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 166a7a3e28..b3c1efe739 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -1,7 +1,10 @@ #ifndef _ARCH_ARM_GPIO_H #define _ARCH_ARM_GPIO_H -/* not all ARM platforms necessarily support this API ... */ +#ifndef CONFIG_GPIOLIB #include <mach/gpio.h> +#else +#include <asm-generic/gpio.h> +#endif #endif /* _ARCH_ARM_GPIO_H */ diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index ee07848d30..ce0e4160b1 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -11,11 +11,12 @@ * */ #include <common.h> +#include <gpio.h> #include <asm/armlinux.h> #include <mach/hardware.h> #include <mach/at91rm9200.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <mach/at91rm9200_mc.h> #include <i2c/i2c-gpio.h> diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index cff0d901ef..84a03296ea 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -11,13 +11,14 @@ */ #include <common.h> #include <sizes.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/hardware.h> #include <mach/board.h> #include <mach/at91_pmc.h> #include <mach/at91sam9260_matrix.h> #include <mach/at91sam9_sdramc.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <mach/cpu.h> #include <i2c/i2c-gpio.h> diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index e3e51bffd8..b522afb76a 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -11,13 +11,14 @@ */ #include <common.h> #include <sizes.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/hardware.h> #include <mach/at91_pmc.h> #include <mach/at91sam9261_matrix.h> #include <mach/at91sam9_sdramc.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <mach/cpu.h> #include <i2c/i2c-gpio.h> diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index a93220d16d..9d8bc32dc6 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -11,13 +11,14 @@ */ #include <common.h> #include <sizes.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/hardware.h> #include <mach/at91_pmc.h> #include <mach/at91sam9263_matrix.h> #include <mach/at91sam9_sdramc.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <i2c/i2c-gpio.h> diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 68ed84179b..3e0bc100bb 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -11,13 +11,14 @@ */ #include <common.h> #include <sizes.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/hardware.h> #include <mach/at91_pmc.h> #include <mach/at91sam9g45_matrix.h> #include <mach/at91sam9_ddrsdr.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <i2c/i2c-gpio.h> diff --git a/arch/arm/mach-at91/at91sam9n12_devices.c b/arch/arm/mach-at91/at91sam9n12_devices.c index aeac2aab77..3616801349 100644 --- a/arch/arm/mach-at91/at91sam9n12_devices.c +++ b/arch/arm/mach-at91/at91sam9n12_devices.c @@ -12,14 +12,15 @@ #include <common.h> #include <init.h> #include <sizes.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/hardware.h> #include <mach/board.h> #include <mach/at91_pmc.h> #include <mach/at91sam9n12_matrix.h> #include <mach/at91sam9_ddrsdr.h> -#include <mach/gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/cpu.h> #include <i2c/i2c-gpio.h> diff --git a/arch/arm/mach-at91/at91sam9x5_devices.c b/arch/arm/mach-at91/at91sam9x5_devices.c index d12ee57c05..f80c1af021 100644 --- a/arch/arm/mach-at91/at91sam9x5_devices.c +++ b/arch/arm/mach-at91/at91sam9x5_devices.c @@ -11,14 +11,15 @@ */ #include <common.h> #include <sizes.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/hardware.h> #include <mach/board.h> #include <mach/at91_pmc.h> #include <mach/at91sam9x5_matrix.h> #include <mach/at91sam9_ddrsdr.h> -#include <mach/gpio.h> #include <mach/io.h> +#include <mach/iomux.h> #include <mach/cpu.h> #include <i2c/i2c-gpio.h> diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c index 0e39a526d2..b111373823 100644 --- a/arch/arm/mach-at91/gpio.c +++ b/arch/arm/mach-at91/gpio.c @@ -24,7 +24,7 @@ #include <linux/err.h> #include <errno.h> #include <io.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <mach/cpu.h> #include <gpio.h> diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index eb64bd4ce2..306ab4c9f2 100644 --- a/arch/arm/mach-at91/include/mach/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h @@ -1,269 +1 @@ -/* - * [origin: Linux kernel include/asm-arm/arch-at91/gpio.h] - * - * Copyright (C) 2005 HP Labs - * - * 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. - * - */ - -#ifndef __ASM_ARCH_AT91_GPIO_H -#define __ASM_ARCH_AT91_GPIO_H - -#include <io.h> -#include <asm-generic/errno.h> -#include <mach/at91_pio.h> -#include <mach/hardware.h> #include <asm-generic/gpio.h> - -#define ARCH_NR_GPIOS 256 - -#define AT91_PIN_PA0 (0x00 + 0) -#define AT91_PIN_PA1 (0x00 + 1) -#define AT91_PIN_PA2 (0x00 + 2) -#define AT91_PIN_PA3 (0x00 + 3) -#define AT91_PIN_PA4 (0x00 + 4) -#define AT91_PIN_PA5 (0x00 + 5) -#define AT91_PIN_PA6 (0x00 + 6) -#define AT91_PIN_PA7 (0x00 + 7) -#define AT91_PIN_PA8 (0x00 + 8) -#define AT91_PIN_PA9 (0x00 + 9) -#define AT91_PIN_PA10 (0x00 + 10) -#define AT91_PIN_PA11 (0x00 + 11) -#define AT91_PIN_PA12 (0x00 + 12) -#define AT91_PIN_PA13 (0x00 + 13) -#define AT91_PIN_PA14 (0x00 + 14) -#define AT91_PIN_PA15 (0x00 + 15) -#define AT91_PIN_PA16 (0x00 + 16) -#define AT91_PIN_PA17 (0x00 + 17) -#define AT91_PIN_PA18 (0x00 + 18) -#define AT91_PIN_PA19 (0x00 + 19) -#define AT91_PIN_PA20 (0x00 + 20) -#define AT91_PIN_PA21 (0x00 + 21) -#define AT91_PIN_PA22 (0x00 + 22) -#define AT91_PIN_PA23 (0x00 + 23) -#define AT91_PIN_PA24 (0x00 + 24) -#define AT91_PIN_PA25 (0x00 + 25) -#define AT91_PIN_PA26 (0x00 + 26) -#define AT91_PIN_PA27 (0x00 + 27) -#define AT91_PIN_PA28 (0x00 + 28) -#define AT91_PIN_PA29 (0x00 + 29) -#define AT91_PIN_PA30 (0x00 + 30) -#define AT91_PIN_PA31 (0x00 + 31) - -#define AT91_PIN_PB0 (0x20 + 0) -#define AT91_PIN_PB1 (0x20 + 1) -#define AT91_PIN_PB2 (0x20 + 2) -#define AT91_PIN_PB3 (0x20 + 3) -#define AT91_PIN_PB4 (0x20 + 4) -#define AT91_PIN_PB5 (0x20 + 5) -#define AT91_PIN_PB6 (0x20 + 6) -#define AT91_PIN_PB7 (0x20 + 7) -#define AT91_PIN_PB8 (0x20 + 8) -#define AT91_PIN_PB9 (0x20 + 9) -#define AT91_PIN_PB10 (0x20 + 10) -#define AT91_PIN_PB11 (0x20 + 11) -#define AT91_PIN_PB12 (0x20 + 12) -#define AT91_PIN_PB13 (0x20 + 13) -#define AT91_PIN_PB14 (0x20 + 14) -#define AT91_PIN_PB15 (0x20 + 15) -#define AT91_PIN_PB16 (0x20 + 16) -#define AT91_PIN_PB17 (0x20 + 17) -#define AT91_PIN_PB18 (0x20 + 18) -#define AT91_PIN_PB19 (0x20 + 19) -#define AT91_PIN_PB20 (0x20 + 20) -#define AT91_PIN_PB21 (0x20 + 21) -#define AT91_PIN_PB22 (0x20 + 22) -#define AT91_PIN_PB23 (0x20 + 23) -#define AT91_PIN_PB24 (0x20 + 24) -#define AT91_PIN_PB25 (0x20 + 25) -#define AT91_PIN_PB26 (0x20 + 26) -#define AT91_PIN_PB27 (0x20 + 27) -#define AT91_PIN_PB28 (0x20 + 28) -#define AT91_PIN_PB29 (0x20 + 29) -#define AT91_PIN_PB30 (0x20 + 30) -#define AT91_PIN_PB31 (0x20 + 31) - -#define AT91_PIN_PC0 (0x40 + 0) -#define AT91_PIN_PC1 (0x40 + 1) -#define AT91_PIN_PC2 (0x40 + 2) -#define AT91_PIN_PC3 (0x40 + 3) -#define AT91_PIN_PC4 (0x40 + 4) -#define AT91_PIN_PC5 (0x40 + 5) -#define AT91_PIN_PC6 (0x40 + 6) -#define AT91_PIN_PC7 (0x40 + 7) -#define AT91_PIN_PC8 (0x40 + 8) -#define AT91_PIN_PC9 (0x40 + 9) -#define AT91_PIN_PC10 (0x40 + 10) -#define AT91_PIN_PC11 (0x40 + 11) -#define AT91_PIN_PC12 (0x40 + 12) -#define AT91_PIN_PC13 (0x40 + 13) -#define AT91_PIN_PC14 (0x40 + 14) -#define AT91_PIN_PC15 (0x40 + 15) -#define AT91_PIN_PC16 (0x40 + 16) -#define AT91_PIN_PC17 (0x40 + 17) -#define AT91_PIN_PC18 (0x40 + 18) -#define AT91_PIN_PC19 (0x40 + 19) -#define AT91_PIN_PC20 (0x40 + 20) -#define AT91_PIN_PC21 (0x40 + 21) -#define AT91_PIN_PC22 (0x40 + 22) -#define AT91_PIN_PC23 (0x40 + 23) -#define AT91_PIN_PC24 (0x40 + 24) -#define AT91_PIN_PC25 (0x40 + 25) -#define AT91_PIN_PC26 (0x40 + 26) -#define AT91_PIN_PC27 (0x40 + 27) -#define AT91_PIN_PC28 (0x40 + 28) -#define AT91_PIN_PC29 (0x40 + 29) -#define AT91_PIN_PC30 (0x40 + 30) -#define AT91_PIN_PC31 (0x40 + 31) - -#define AT91_PIN_PD0 (0x60 + 0) -#define AT91_PIN_PD1 (0x60 + 1) -#define AT91_PIN_PD2 (0x60 + 2) -#define AT91_PIN_PD3 (0x60 + 3) -#define AT91_PIN_PD4 (0x60 + 4) -#define AT91_PIN_PD5 (0x60 + 5) -#define AT91_PIN_PD6 (0x60 + 6) -#define AT91_PIN_PD7 (0x60 + 7) -#define AT91_PIN_PD8 (0x60 + 8) -#define AT91_PIN_PD9 (0x60 + 9) -#define AT91_PIN_PD10 (0x60 + 10) -#define AT91_PIN_PD11 (0x60 + 11) -#define AT91_PIN_PD12 (0x60 + 12) -#define AT91_PIN_PD13 (0x60 + 13) -#define AT91_PIN_PD14 (0x60 + 14) -#define AT91_PIN_PD15 (0x60 + 15) -#define AT91_PIN_PD16 (0x60 + 16) -#define AT91_PIN_PD17 (0x60 + 17) -#define AT91_PIN_PD18 (0x60 + 18) -#define AT91_PIN_PD19 (0x60 + 19) -#define AT91_PIN_PD20 (0x60 + 20) -#define AT91_PIN_PD21 (0x60 + 21) -#define AT91_PIN_PD22 (0x60 + 22) -#define AT91_PIN_PD23 (0x60 + 23) -#define AT91_PIN_PD24 (0x60 + 24) -#define AT91_PIN_PD25 (0x60 + 25) -#define AT91_PIN_PD26 (0x60 + 26) -#define AT91_PIN_PD27 (0x60 + 27) -#define AT91_PIN_PD28 (0x60 + 28) -#define AT91_PIN_PD29 (0x60 + 29) -#define AT91_PIN_PD30 (0x60 + 30) -#define AT91_PIN_PD31 (0x60 + 31) - -#define AT91_PIN_PE0 (0x80 + 0) -#define AT91_PIN_PE1 (0x80 + 1) -#define AT91_PIN_PE2 (0x80 + 2) -#define AT91_PIN_PE3 (0x80 + 3) -#define AT91_PIN_PE4 (0x80 + 4) -#define AT91_PIN_PE5 (0x80 + 5) -#define AT91_PIN_PE6 (0x80 + 6) -#define AT91_PIN_PE7 (0x80 + 7) -#define AT91_PIN_PE8 (0x80 + 8) -#define AT91_PIN_PE9 (0x80 + 9) -#define AT91_PIN_PE10 (0x80 + 10) -#define AT91_PIN_PE11 (0x80 + 11) -#define AT91_PIN_PE12 (0x80 + 12) -#define AT91_PIN_PE13 (0x80 + 13) -#define AT91_PIN_PE14 (0x80 + 14) -#define AT91_PIN_PE15 (0x80 + 15) -#define AT91_PIN_PE16 (0x80 + 16) -#define AT91_PIN_PE17 (0x80 + 17) -#define AT91_PIN_PE18 (0x80 + 18) -#define AT91_PIN_PE19 (0x80 + 19) -#define AT91_PIN_PE20 (0x80 + 20) -#define AT91_PIN_PE21 (0x80 + 21) -#define AT91_PIN_PE22 (0x80 + 22) -#define AT91_PIN_PE23 (0x80 + 23) -#define AT91_PIN_PE24 (0x80 + 24) -#define AT91_PIN_PE25 (0x80 + 25) -#define AT91_PIN_PE26 (0x80 + 26) -#define AT91_PIN_PE27 (0x80 + 27) -#define AT91_PIN_PE28 (0x80 + 28) -#define AT91_PIN_PE29 (0x80 + 29) -#define AT91_PIN_PE30 (0x80 + 30) -#define AT91_PIN_PE31 (0x80 + 31) - -enum at91_mux { - AT91_MUX_GPIO = 0, - AT91_MUX_PERIPH_A = 1, - AT91_MUX_PERIPH_B = 2, - AT91_MUX_PERIPH_C = 3, - AT91_MUX_PERIPH_D = 4, -}; - -/* - * mux the pin - */ -int at91_mux_pin(unsigned pin, enum at91_mux mux, int use_pullup); - -/* - * mux the pin to the "GPIO" peripheral role. - */ -static inline int at91_set_GPIO_periph(unsigned pin, int use_pullup) -{ - return at91_mux_pin(pin, AT91_MUX_GPIO, use_pullup); -} - -/* - * mux the pin to the "A" internal peripheral role. - */ -static inline int at91_set_A_periph(unsigned pin, int use_pullup) -{ - return at91_mux_pin(pin, AT91_MUX_PERIPH_A, use_pullup); -} - -/* - * mux the pin to the "B" internal peripheral role. - */ -static inline int at91_set_B_periph(unsigned pin, int use_pullup) -{ - return at91_mux_pin(pin, AT91_MUX_PERIPH_B, use_pullup); -} - -/* - * mux the pin to the "C" internal peripheral role. - */ -static inline int at91_set_C_periph(unsigned pin, int use_pullup) -{ - return at91_mux_pin(pin, AT91_MUX_PERIPH_C, use_pullup); -} - -/* - * mux the pin to the "C" internal peripheral role. - */ -static inline int at91_set_D_periph(unsigned pin, int use_pullup) -{ - return at91_mux_pin(pin, AT91_MUX_PERIPH_D, use_pullup); -} - -/* - * mux the pin to the gpio controller (instead of "A" or "B" peripheral), and - * configure it for an input. - */ -int at91_set_gpio_input(unsigned pin, int use_pullup); - -/* - * mux the pin to the gpio controller (instead of "A" or "B" peripheral), - * and configure it for an output. - */ -int at91_set_gpio_output(unsigned pin, int value); - -/* - * enable/disable the glitch filter; mostly used with IRQ handling. - */ -int at91_set_deglitch(unsigned pin, int is_on); - -/* - * enable/disable the multi-driver; This is only valid for output and - * allows the output pin to run as an open collector output. - */ -int at91_set_multi_drive(unsigned pin, int is_on); - -extern int at91_set_debounce(unsigned pin, int is_on, int div); -extern int at91_set_pulldown(unsigned pin, int is_on); -extern int at91_disable_schmitt_trig(unsigned pin); - -#endif /* __ASM_ARCH_AT91SAM9_GPIO_H */ diff --git a/arch/arm/mach-at91/include/mach/io.h b/arch/arm/mach-at91/include/mach/io.h index bffa8f2dcc..a1d970f2a2 100644 --- a/arch/arm/mach-at91/include/mach/io.h +++ b/arch/arm/mach-at91/include/mach/io.h @@ -19,6 +19,7 @@ #define __ASM_ARCH_IO_H #include <io.h> +#include <mach/hardware.h> static inline unsigned int at91_sys_read(unsigned int reg_offset) { diff --git a/arch/arm/mach-at91/include/mach/iomux.h b/arch/arm/mach-at91/include/mach/iomux.h new file mode 100644 index 0000000000..bac7ef65a2 --- /dev/null +++ b/arch/arm/mach-at91/include/mach/iomux.h @@ -0,0 +1,266 @@ +/* + * [origin: Linux kernel include/asm-arm/arch-at91/gpio.h] + * + * Copyright (C) 2005 HP Labs + * + * 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. + * + */ + +#ifndef __ASM_ARCH_AT91_GPIO_H +#define __ASM_ARCH_AT91_GPIO_H + +#include <io.h> +#include <asm-generic/errno.h> +#include <mach/at91_pio.h> +#include <mach/hardware.h> + +#define AT91_PIN_PA0 (0x00 + 0) +#define AT91_PIN_PA1 (0x00 + 1) +#define AT91_PIN_PA2 (0x00 + 2) +#define AT91_PIN_PA3 (0x00 + 3) +#define AT91_PIN_PA4 (0x00 + 4) +#define AT91_PIN_PA5 (0x00 + 5) +#define AT91_PIN_PA6 (0x00 + 6) +#define AT91_PIN_PA7 (0x00 + 7) +#define AT91_PIN_PA8 (0x00 + 8) +#define AT91_PIN_PA9 (0x00 + 9) +#define AT91_PIN_PA10 (0x00 + 10) +#define AT91_PIN_PA11 (0x00 + 11) +#define AT91_PIN_PA12 (0x00 + 12) +#define AT91_PIN_PA13 (0x00 + 13) +#define AT91_PIN_PA14 (0x00 + 14) +#define AT91_PIN_PA15 (0x00 + 15) +#define AT91_PIN_PA16 (0x00 + 16) +#define AT91_PIN_PA17 (0x00 + 17) +#define AT91_PIN_PA18 (0x00 + 18) +#define AT91_PIN_PA19 (0x00 + 19) +#define AT91_PIN_PA20 (0x00 + 20) +#define AT91_PIN_PA21 (0x00 + 21) +#define AT91_PIN_PA22 (0x00 + 22) +#define AT91_PIN_PA23 (0x00 + 23) +#define AT91_PIN_PA24 (0x00 + 24) +#define AT91_PIN_PA25 (0x00 + 25) +#define AT91_PIN_PA26 (0x00 + 26) +#define AT91_PIN_PA27 (0x00 + 27) +#define AT91_PIN_PA28 (0x00 + 28) +#define AT91_PIN_PA29 (0x00 + 29) +#define AT91_PIN_PA30 (0x00 + 30) +#define AT91_PIN_PA31 (0x00 + 31) + +#define AT91_PIN_PB0 (0x20 + 0) +#define AT91_PIN_PB1 (0x20 + 1) +#define AT91_PIN_PB2 (0x20 + 2) +#define AT91_PIN_PB3 (0x20 + 3) +#define AT91_PIN_PB4 (0x20 + 4) +#define AT91_PIN_PB5 (0x20 + 5) +#define AT91_PIN_PB6 (0x20 + 6) +#define AT91_PIN_PB7 (0x20 + 7) +#define AT91_PIN_PB8 (0x20 + 8) +#define AT91_PIN_PB9 (0x20 + 9) +#define AT91_PIN_PB10 (0x20 + 10) +#define AT91_PIN_PB11 (0x20 + 11) +#define AT91_PIN_PB12 (0x20 + 12) +#define AT91_PIN_PB13 (0x20 + 13) +#define AT91_PIN_PB14 (0x20 + 14) +#define AT91_PIN_PB15 (0x20 + 15) +#define AT91_PIN_PB16 (0x20 + 16) +#define AT91_PIN_PB17 (0x20 + 17) +#define AT91_PIN_PB18 (0x20 + 18) +#define AT91_PIN_PB19 (0x20 + 19) +#define AT91_PIN_PB20 (0x20 + 20) +#define AT91_PIN_PB21 (0x20 + 21) +#define AT91_PIN_PB22 (0x20 + 22) +#define AT91_PIN_PB23 (0x20 + 23) +#define AT91_PIN_PB24 (0x20 + 24) +#define AT91_PIN_PB25 (0x20 + 25) +#define AT91_PIN_PB26 (0x20 + 26) +#define AT91_PIN_PB27 (0x20 + 27) +#define AT91_PIN_PB28 (0x20 + 28) +#define AT91_PIN_PB29 (0x20 + 29) +#define AT91_PIN_PB30 (0x20 + 30) +#define AT91_PIN_PB31 (0x20 + 31) + +#define AT91_PIN_PC0 (0x40 + 0) +#define AT91_PIN_PC1 (0x40 + 1) +#define AT91_PIN_PC2 (0x40 + 2) +#define AT91_PIN_PC3 (0x40 + 3) +#define AT91_PIN_PC4 (0x40 + 4) +#define AT91_PIN_PC5 (0x40 + 5) +#define AT91_PIN_PC6 (0x40 + 6) +#define AT91_PIN_PC7 (0x40 + 7) +#define AT91_PIN_PC8 (0x40 + 8) +#define AT91_PIN_PC9 (0x40 + 9) +#define AT91_PIN_PC10 (0x40 + 10) +#define AT91_PIN_PC11 (0x40 + 11) +#define AT91_PIN_PC12 (0x40 + 12) +#define AT91_PIN_PC13 (0x40 + 13) +#define AT91_PIN_PC14 (0x40 + 14) +#define AT91_PIN_PC15 (0x40 + 15) +#define AT91_PIN_PC16 (0x40 + 16) +#define AT91_PIN_PC17 (0x40 + 17) +#define AT91_PIN_PC18 (0x40 + 18) +#define AT91_PIN_PC19 (0x40 + 19) +#define AT91_PIN_PC20 (0x40 + 20) +#define AT91_PIN_PC21 (0x40 + 21) +#define AT91_PIN_PC22 (0x40 + 22) +#define AT91_PIN_PC23 (0x40 + 23) +#define AT91_PIN_PC24 (0x40 + 24) +#define AT91_PIN_PC25 (0x40 + 25) +#define AT91_PIN_PC26 (0x40 + 26) +#define AT91_PIN_PC27 (0x40 + 27) +#define AT91_PIN_PC28 (0x40 + 28) +#define AT91_PIN_PC29 (0x40 + 29) +#define AT91_PIN_PC30 (0x40 + 30) +#define AT91_PIN_PC31 (0x40 + 31) + +#define AT91_PIN_PD0 (0x60 + 0) +#define AT91_PIN_PD1 (0x60 + 1) +#define AT91_PIN_PD2 (0x60 + 2) +#define AT91_PIN_PD3 (0x60 + 3) +#define AT91_PIN_PD4 (0x60 + 4) +#define AT91_PIN_PD5 (0x60 + 5) +#define AT91_PIN_PD6 (0x60 + 6) +#define AT91_PIN_PD7 (0x60 + 7) +#define AT91_PIN_PD8 (0x60 + 8) +#define AT91_PIN_PD9 (0x60 + 9) +#define AT91_PIN_PD10 (0x60 + 10) +#define AT91_PIN_PD11 (0x60 + 11) +#define AT91_PIN_PD12 (0x60 + 12) +#define AT91_PIN_PD13 (0x60 + 13) +#define AT91_PIN_PD14 (0x60 + 14) +#define AT91_PIN_PD15 (0x60 + 15) +#define AT91_PIN_PD16 (0x60 + 16) +#define AT91_PIN_PD17 (0x60 + 17) +#define AT91_PIN_PD18 (0x60 + 18) +#define AT91_PIN_PD19 (0x60 + 19) +#define AT91_PIN_PD20 (0x60 + 20) +#define AT91_PIN_PD21 (0x60 + 21) +#define AT91_PIN_PD22 (0x60 + 22) +#define AT91_PIN_PD23 (0x60 + 23) +#define AT91_PIN_PD24 (0x60 + 24) +#define AT91_PIN_PD25 (0x60 + 25) +#define AT91_PIN_PD26 (0x60 + 26) +#define AT91_PIN_PD27 (0x60 + 27) +#define AT91_PIN_PD28 (0x60 + 28) +#define AT91_PIN_PD29 (0x60 + 29) +#define AT91_PIN_PD30 (0x60 + 30) +#define AT91_PIN_PD31 (0x60 + 31) + +#define AT91_PIN_PE0 (0x80 + 0) +#define AT91_PIN_PE1 (0x80 + 1) +#define AT91_PIN_PE2 (0x80 + 2) +#define AT91_PIN_PE3 (0x80 + 3) +#define AT91_PIN_PE4 (0x80 + 4) +#define AT91_PIN_PE5 (0x80 + 5) +#define AT91_PIN_PE6 (0x80 + 6) +#define AT91_PIN_PE7 (0x80 + 7) +#define AT91_PIN_PE8 (0x80 + 8) +#define AT91_PIN_PE9 (0x80 + 9) +#define AT91_PIN_PE10 (0x80 + 10) +#define AT91_PIN_PE11 (0x80 + 11) +#define AT91_PIN_PE12 (0x80 + 12) +#define AT91_PIN_PE13 (0x80 + 13) +#define AT91_PIN_PE14 (0x80 + 14) +#define AT91_PIN_PE15 (0x80 + 15) +#define AT91_PIN_PE16 (0x80 + 16) +#define AT91_PIN_PE17 (0x80 + 17) +#define AT91_PIN_PE18 (0x80 + 18) +#define AT91_PIN_PE19 (0x80 + 19) +#define AT91_PIN_PE20 (0x80 + 20) +#define AT91_PIN_PE21 (0x80 + 21) +#define AT91_PIN_PE22 (0x80 + 22) +#define AT91_PIN_PE23 (0x80 + 23) +#define AT91_PIN_PE24 (0x80 + 24) +#define AT91_PIN_PE25 (0x80 + 25) +#define AT91_PIN_PE26 (0x80 + 26) +#define AT91_PIN_PE27 (0x80 + 27) +#define AT91_PIN_PE28 (0x80 + 28) +#define AT91_PIN_PE29 (0x80 + 29) +#define AT91_PIN_PE30 (0x80 + 30) +#define AT91_PIN_PE31 (0x80 + 31) + +enum at91_mux { + AT91_MUX_GPIO = 0, + AT91_MUX_PERIPH_A = 1, + AT91_MUX_PERIPH_B = 2, + AT91_MUX_PERIPH_C = 3, + AT91_MUX_PERIPH_D = 4, +}; + +/* + * mux the pin + */ +int at91_mux_pin(unsigned pin, enum at91_mux mux, int use_pullup); + +/* + * mux the pin to the "GPIO" peripheral role. + */ +static inline int at91_set_GPIO_periph(unsigned pin, int use_pullup) +{ + return at91_mux_pin(pin, AT91_MUX_GPIO, use_pullup); +} + +/* + * mux the pin to the "A" internal peripheral role. + */ +static inline int at91_set_A_periph(unsigned pin, int use_pullup) +{ + return at91_mux_pin(pin, AT91_MUX_PERIPH_A, use_pullup); +} + +/* + * mux the pin to the "B" internal peripheral role. + */ +static inline int at91_set_B_periph(unsigned pin, int use_pullup) +{ + return at91_mux_pin(pin, AT91_MUX_PERIPH_B, use_pullup); +} + +/* + * mux the pin to the "C" internal peripheral role. + */ +static inline int at91_set_C_periph(unsigned pin, int use_pullup) +{ + return at91_mux_pin(pin, AT91_MUX_PERIPH_C, use_pullup); +} + +/* + * mux the pin to the "C" internal peripheral role. + */ +static inline int at91_set_D_periph(unsigned pin, int use_pullup) +{ + return at91_mux_pin(pin, AT91_MUX_PERIPH_D, use_pullup); +} + +/* + * mux the pin to the gpio controller (instead of "A" or "B" peripheral), and + * configure it for an input. + */ +int at91_set_gpio_input(unsigned pin, int use_pullup); + +/* + * mux the pin to the gpio controller (instead of "A" or "B" peripheral), + * and configure it for an output. + */ +int at91_set_gpio_output(unsigned pin, int value); + +/* + * enable/disable the glitch filter; mostly used with IRQ handling. + */ +int at91_set_deglitch(unsigned pin, int is_on); + +/* + * enable/disable the multi-driver; This is only valid for output and + * allows the output pin to run as an open collector output. + */ +int at91_set_multi_drive(unsigned pin, int is_on); + +extern int at91_set_debounce(unsigned pin, int is_on, int div); +extern int at91_set_pulldown(unsigned pin, int is_on); +extern int at91_disable_schmitt_trig(unsigned pin); + +#endif /* __ASM_ARCH_AT91SAM9_GPIO_H */ diff --git a/arch/arm/mach-at91/sama5d3_devices.c b/arch/arm/mach-at91/sama5d3_devices.c index 031168b877..9cbc8c1804 100644 --- a/arch/arm/mach-at91/sama5d3_devices.c +++ b/arch/arm/mach-at91/sama5d3_devices.c @@ -12,13 +12,14 @@ #include <common.h> #include <init.h> #include <sizes.h> +#include <gpio.h> #include <asm/armlinux.h> #include <asm/hardware.h> #include <mach/board.h> #include <mach/at91_pmc.h> #include <mach/at91sam9x5_matrix.h> #include <mach/at91sam9_ddrsdr.h> -#include <mach/gpio.h> +#include <mach/iomux.h> #include <mach/io.h> #include <mach/cpu.h> #include <i2c/i2c-gpio.h> diff --git a/arch/arm/mach-bcm2835/include/mach/gpio.h b/arch/arm/mach-bcm2835/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f2..0000000000 --- a/arch/arm/mach-bcm2835/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/gpio.h> diff --git a/arch/arm/mach-clps711x/include/mach/gpio.h b/arch/arm/mach-clps711x/include/mach/gpio.h deleted file mode 100644 index 3428fe54bb..0000000000 --- a/arch/arm/mach-clps711x/include/mach/gpio.h +++ /dev/null @@ -1,3 +0,0 @@ -#include <asm-generic/gpio.h> - -#define CLPS711X_GPIO(prt,bit) ((prt) * 8 + (bit)) diff --git a/arch/arm/mach-highbank/include/mach/gpio.h b/arch/arm/mach-highbank/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f2..0000000000 --- a/arch/arm/mach-highbank/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/gpio.h> diff --git a/arch/arm/mach-imx/include/mach/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h deleted file mode 100644 index 489ae2cf09..0000000000 --- a/arch/arm/mach-imx/include/mach/gpio.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __ASM_ARCH_GPIO_H -#define __ASM_ARCH_GPIO_H - -#include <asm-generic/gpio.h> - -void imx_gpio_mode(int gpio_mode); - -#endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/mach-imx/include/mach/iomux-v1.h b/arch/arm/mach-imx/include/mach/iomux-v1.h index 49dcecd1de..e822905b77 100644 --- a/arch/arm/mach-imx/include/mach/iomux-v1.h +++ b/arch/arm/mach-imx/include/mach/iomux-v1.h @@ -46,5 +46,6 @@ #define GPIO_GIUS (1 << 16) void imx_iomuxv1_init(void __iomem *base); +void imx_gpio_mode(int gpio_mode); #endif /* __MACH_IOMUX_V1_H__ */ diff --git a/arch/arm/mach-mvebu/include/mach/gpio.h b/arch/arm/mach-mvebu/include/mach/gpio.h deleted file mode 100644 index fee693e557..0000000000 --- a/arch/arm/mach-mvebu/include/mach/gpio.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_ARCH_GPIO_H -#define __ASM_ARCH_GPIO_H - -#include <asm-generic/gpio.h> - -#endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h index 4e7c8fe87e..8643c98d5a 100644 --- a/arch/arm/mach-mxs/include/mach/gpio.h +++ b/arch/arm/mach-mxs/include/mach/gpio.h @@ -16,17 +16,6 @@ #ifndef __ASM_MACH_GPIO_H #define __ASM_MACH_GPIO_H -#include <types.h> - -#if defined CONFIG_ARCH_IMX23 -# include <mach/iomux-imx23.h> -#endif -#if defined CONFIG_ARCH_IMX28 -# include <mach/iomux-imx28.h> -#endif - #include <asm-generic/gpio.h> -void imx_gpio_mode(uint32_t); - #endif /* __ASM_MACH_GPIO_H */ diff --git a/arch/arm/mach-mxs/include/mach/iomux-imx23.h b/arch/arm/mach-mxs/include/mach/iomux-imx23.h index ebe0ac4099..39d69810ef 100644 --- a/arch/arm/mach-mxs/include/mach/iomux-imx23.h +++ b/arch/arm/mach-mxs/include/mach/iomux-imx23.h @@ -27,8 +27,8 @@ * ^_____________________ initial output value if enabled as GPIO and configured as output * ^______________________ Bit keeper present */ -#ifndef __ASM_MACH_IOMUX_H -#define __ASM_MACH_IOMUX_H +#ifndef __ASM_MACH_IOMUX_MX23_H +#define __ASM_MACH_IOMUX_MX23_H /* control pad's function */ #define FBIT_SHIFT (3) @@ -422,4 +422,4 @@ #define EMI_DQM0 (FUNC(0) | PORTF(7, 0) | SE | VE | PE) #define EMI_DQM0_DISABLED (FUNC(3) | PORTF(7, 0) | SE | VE | PE) -#endif /* __ASM_MACH_IOMUX_H */ +#endif /* __ASM_MACH_IOMUX_MX23_H */ diff --git a/arch/arm/mach-mxs/include/mach/iomux.h b/arch/arm/mach-mxs/include/mach/iomux.h new file mode 100644 index 0000000000..84496c6b84 --- /dev/null +++ b/arch/arm/mach-mxs/include/mach/iomux.h @@ -0,0 +1,30 @@ +/* + * (C) Copyright 2010 Juergen Beisert - Pengutronix + * + * 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 + +#include <types.h> + +#if defined CONFIG_ARCH_IMX23 +# include <mach/iomux-imx23.h> +#endif +#if defined CONFIG_ARCH_IMX28 +# include <mach/iomux-imx28.h> +#endif + +void imx_gpio_mode(uint32_t); + +#endif /* __ASM_MACH_IOMUX_H */ diff --git a/arch/arm/mach-mxs/iomux-imx.c b/arch/arm/mach-mxs/iomux-imx.c index 3d26302d4c..b8b69b31ee 100644 --- a/arch/arm/mach-mxs/iomux-imx.c +++ b/arch/arm/mach-mxs/iomux-imx.c @@ -18,6 +18,7 @@ #include <gpio.h> #include <errno.h> #include <io.h> +#include <mach/iomux.h> #include <stmp-device.h> #include <mach/imx-regs.h> diff --git a/arch/arm/mach-omap/include/mach/gpio.h b/arch/arm/mach-omap/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f2..0000000000 --- a/arch/arm/mach-omap/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/gpio.h> diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c index 54cefa2ffd..64b0024cce 100644 --- a/arch/arm/mach-omap/omap4_generic.c +++ b/arch/arm/mach-omap/omap4_generic.c @@ -8,7 +8,6 @@ #include <mach/syslib.h> #include <mach/generic.h> #include <mach/gpmc.h> -#include <mach/gpio.h> #include <mach/omap4_rom_usb.h> /* diff --git a/arch/arm/mach-samsung/gpio-s3c24x0.c b/arch/arm/mach-samsung/gpio-s3c24x0.c index 36b2db4a90..f62588f0e7 100644 --- a/arch/arm/mach-samsung/gpio-s3c24x0.c +++ b/arch/arm/mach-samsung/gpio-s3c24x0.c @@ -17,6 +17,7 @@ #include <mach/s3c-iomap.h> #include <mach/gpio.h> #include <mach/s3c24xx-gpio.h> +#include <mach/iomux.h> static const unsigned char group_offset[] = { diff --git a/arch/arm/mach-samsung/gpio-s3c64xx.c b/arch/arm/mach-samsung/gpio-s3c64xx.c index ee6826134d..d70a8716c9 100644 --- a/arch/arm/mach-samsung/gpio-s3c64xx.c +++ b/arch/arm/mach-samsung/gpio-s3c64xx.c @@ -23,6 +23,7 @@ #include <errno.h> #include <io.h> #include <gpio.h> +#include <mach/iomux.h> #include <mach/s3c-iomap.h> #define S3C_GPACON (S3C_GPIO_BASE) diff --git a/arch/arm/mach-samsung/gpio-s5pcxx.c b/arch/arm/mach-samsung/gpio-s5pcxx.c index 604a63fd6b..1a422f1746 100644 --- a/arch/arm/mach-samsung/gpio-s5pcxx.c +++ b/arch/arm/mach-samsung/gpio-s5pcxx.c @@ -24,6 +24,7 @@ #include <errno.h> #include <io.h> #include <gpio.h> +#include <mach/iomux.h> #include <mach/s3c-iomap.h> #define S3C_GPACON (S3C_GPIO_BASE) diff --git a/arch/arm/mach-samsung/include/mach/gpio.h b/arch/arm/mach-samsung/include/mach/gpio.h index 9e64a841b6..39206676f8 100644 --- a/arch/arm/mach-samsung/include/mach/gpio.h +++ b/arch/arm/mach-samsung/include/mach/gpio.h @@ -13,18 +13,6 @@ #ifndef __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> -void s3c_gpio_mode(unsigned); - #endif /* __ASM_MACH_GPIO_H */ diff --git a/arch/arm/mach-samsung/include/mach/iomux.h b/arch/arm/mach-samsung/include/mach/iomux.h new file mode 100644 index 0000000000..48651d85c3 --- /dev/null +++ b/arch/arm/mach-samsung/include/mach/iomux.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 */ diff --git a/arch/arm/mach-tegra/include/mach/gpio.h b/arch/arm/mach-tegra/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f2..0000000000 --- a/arch/arm/mach-tegra/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/gpio.h> |