Clean up mach/gpio.h headers
Subsystems (44)
cover Clean up mach/gpio.h headers
This is a preliminary posting of my gpio patch set.
This patch series moves the trivial gpiolib implementations out of mach/gpio.h and into asm/gpio.h.
As a side effect of that, most of this patch series is about fixing up direct includes of mach/gpio.h - this is something I've been on at people over the last year or more about ensuring that they use linux/gpio.h in preference. While I've blindly converted all arch/arm to use linux/gpio.h (with the exception of mach/ includes which are converted to asm/gpio.h), drivers were only converted to asm/gpio.h. These should be reviewed and changed to linux/gpio.h.
As a result of this patch series, several mach/gpio.h end up being empty.
Many others just contain platform private GPIO APIs and definitions.
The last thing which mach/gpio.h is used for is to provide a definition for ARCH_GPIO_NR to asm-generic/gpio.h. I've not attempted to solve that issue yet.
A small number of platforms optimize the gpio accessors for on-SoC GPIOs. In the interests of consolidation, these will have to be killed but this patch set does not do that yet.
Lastly, several {mach,plat}/gpio.h needs to be looked at with a view to deleting the direct include of asm-generic/gpio.h.
PATCH 1/13 ARM: gpio: at91: remove redundant include of mach/gpio.h
asm/gpio.h already directly includes mach/gpio.h.
Signed-off-by Russell King <[email protected]>
--- arch/arm/mach-at91/gpio.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-at91/gpio.c +0 -1
@@ -22,7 +22,6 @@#include <mach/hardware.h> #include <mach/at91_pio.h> -#include <mach/gpio.h> #include <asm/gpio.h>
Signature · 1 line
1.7.4.4
PATCH 2/13 ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h
In reply to Russell King - ARM LinuxConvert arch/arm includes of mach/gpio.h and asm/gpio.h to linux/gpio.h before we start consolidating the individual platform implementations of the gpio header files.
Signed-off-by Russell King <[email protected]>
--- arch/arm/common/scoop.c | 2 +- arch/arm/mach-at91/at91cap9_devices.c | 2 +- arch/arm/mach-at91/at91rm9200_devices.c | 2 +- arch/arm/mach-at91/at91sam9260_devices.c | 2 +- arch/arm/mach-at91/at91sam9261_devices.c | 2 +- arch/arm/mach-at91/at91sam9263_devices.c | 2 +- arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- arch/arm/mach-at91/board-1arm.c | 2 +- arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- arch/arm/mach-at91/board-cam60.c | 2 +- arch/arm/mach-at91/board-cap9adk.c | 2 +- arch/arm/mach-at91/board-carmeva.c | 2 +- arch/arm/mach-at91/board-cpu9krea.c | 2 +- arch/arm/mach-at91/board-cpuat91.c | 2 +- arch/arm/mach-at91/board-csb337.c | 2 +- arch/arm/mach-at91/board-csb637.c | 2 +- arch/arm/mach-at91/board-eb9200.c | 2 +- arch/arm/mach-at91/board-ecbat91.c | 2 +- arch/arm/mach-at91/board-kafa.c | 2 +- arch/arm/mach-at91/board-kb9202.c | 2 +- arch/arm/mach-at91/board-neocore926.c | 2 +- arch/arm/mach-at91/board-picotux200.c | 2 +- arch/arm/mach-at91/board-qil-a9260.c | 2 +- arch/arm/mach-at91/board-rm9200dk.c | 2 +- arch/arm/mach-at91/board-rm9200ek.c | 2 +- arch/arm/mach-at91/board-sam9-l9260.c | 2 +- arch/arm/mach-at91/board-sam9260ek.c | 2 +- arch/arm/mach-at91/board-sam9261ek.c | 2 +- arch/arm/mach-at91/board-sam9263ek.c | 2 +- arch/arm/mach-at91/board-sam9g20ek.c | 2 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- arch/arm/mach-at91/board-sam9rlek.c | 2 +- arch/arm/mach-at91/board-usb-a9260.c | 2 +- arch/arm/mach-at91/board-usb-a9263.c | 2 +- arch/arm/mach-at91/board-yl-9200.c | 2 +- arch/arm/mach-at91/gpio.c | 3 +-- arch/arm/mach-at91/leds.c | 2 +- arch/arm/mach-at91/pm.c | 2 +- arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/gpio.c | 4 +--- arch/arm/mach-davinci/tnetv107x.c | 2 +- arch/arm/mach-imx/iomux-imx31.c | 3 +-- arch/arm/mach-imx/mach-mx27ads.c | 3 +-- arch/arm/mach-ixp2000/core.c | 4 +--- arch/arm/mach-ixp2000/ixdp2x00.c | 3 +-- arch/arm/mach-ixp4xx/dsmg600-setup.c | 3 +-- arch/arm/mach-ixp4xx/fsg-setup.c | 3 +-- arch/arm/mach-ixp4xx/nas100d-setup.c | 3 +-- arch/arm/mach-ixp4xx/nslu2-setup.c | 3 +-- arch/arm/mach-kirkwood/irq.c | 3 +-- arch/arm/mach-kirkwood/mpp.c | 3 +-- arch/arm/mach-ks8695/board-acs5k.c | 3 +-- arch/arm/mach-ks8695/board-dsm320.c | 3 +-- arch/arm/mach-ks8695/board-micrel.c | 3 +-- arch/arm/mach-ks8695/gpio.c | 3 +-- arch/arm/mach-ks8695/leds.c | 3 +-- arch/arm/mach-mmp/aspenite.c | 3 +-- arch/arm/mach-mmp/mmp2.c | 3 +-- arch/arm/mach-mmp/pxa168.c | 3 +-- arch/arm/mach-mmp/pxa910.c | 3 +-- arch/arm/mach-mmp/tavorevb.c | 3 +-- arch/arm/mach-msm/board-msm7x27.c | 3 +-- arch/arm/mach-msm/board-msm7x30.c | 3 +-- arch/arm/mach-msm/board-qsd8x50.c | 3 +-- arch/arm/mach-msm/board-sapphire.c | 3 +-- arch/arm/mach-msm/board-trout-mmc.c | 3 +-- arch/arm/mach-msm/board-trout-panel.c | 3 +-- arch/arm/mach-mv78xx0/irq.c | 3 +-- arch/arm/mach-mv78xx0/mpp.c | 3 +-- arch/arm/mach-omap1/board-ams-delta.c | 3 +-- arch/arm/mach-omap1/board-fsample.c | 3 +-- arch/arm/mach-omap1/board-generic.c | 3 +-- arch/arm/mach-omap1/board-h2-mmc.c | 3 +-- arch/arm/mach-omap1/board-h2.c | 3 +-- arch/arm/mach-omap1/board-h3-mmc.c | 3 +-- arch/arm/mach-omap1/board-h3.c | 3 +-- arch/arm/mach-omap1/board-htcherald.c | 1 - arch/arm/mach-omap1/board-innovator.c | 3 +-- arch/arm/mach-omap1/board-nokia770.c | 3 +-- arch/arm/mach-omap1/board-osk.c | 3 +-- arch/arm/mach-omap1/board-palmte.c | 3 +-- arch/arm/mach-omap1/board-palmtt.c | 2 +- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/mach-omap1/board-perseus2.c | 3 +-- arch/arm/mach-omap1/board-sx1-mmc.c | 2 +- arch/arm/mach-omap1/board-sx1.c | 3 +-- arch/arm/mach-omap1/board-voiceblue.c | 2 +- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/fpga.c | 2 +- arch/arm/mach-omap1/irq.c | 3 +-- arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +- arch/arm/mach-omap1/leds-osk.c | 3 +-- arch/arm/mach-omap1/leds.c | 2 +- arch/arm/mach-omap1/serial.c | 3 +-- arch/arm/mach-omap2/board-generic.c | 3 +-- arch/arm/mach-omap2/board-h4.c | 3 +-- arch/arm/mach-omap2/board-ldp.c | 3 +-- arch/arm/mach-omap2/devices.c | 3 +-- arch/arm/mach-orion5x/db88f5281-setup.c | 3 +-- arch/arm/mach-orion5x/dns323-setup.c | 3 +-- arch/arm/mach-orion5x/irq.c | 3 +-- arch/arm/mach-orion5x/kurobox_pro-setup.c | 3 +-- arch/arm/mach-orion5x/mv2120-setup.c | 3 +-- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 3 +-- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 3 +-- arch/arm/mach-orion5x/rd88f5182-setup.c | 3 +-- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 3 +-- arch/arm/mach-orion5x/terastation_pro2-setup.c | 3 +-- arch/arm/mach-orion5x/ts209-setup.c | 3 +-- arch/arm/mach-orion5x/ts409-setup.c | 3 +-- arch/arm/mach-orion5x/wnr854t-setup.c | 3 +-- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 3 +-- arch/arm/mach-pnx4008/gpio.c | 3 +-- arch/arm/mach-pnx4008/serial.c | 3 +-- arch/arm/mach-pxa/generic.c | 2 +- arch/arm/mach-pxa/include/mach/littleton.h | 2 +- arch/arm/mach-pxa/irq.c | 3 +-- arch/arm/mach-pxa/lpd270.c | 3 +-- arch/arm/mach-pxa/lubbock.c | 2 +- arch/arm/mach-pxa/mainstone.c | 3 +-- arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +-- arch/arm/mach-pxa/pcm990-baseboard.c | 3 +-- arch/arm/mach-pxa/pxa25x.c | 2 +- arch/arm/mach-pxa/pxa27x.c | 2 +- arch/arm/mach-pxa/pxa3xx.c | 3 +-- arch/arm/mach-pxa/pxa95x.c | 3 +-- arch/arm/mach-pxa/saarb.c | 3 +-- arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 2 +- arch/arm/mach-sa1100/generic.c | 2 +- arch/arm/mach-sa1100/gpio.c | 3 +-- arch/arm/mach-tegra/board-trimslice-pinmux.c | 3 +-- arch/arm/mach-ux500/board-mop500-u8500uib.c | 3 +-- arch/arm/plat-omap/debug-devices.c | 3 +-- arch/arm/plat-omap/debug-leds.c | 3 +-- arch/arm/plat-omap/devices.c | 3 +-- arch/arm/plat-pxa/gpio.c | 4 +--- 138 files changed, 137 insertions(+), 222 deletions(-)
arch/arm/common/scoop.c +1 -1
@@ -12,11 +12,11 @@*/ #include <linux/device.h> +#include <linux/gpio.h> #include <linux/string.h> #include <linux/slab.h> #include <linux/platform_device.h> #include <linux/io.h> -#include <asm/gpio.h> #include <asm/hardware/scoop.h> /* PCMCIA to Scoop linkage
arch/arm/mach-at91/at91cap9_devices.c +1 -1
@@ -16,6 +16,7 @@#include <asm/mach/irq.h> #include <linux/dma-mapping.h> +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c-gpio.h>
@@ -23,7 +24,6 @@#include <mach/board.h> #include <mach/cpu.h> -#include <mach/gpio.h> #include <mach/at91cap9.h> #include <mach/at91cap9_matrix.h> #include <mach/at91sam9_smc.h>
arch/arm/mach-at91/at91rm9200_devices.c +1 -1
@@ -14,11 +14,11 @@#include <asm/mach/map.h> #include <linux/dma-mapping.h> +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c-gpio.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91rm9200.h> #include <mach/at91rm9200_mc.h>
arch/arm/mach-at91/at91sam9260_devices.c +1 -1
@@ -13,11 +13,11 @@#include <asm/mach/map.h> #include <linux/dma-mapping.h> +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c-gpio.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/cpu.h> #include <mach/at91sam9260.h> #include <mach/at91sam9260_matrix.h>
arch/arm/mach-at91/at91sam9261_devices.c +1 -1
@@ -14,6 +14,7 @@#include <asm/mach/map.h> #include <linux/dma-mapping.h> +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c-gpio.h>
@@ -21,7 +22,6 @@#include <video/atmel_lcdc.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9261.h> #include <mach/at91sam9261_matrix.h> #include <mach/at91sam9_smc.h>
arch/arm/mach-at91/at91sam9263_devices.c +1 -1
@@ -13,6 +13,7 @@#include <asm/mach/map.h> #include <linux/dma-mapping.h> +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c-gpio.h>
@@ -20,7 +21,6 @@#include <video/atmel_lcdc.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9263.h> #include <mach/at91sam9263_matrix.h> #include <mach/at91sam9_smc.h>
arch/arm/mach-at91/at91sam9g45_devices.c +1 -1
@@ -13,6 +13,7 @@#include <asm/mach/map.h> #include <linux/dma-mapping.h> +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c-gpio.h> #include <linux/atmel-mci.h>
@@ -21,7 +22,6 @@#include <video/atmel_lcdc.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9g45.h> #include <mach/at91sam9g45_matrix.h> #include <mach/at91sam9_smc.h>
arch/arm/mach-at91/at91sam9rl_devices.c +1 -1
@@ -10,6 +10,7 @@#include <asm/mach/map.h> #include <linux/dma-mapping.h> +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c-gpio.h>
@@ -17,7 +18,6 @@#include <video/atmel_lcdc.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9rl.h> #include <mach/at91sam9rl_matrix.h> #include <mach/at91sam9_smc.h>
arch/arm/mach-at91/board-1arm.c +1 -1
@@ -19,6 +19,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -34,7 +35,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/cpu.h> #include "generic.h"
arch/arm/mach-at91/board-afeb-9260v1.c +1 -1
@@ -25,6 +25,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -43,7 +44,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include "generic.h"
arch/arm/mach-at91/board-cam60.c +1 -1
@@ -21,6 +21,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -38,7 +39,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include "sam9_smc.h"
arch/arm/mach-at91/board-cap9adk.c +1 -1
@@ -22,6 +22,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -41,7 +42,6 @@#include <asm/mach/map.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91cap9_matrix.h> #include <mach/at91sam9_smc.h> #include <mach/system_rev.h>
arch/arm/mach-at91/board-carmeva.c +1 -1
@@ -20,6 +20,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -35,7 +36,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include "generic.h"
arch/arm/mach-at91/board-cpu9krea.c +1 -1
@@ -21,6 +21,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -40,7 +41,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91sam9260_matrix.h>
arch/arm/mach-at91/board-cpuat91.c +1 -1
@@ -19,6 +19,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -36,7 +37,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91rm9200_mc.h> #include <mach/cpu.h>
arch/arm/mach-at91/board-csb337.c +1 -1
@@ -19,6 +19,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -38,7 +39,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include "generic.h"
arch/arm/mach-at91/board-csb637.c +1 -1
@@ -20,6 +20,7 @@#include <linux/types.h> #include <linux/init.h> +#include <linux/gpio.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/platform_device.h>
@@ -35,7 +36,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include "generic.h"
arch/arm/mach-at91/board-eb9200.c +1 -1
@@ -20,6 +20,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -35,7 +36,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include "generic.h"
arch/arm/mach-at91/board-ecbat91.c +1 -1
@@ -20,6 +20,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -37,7 +38,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/cpu.h> #include "generic.h"
arch/arm/mach-at91/board-kafa.c +1 -1
@@ -19,6 +19,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -34,7 +35,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/cpu.h> #include "generic.h"
arch/arm/mach-at91/board-kb9202.c +1 -1
@@ -20,6 +20,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -35,7 +36,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/cpu.h> #include <mach/at91rm9200_mc.h>
arch/arm/mach-at91/board-neocore926.c +1 -1
@@ -21,6 +21,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -44,7 +45,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include "sam9_smc.h"
arch/arm/mach-at91/board-picotux200.c +1 -1
@@ -20,6 +20,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -37,7 +38,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91rm9200_mc.h> #include "generic.h"
arch/arm/mach-at91/board-qil-a9260.c +1 -1
@@ -21,6 +21,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -40,7 +41,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91_shdwc.h>
arch/arm/mach-at91/board-rm9200dk.c +1 -1
@@ -22,6 +22,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -39,7 +40,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91rm9200_mc.h> #include "generic.h"
arch/arm/mach-at91/board-rm9200ek.c +1 -1
@@ -22,6 +22,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -39,7 +40,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91rm9200_mc.h> #include "generic.h"
arch/arm/mach-at91/board-sam9-l9260.c +1 -1
@@ -21,6 +21,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -37,7 +38,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include "sam9_smc.h"
arch/arm/mach-at91/board-sam9260ek.c +1 -1
@@ -20,6 +20,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -41,7 +42,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91_shdwc.h> #include <mach/system_rev.h>
arch/arm/mach-at91/board-sam9261ek.c +1 -1
@@ -20,6 +20,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -45,7 +46,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91_shdwc.h> #include <mach/system_rev.h>
arch/arm/mach-at91/board-sam9263ek.c +1 -1
@@ -20,6 +20,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -44,7 +45,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91_shdwc.h> #include <mach/system_rev.h>
arch/arm/mach-at91/board-sam9g20ek.c +1 -1
@@ -18,6 +18,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -41,7 +42,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/system_rev.h>
arch/arm/mach-at91/board-sam9m10g45ek.c +1 -1
@@ -14,6 +14,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -38,7 +39,6 @@#include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91_shdwc.h> #include <mach/system_rev.h>
arch/arm/mach-at91/board-sam9rlek.c +1 -1
@@ -8,6 +8,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -30,7 +31,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91_shdwc.h>
arch/arm/mach-at91/board-usb-a9260.c +1 -1
@@ -21,6 +21,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -40,7 +41,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91_shdwc.h>
arch/arm/mach-at91/board-usb-a9263.c +1 -1
@@ -21,6 +21,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -39,7 +40,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91_shdwc.h>
arch/arm/mach-at91/board-yl-9200.c +1 -1
@@ -22,6 +22,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h>
@@ -43,7 +44,6 @@#include <mach/hardware.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91rm9200_mc.h> #include <mach/cpu.h>
arch/arm/mach-at91/gpio.c +1 -2
@@ -11,6 +11,7 @@#include <linux/clk.h> #include <linux/errno.h> +#include <linux/gpio.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/debugfs.h>
@@ -23,8 +24,6 @@#include <mach/hardware.h> #include <mach/at91_pio.h> -#include <asm/gpio.h> -#include "generic.h" struct at91_gpio_chip {
arch/arm/mach-at91/leds.c +1 -1
@@ -9,13 +9,13 @@* 2 of the License, or (at your option) any later version. */ +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> #include <linux/platform_device.h> #include <mach/board.h> -#include <mach/gpio.h> /* ------------------------------------------------------------------------- */
arch/arm/mach-at91/pm.c +1 -1
@@ -10,6 +10,7 @@* (at your option) any later version. */ +#include <linux/gpio.h> #include <linux/suspend.h> #include <linux/sched.h> #include <linux/proc_fs.h>
@@ -25,7 +26,6 @@#include <asm/mach/irq.h> #include <mach/at91_pmc.h> -#include <mach/gpio.h> #include <mach/cpu.h> #include "generic.h"
arch/arm/mach-davinci/da830.c +1 -1
@@ -8,6 +8,7 @@* is licensed "as is" without any warranty of any kind, whether express * or implied. */ +#include <linux/gpio.h> #include <linux/init.h> #include <linux/clk.h>
@@ -19,7 +20,6 @@#include <mach/common.h> #include <mach/time.h> #include <mach/da8xx.h> -#include <mach/gpio.h> #include "clock.h" #include "mux.h"
arch/arm/mach-davinci/da850.c +1 -1
@@ -11,6 +11,7 @@* is licensed "as is" without any warranty of any kind, whether express * or implied. */ +#include <linux/gpio.h> #include <linux/init.h> #include <linux/clk.h> #include <linux/platform_device.h>
@@ -27,7 +28,6 @@#include <mach/da8xx.h> #include <mach/cpufreq.h> #include <mach/pm.h> -#include <mach/gpio.h> #include "clock.h" #include "mux.h"
arch/arm/mach-davinci/gpio.c +1 -3
@@ -9,15 +9,13 @@* the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ - +#include <linux/gpio.h> #include <linux/errno.h> #include <linux/kernel.h> #include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> -#include <mach/gpio.h> -#include <asm/mach/irq.h> struct davinci_gpio_regs {
arch/arm/mach-davinci/tnetv107x.c +1 -1
@@ -12,6 +12,7 @@* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/clk.h>
@@ -27,7 +28,6 @@#include <mach/psc.h> #include <mach/cp_intc.h> #include <mach/irqs.h> -#include <mach/gpio.h> #include <mach/hardware.h> #include <mach/tnetv107x.h>
arch/arm/mach-imx/iomux-imx31.c +1 -2
@@ -17,13 +17,12 @@* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/spinlock.h> #include <linux/io.h> #include <linux/kernel.h> #include <mach/hardware.h> -#include <mach/gpio.h> #include <mach/iomux-mx3.h> /*
arch/arm/mach-imx/mach-mx27ads.c +1 -2
@@ -13,7 +13,7 @@* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ - +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/map.h>
@@ -27,7 +27,6 @@#include <asm/mach/arch.h> #include <asm/mach/time.h> #include <asm/mach/map.h> -#include <mach/gpio.h> #include <mach/iomux-mx27.h> #include "devices-imx27.h"
arch/arm/mach-ixp2000/core.c +1 -3
@@ -13,7 +13,7 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/spinlock.h>
@@ -39,8 +39,6 @@#include <asm/mach/time.h> #include <asm/mach/irq.h> -#include <mach/gpio.h> -static DEFINE_SPINLOCK (ixp2000_slowport_lock);static unsigned long ixp2000_slowport_irq_flags;
arch/arm/mach-ixp2000/ixdp2x00.c +1 -2
@@ -14,6 +14,7 @@* Free Software Foundation; either version 2 of the License, or (at your * option) any later version. */ +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/mm.h>
@@ -40,8 +41,6 @@#include <asm/mach/flash.h> #include <asm/mach/arch.h> -#include <mach/gpio.h> -/************************************************************************* * IXDP2x00 IRQ Initialization
arch/arm/mach-ixp4xx/dsmg600-setup.c +1 -2
@@ -16,7 +16,7 @@* Author: Rod Whitby <[email protected]> * Maintainers: http://www.nslu2-linux.org/ */ - +#include <linux/gpio.h> #include <linux/irq.h> #include <linux/jiffies.h> #include <linux/timer.h>
@@ -31,7 +31,6 @@#include <asm/mach/arch.h> #include <asm/mach/flash.h> #include <asm/mach/time.h> -#include <asm/gpio.h> #define DSMG600_SDA_PIN 5#define DSMG600_SCL_PIN 4
arch/arm/mach-ixp4xx/fsg-setup.c +1 -2
@@ -14,7 +14,7 @@* Maintainers: http://www.nslu2-linux.org/ * */ - +#include <linux/gpio.h> #include <linux/if_ether.h> #include <linux/irq.h> #include <linux/serial.h>
@@ -27,7 +27,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -#include <asm/gpio.h> #define FSG_SDA_PIN 12#define FSG_SCL_PIN 13
arch/arm/mach-ixp4xx/nas100d-setup.c +1 -2
@@ -17,7 +17,7 @@* Maintainers: http://www.nslu2-linux.org/ * */ - +#include <linux/gpio.h> #include <linux/if_ether.h> #include <linux/irq.h> #include <linux/jiffies.h>
@@ -32,7 +32,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -#include <asm/gpio.h> #define NAS100D_SDA_PIN 5#define NAS100D_SCL_PIN 6
arch/arm/mach-ixp4xx/nslu2-setup.c +1 -2
@@ -16,7 +16,7 @@* Maintainers: http://www.nslu2-linux.org/ * */ - +#include <linux/gpio.h> #include <linux/if_ether.h> #include <linux/irq.h> #include <linux/serial.h>
@@ -30,7 +30,6 @@#include <asm/mach/arch.h> #include <asm/mach/flash.h> #include <asm/mach/time.h> -#include <asm/gpio.h> #define NSLU2_SDA_PIN 7#define NSLU2_SCL_PIN 6
arch/arm/mach-kirkwood/irq.c +1 -2
@@ -7,14 +7,13 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/irq.h> #include <linux/io.h> #include <mach/bridge-regs.h> #include <plat/irq.h> -#include <asm/gpio.h> #include "common.h" static void gpio_irq_handler (unsigned int irq,struct irq_desc *desc)
arch/arm/mach-kirkwood/mpp.c +1 -2
@@ -7,12 +7,11 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/mbus.h> #include <linux/io.h> -#include <asm/gpio.h> #include <mach/hardware.h> #include <plat/mpp.h> #include "common.h"
arch/arm/mach-ks8695/board-acs5k.c +1 -2
@@ -10,7 +10,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/interrupt.h>
@@ -34,7 +34,6 @@#include <asm/mach/irq.h> #include <mach/devices.h> -#include <mach/gpio.h> #include "generic.h"
arch/arm/mach-ks8695/board-dsm320.c +1 -2
@@ -10,7 +10,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/interrupt.h>
@@ -29,7 +29,6 @@#include <asm/mach/irq.h> #include <mach/devices.h> -#include <mach/gpio.h> #include "generic.h"
arch/arm/mach-ks8695/board-micrel.c +1 -2
@@ -5,7 +5,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/interrupt.h>
@@ -18,7 +18,6 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/gpio.h> #include <mach/devices.h> #include "generic.h"
arch/arm/mach-ks8695/gpio.c +1 -2
@@ -18,7 +18,7 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/mm.h> #include <linux/init.h>
@@ -31,7 +31,6 @@#include <asm/mach/irq.h> #include <mach/regs-gpio.h> -#include <mach/gpio.h> /* * Configure a GPIO line for either GPIO function, or its internal
arch/arm/mach-ks8695/leds.c +1 -2
@@ -7,14 +7,13 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> #include <asm/leds.h> #include <mach/devices.h> -#include <mach/gpio.h> static inline void ks8695_led_on (unsigned int led)
arch/arm/mach-mmp/aspenite.c +1 -2
@@ -8,7 +8,7 @@* it under the terms of the GNU General Public License version 2 as * publishhed by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/platform_device.h>
@@ -23,7 +23,6 @@#include <mach/addr-map.h> #include <mach/mfp-pxa168.h> #include <mach/pxa168.h> -#include <mach/gpio.h> #include <video/pxa168fb.h> #include <linux/input.h> #include <plat/pxa27x_keypad.h>
arch/arm/mach-mmp/mmp2.c +1 -2
@@ -9,7 +9,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -25,7 +25,6 @@#include <mach/irqs.h> #include <mach/dma.h> #include <mach/mfp.h> -#include <mach/gpio.h> #include <mach/devices.h> #include <mach/mmp2.h>
arch/arm/mach-mmp/pxa168.c +1 -2
@@ -7,7 +7,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -21,7 +21,6 @@#include <mach/regs-apbc.h> #include <mach/regs-apmu.h> #include <mach/irqs.h> -#include <mach/gpio.h> #include <mach/dma.h> #include <mach/devices.h> #include <mach/mfp.h>
arch/arm/mach-mmp/pxa910.c +1 -2
@@ -7,7 +7,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -20,7 +20,6 @@#include <mach/regs-apmu.h> #include <mach/cputype.h> #include <mach/irqs.h> -#include <mach/gpio.h> #include <mach/dma.h> #include <mach/mfp.h> #include <mach/devices.h>
arch/arm/mach-mmp/tavorevb.c +1 -2
@@ -7,7 +7,7 @@* it under the terms of the GNU General Public License version 2 as * publishhed by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/platform_device.h>
@@ -18,7 +18,6 @@#include <mach/addr-map.h> #include <mach/mfp-pxa910.h> #include <mach/pxa910.h> -#include <mach/gpio.h> #include "common.h"
arch/arm/mach-msm/board-msm7x27.c +1 -2
@@ -13,7 +13,7 @@* GNU General Public License for more details. * */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -34,7 +34,6 @@#include <mach/vreg.h> #include <mach/mpp.h> -#include <mach/gpio.h> #include <mach/board.h> #include <mach/msm_iomap.h>
arch/arm/mach-msm/board-msm7x30.c +1 -2
@@ -14,7 +14,7 @@* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/irq.h> #include <linux/gpio.h>
@@ -30,7 +30,6 @@#include <asm/memory.h> #include <asm/setup.h> -#include <mach/gpio.h> #include <mach/board.h> #include <mach/msm_iomap.h> #include <mach/dma.h>
arch/arm/mach-msm/board-qsd8x50.c +1 -2
@@ -14,7 +14,7 @@* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/irq.h> #include <linux/gpio.h>
@@ -32,7 +32,6 @@#include <mach/board.h> #include <mach/irqs.h> #include <mach/sirc.h> -#include <mach/gpio.h> #include <mach/vreg.h> #include <mach/mmc.h>
arch/arm/mach-msm/board-sapphire.c +1 -2
@@ -11,7 +11,7 @@* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -22,7 +22,6 @@#include <linux/delay.h> -#include <asm/gpio.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-msm/board-trout-mmc.c +1 -2
@@ -1,7 +1,7 @@/* linux/arch/arm/mach-msm/board-trout-mmc.c ** Author: Brian Swetland <[email protected]> */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -11,7 +11,6 @@#include <linux/err.h> #include <linux/debugfs.h> -#include <asm/gpio.h> #include <asm/io.h> #include <mach/vreg.h>
arch/arm/mach-msm/board-trout-panel.c +1 -2
@@ -1,7 +1,7 @@/* linux/arch/arm/mach-msm/board-trout-mddi.c ** Author: Brian Swetland <[email protected]> */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -11,7 +11,6 @@#include <linux/err.h> #include <asm/io.h> -#include <asm/gpio.h> #include <asm/mach-types.h> #include <mach/msm_fb.h>
arch/arm/mach-mv78xx0/irq.c +1 -2
@@ -7,12 +7,11 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/irq.h> -#include <asm/gpio.h> #include <mach/bridge-regs.h> #include <plat/irq.h> #include "common.h"
arch/arm/mach-mv78xx0/mpp.c +1 -2
@@ -7,13 +7,12 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/mbus.h> #include <linux/io.h> #include <plat/mpp.h> -#include <asm/gpio.h> #include <mach/hardware.h> #include "common.h" #include "mpp.h"
arch/arm/mach-omap1/board-ams-delta.c +1 -2
@@ -11,7 +11,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/input.h>
@@ -30,7 +30,6 @@#include <plat/io.h> #include <plat/board-ams-delta.h> -#include <mach/gpio.h> #include <plat/keypad.h> #include <plat/mux.h> #include <plat/usb.h>
arch/arm/mach-omap1/board-fsample.c +1 -2
@@ -10,7 +10,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -28,7 +28,6 @@#include <asm/mach/map.h> #include <plat/tc.h> -#include <mach/gpio.h> #include <plat/mux.h> #include <plat/flash.h> #include <plat/fpga.h>
arch/arm/mach-omap1/board-generic.c +1 -2
@@ -12,7 +12,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -22,7 +22,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/gpio.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/board.h>
arch/arm/mach-omap1/board-h2-mmc.c +1 -2
@@ -11,13 +11,12 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c/tps65010.h> #include <plat/mmc.h> -#include <mach/gpio.h> #include "board-h2.h"
arch/arm/mach-omap1/board-h2.c +1 -2
@@ -18,7 +18,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/delay.h>
@@ -32,7 +32,6 @@#include <linux/smc91x.h> #include <mach/hardware.h> -#include <asm/gpio.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-omap1/board-h3-mmc.c +1 -2
@@ -11,13 +11,12 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c/tps65010.h> #include <plat/mmc.h> -#include <mach/gpio.h> #include "board-h3.h"
arch/arm/mach-omap1/board-h3.c +1 -2
@@ -13,7 +13,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/types.h> #include <linux/init.h> #include <linux/major.h>
@@ -34,7 +34,6 @@#include <asm/setup.h> #include <asm/page.h> #include <mach/hardware.h> -#include <asm/gpio.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-omap1/board-htcherald.c +0 -1
@@ -23,7 +23,6 @@* 02110-1301, USA. * */ -#include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
arch/arm/mach-omap1/board-innovator.c +1 -2
@@ -15,7 +15,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -34,7 +34,6 @@#include <plat/mux.h> #include <plat/flash.h> #include <plat/fpga.h> -#include <mach/gpio.h> #include <plat/tc.h> #include <plat/usb.h> #include <plat/keypad.h>
arch/arm/mach-omap1/board-nokia770.c +1 -2
@@ -7,7 +7,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/mutex.h>
@@ -26,7 +26,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/gpio.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/board.h>
arch/arm/mach-omap1/board-osk.c +1 -2
@@ -25,7 +25,7 @@* with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -42,7 +42,6 @@#include <linux/i2c/tps65010.h> #include <mach/hardware.h> -#include <asm/gpio.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-omap1/board-palmte.c +1 -2
@@ -16,7 +16,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/input.h>
@@ -33,7 +33,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/gpio.h> #include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h>
arch/arm/mach-omap1/board-palmtt.c +1 -1
@@ -12,6 +12,7 @@*/ #include <linux/delay.h> +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -30,7 +31,6 @@#include <asm/mach/map.h> #include <plat/led.h> -#include <mach/gpio.h> #include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h>
arch/arm/mach-omap1/board-palmz71.c +1 -1
@@ -15,6 +15,7 @@*/ #include <linux/delay.h> +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -32,7 +33,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/gpio.h> #include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h>
arch/arm/mach-omap1/board-perseus2.c +1 -2
@@ -10,7 +10,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -28,7 +28,6 @@#include <asm/mach/map.h> #include <plat/tc.h> -#include <mach/gpio.h> #include <plat/mux.h> #include <plat/fpga.h> #include <plat/flash.h>
arch/arm/mach-omap1/board-sx1-mmc.c +1 -1
@@ -12,11 +12,11 @@* published by the Free Software Foundation. */ +#include <linux/gpio.h> #include <linux/platform_device.h> #include <mach/hardware.h> #include <plat/mmc.h> -#include <mach/gpio.h> #include <plat/board-sx1.h> #if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE )
arch/arm/mach-omap1/board-sx1.c +1 -2
@@ -14,7 +14,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/input.h>
@@ -32,7 +32,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/gpio.h> #include <plat/flash.h> #include <plat/mux.h> #include <plat/dma.h>
arch/arm/mach-omap1/board-voiceblue.c +1 -1
@@ -13,6 +13,7 @@*/ #include <linux/delay.h> +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/irq.h>
@@ -33,7 +34,6 @@#include <plat/board-voiceblue.h> #include <plat/common.h> -#include <mach/gpio.h> #include <plat/flash.h> #include <plat/mux.h> #include <plat/tc.h>
arch/arm/mach-omap1/devices.c +1 -1
@@ -10,6 +10,7 @@*/ #include <linux/dma-mapping.h> +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -24,7 +25,6 @@#include <plat/tc.h> #include <plat/board.h> #include <plat/mux.h> -#include <mach/gpio.h> #include <plat/mmc.h> #include <plat/omap7xx.h> #include <plat/mcbsp.h>
arch/arm/mach-omap1/fpga.c +1 -1
@@ -17,6 +17,7 @@*/ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/device.h>
@@ -28,7 +29,6 @@#include <asm/mach/irq.h> #include <plat/fpga.h> -#include <mach/gpio.h> static void fpga_mask_irq (struct irq_data *d) {
arch/arm/mach-omap1/irq.c +1 -2
@@ -35,7 +35,7 @@* with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/module.h> #include <linux/sched.h>
@@ -45,7 +45,6 @@#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/irq.h> -#include <mach/gpio.h> #include <plat/cpu.h> #define IRQ_BANK (irq) ((irq) >> 5)
arch/arm/mach-omap1/leds-h2p2-debug.c +1 -1
@@ -9,6 +9,7 @@* The "surfer" expansion board and H2 sample board also have two-color * green+red LEDs (in parallel), used here for timer and idle indicators. */ +#include <linux/gpio.h> #include <linux/init.h> #include <linux/kernel_stat.h> #include <linux/sched.h>
@@ -20,7 +21,6 @@#include <asm/mach-types.h> #include <plat/fpga.h> -#include <mach/gpio.h> #include "leds.h"
arch/arm/mach-omap1/leds-osk.c +1 -2
@@ -3,14 +3,13 @@* * LED driver for OSK with optional Mistral QVGA board */ +#include <linux/gpio.h> #include <linux/init.h> #include <mach/hardware.h> #include <asm/leds.h> #include <asm/system.h> -#include <mach/gpio.h> -#include "leds.h"
arch/arm/mach-omap1/leds.c +1 -1
@@ -3,13 +3,13 @@* * OMAP LEDs dispatcher */ +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <asm/leds.h> #include <asm/mach-types.h> -#include <mach/gpio.h> #include <plat/mux.h> #include "leds.h"
arch/arm/mach-omap1/serial.c +1 -2
@@ -7,7 +7,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -24,7 +24,6 @@#include <plat/board.h> #include <plat/mux.h> -#include <mach/gpio.h> #include <plat/fpga.h> #include "pm.h"
arch/arm/mach-omap2/board-generic.c +1 -2
@@ -15,7 +15,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/device.h>
@@ -25,7 +25,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/gpio.h> #include <plat/usb.h> #include <plat/board.h> #include <plat/common.h>
arch/arm/mach-omap2/board-h4.c +1 -2
@@ -10,7 +10,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -31,7 +31,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/gpio.h> #include <plat/usb.h> #include <plat/board.h> #include <plat/common.h>
arch/arm/mach-omap2/board-ldp.c +1 -2
@@ -10,7 +10,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -34,7 +34,6 @@#include <asm/mach/map.h> #include <plat/mcspi.h> -#include <mach/gpio.h> #include <plat/board.h> #include <plat/common.h> #include <plat/gpmc.h>
arch/arm/mach-omap2/devices.c +1 -2
@@ -8,7 +8,7 @@* the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -26,7 +26,6 @@#include <plat/tc.h> #include <plat/board.h> #include <plat/mcbsp.h> -#include <mach/gpio.h> #include <plat/mmc.h> #include <plat/dma.h> #include <plat/omap_hwmod.h>
arch/arm/mach-orion5x/db88f5281-setup.c +1 -2
@@ -9,7 +9,7 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -21,7 +21,6 @@#include <linux/mv643xx_eth.h> #include <linux/i2c.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h>
arch/arm/mach-orion5x/dns323-setup.c +1 -2
@@ -13,7 +13,7 @@* License, or (at your option) any later version. * */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/delay.h>
@@ -30,7 +30,6 @@#include <linux/phy.h> #include <linux/marvell_phy.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h>
arch/arm/mach-orion5x/irq.c +1 -2
@@ -9,12 +9,11 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/irq.h> #include <linux/io.h> -#include <asm/gpio.h> #include <mach/bridge-regs.h> #include <plat/irq.h> #include "common.h"
arch/arm/mach-orion5x/kurobox_pro-setup.c +1 -2
@@ -7,7 +7,7 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -21,7 +21,6 @@#include <linux/serial_reg.h> #include <linux/ata_platform.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h>
arch/arm/mach-orion5x/mv2120-setup.c +1 -2
@@ -7,7 +7,7 @@* published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -20,7 +20,6 @@#include <linux/i2c.h> #include <linux/ata_platform.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <mach/orion5x.h> #include "common.h"
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c +1 -2
@@ -7,7 +7,7 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -18,7 +18,6 @@#include <linux/ethtool.h> #include <net/dsa.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/leds.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h>
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c +1 -2
@@ -7,7 +7,7 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -19,7 +19,6 @@#include <linux/i2c.h> #include <net/dsa.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/leds.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h>
arch/arm/mach-orion5x/rd88f5182-setup.c +1 -2
@@ -9,7 +9,7 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -20,7 +20,6 @@#include <linux/ata_platform.h> #include <linux/i2c.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/leds.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h>
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c +1 -2
@@ -7,7 +7,7 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -21,7 +21,6 @@#include <linux/ethtool.h> #include <net/dsa.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/leds.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h>
arch/arm/mach-orion5x/terastation_pro2-setup.c +1 -2
@@ -8,7 +8,7 @@* as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -20,7 +20,6 @@#include <linux/i2c.h> #include <linux/serial_reg.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h>
arch/arm/mach-orion5x/ts209-setup.c +1 -2
@@ -8,7 +8,7 @@* as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -23,7 +23,6 @@#include <linux/serial_reg.h> #include <linux/ata_platform.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h>
arch/arm/mach-orion5x/ts409-setup.c +1 -2
@@ -11,7 +11,7 @@* as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -25,7 +25,6 @@#include <linux/i2c.h> #include <linux/serial_reg.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h>
arch/arm/mach-orion5x/wnr854t-setup.c +1 -2
@@ -5,7 +5,7 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -17,7 +17,6 @@#include <linux/ethtool.h> #include <net/dsa.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h>
arch/arm/mach-orion5x/wrt350n-v2-setup.c +1 -2
@@ -5,7 +5,7 @@* License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -20,7 +20,6 @@#include <linux/input.h> #include <net/dsa.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h>
arch/arm/mach-pnx4008/gpio.c +1 -2
@@ -13,14 +13,13 @@* is licensed "as is" without any warranty of any kind, whether express * or implied. */ - +#include <linux/gpio.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/io.h> #include <mach/hardware.h> #include <mach/platform.h> -#include <mach/gpio.h> /* register definitions */ #define PIO_VA_BASE IO_ADDRESS(PNX4008_PIO_BASE)
arch/arm/mach-pnx4008/serial.c +1 -2
@@ -9,7 +9,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/io.h>
@@ -19,7 +19,6 @@#include <linux/serial_core.h> #include <linux/serial_reg.h> -#include <mach/gpio.h> #include <mach/clock.h>
arch/arm/mach-pxa/generic.c +1 -1
@@ -16,6 +16,7 @@* initialization stuff for PXA machines which can be overridden later if * need be. */ +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -26,7 +27,6 @@#include <asm/mach-types.h> #include <mach/reset.h> -#include <mach/gpio.h> #include <mach/smemc.h> #include <mach/pxa3xx-regs.h>
arch/arm/mach-pxa/include/mach/littleton.h +1 -1
@@ -1,7 +1,7 @@#ifndef __ASM_ARCH_LITTLETON_H#define __ASM_ARCH_LITTLETON_H -#include <mach/gpio.h> +#include <asm/gpio.h> #define LITTLETON_ETH_PHYS 0x30000000
arch/arm/mach-pxa/irq.c +1 -2
@@ -11,7 +11,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/module.h> #include <linux/interrupt.h>
@@ -21,7 +21,6 @@#include <mach/hardware.h> #include <mach/irqs.h> -#include <mach/gpio.h> #include "generic.h"
arch/arm/mach-pxa/lpd270.c +1 -2
@@ -12,7 +12,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/syscore_ops.h>
@@ -39,7 +39,6 @@#include <asm/mach/flash.h> #include <mach/pxa27x.h> -#include <mach/gpio.h> #include <mach/lpd270.h> #include <mach/audio.h> #include <mach/pxafb.h>
arch/arm/mach-pxa/lubbock.c +1 -1
@@ -11,6 +11,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -42,7 +43,6 @@#include <asm/hardware/sa1111.h> #include <mach/pxa25x.h> -#include <mach/gpio.h> #include <mach/audio.h> #include <mach/lubbock.h> #include <mach/udc.h>
arch/arm/mach-pxa/mainstone.c +1 -2
@@ -12,7 +12,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/syscore_ops.h>
@@ -43,7 +43,6 @@#include <asm/mach/flash.h> #include <mach/pxa27x.h> -#include <mach/gpio.h> #include <mach/mainstone.h> #include <mach/audio.h> #include <mach/pxafb.h>
arch/arm/mach-pxa/mfp-pxa2xx.c +1 -2
@@ -12,13 +12,12 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/syscore_ops.h> -#include <mach/gpio.h> #include <mach/pxa2xx-regs.h> #include <mach/mfp-pxa2xx.h>
arch/arm/mach-pxa/pcm990-baseboard.c +1 -2
@@ -19,7 +19,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/irq.h> #include <linux/platform_device.h> #include <linux/i2c.h>
@@ -28,7 +28,6 @@#include <media/soc_camera.h> -#include <asm/gpio.h> #include <mach/camera.h> #include <asm/mach/map.h> #include <mach/pxa27x.h>
arch/arm/mach-pxa/pxa25x.c +1 -1
@@ -16,6 +16,7 @@* initialization stuff for PXA machines which can be overridden later if * need be. */ +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -28,7 +29,6 @@#include <asm/suspend.h> #include <mach/hardware.h> #include <mach/irqs.h> -#include <mach/gpio.h> #include <mach/pxa25x.h> #include <mach/reset.h> #include <mach/pm.h>
arch/arm/mach-pxa/pxa27x.c +1 -1
@@ -11,6 +11,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -26,7 +27,6 @@#include <asm/irq.h> #include <asm/suspend.h> #include <mach/irqs.h> -#include <mach/gpio.h> #include <mach/pxa27x.h> #include <mach/reset.h> #include <mach/ohci.h>
arch/arm/mach-pxa/pxa3xx.c +1 -2
@@ -12,7 +12,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -26,7 +26,6 @@#include <asm/mach/map.h> #include <asm/suspend.h> #include <mach/hardware.h> -#include <mach/gpio.h> #include <mach/pxa3xx-regs.h> #include <mach/reset.h> #include <mach/ohci.h>
arch/arm/mach-pxa/pxa95x.c +1 -2
@@ -9,7 +9,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -21,7 +21,6 @@#include <linux/syscore_ops.h> #include <mach/hardware.h> -#include <mach/gpio.h> #include <mach/pxa3xx-regs.h> #include <mach/pxa930.h> #include <mach/reset.h>
arch/arm/mach-pxa/saarb.c +1 -2
@@ -9,7 +9,7 @@* it under the terms of the GNU General Public License version 2 as * publishhed by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/i2c.h>
@@ -23,7 +23,6 @@#include <mach/hardware.h> #include <mach/mfp.h> #include <mach/mfp-pxa930.h> -#include <mach/gpio.h> #include "generic.h"
arch/arm/mach-s3c2410/include/mach/h1940-latch.h +1 -1
@@ -14,7 +14,7 @@#ifndef __ASM_ARCH_H1940_LATCH_H#define __ASM_ARCH_H1940_LATCH_H -#include <mach/gpio.h> +#include <asm/gpio.h> #define H1940_LATCH_GPIO (x) (S3C_GPIO_END + (x))
arch/arm/mach-sa1100/generic.c +1 -1
@@ -9,6 +9,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -24,7 +25,6 @@#include <asm/mach/map.h> #include <asm/mach/flash.h> #include <asm/irq.h> -#include <asm/gpio.h> #include "generic.h"
arch/arm/mach-sa1100/gpio.c +1 -2
@@ -7,11 +7,10 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/module.h> -#include <asm/gpio.h> #include <mach/hardware.h> #include "generic.h"
arch/arm/mach-tegra/board-trimslice-pinmux.c +1 -2
@@ -13,12 +13,11 @@* GNU General Public License for more details. * */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <mach/pinmux.h> -#include <mach/gpio.h> #include "gpio-names.h" #include "board-trimslice.h"
arch/arm/mach-ux500/board-mop500-u8500uib.c +1 -2
@@ -4,7 +4,7 @@* Board data for the U8500 UIB, also known as the New UIB * License terms: GNU General Public License (GPL), version 2 */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/i2c.h>
@@ -13,7 +13,6 @@#include <linux/mfd/tc3589x.h> #include <linux/input/matrix_keypad.h> -#include <mach/gpio.h> #include <mach/irqs.h> #include "board-mop500.h"
arch/arm/plat-omap/debug-devices.c +1 -2
@@ -8,7 +8,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -18,7 +18,6 @@#include <mach/hardware.h> #include <plat/board.h> -#include <mach/gpio.h> /* Many OMAP development platforms reuse the same "debug board"; these
arch/arm/plat-omap/debug-leds.c +1 -2
@@ -7,7 +7,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/leds.h>
@@ -19,7 +19,6 @@#include <asm/mach-types.h> #include <plat/fpga.h> -#include <mach/gpio.h> /* Many OMAP development platforms reuse the same "debug board"; these
arch/arm/plat-omap/devices.c +1 -2
@@ -8,7 +8,7 @@* the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -24,7 +24,6 @@#include <plat/tc.h> #include <plat/board.h> #include <plat/mmc.h> -#include <mach/gpio.h> #include <plat/menelaus.h> #include <plat/mcbsp.h> #include <plat/omap44xx.h>
arch/arm/plat-pxa/gpio.c +1 -3
@@ -11,15 +11,13 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/init.h> #include <linux/irq.h> #include <linux/io.h> #include <linux/syscore_ops.h> #include <linux/slab.h> -#include <mach/gpio.h> -int pxa_last_gpio;struct pxa_gpio_chip {
Signature · 1 line
1.7.4.4
PATCH 3/13 ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h
In reply to Russell King - ARM LinuxSigned-off-by Russell King <[email protected]>
--- drivers/gpio/gpio-omap.c | 2 +- drivers/input/keyboard/omap-keypad.c | 2 +- drivers/mfd/menelaus.c | 2 +- drivers/mmc/host/omap.c | 2 +- drivers/mtd/nand/ams-delta.c | 2 +- drivers/mtd/onenand/omap2.c | 2 +- drivers/video/omap/lcd_apollon.c | 2 +- drivers/video/omap/lcd_h3.c | 2 +- drivers/video/omap/lcd_inn1610.c | 2 +- drivers/video/omap/lcd_ldp.c | 2 +- drivers/video/omap/lcd_osk.c | 2 +- drivers/video/omap/lcd_overo.c | 2 +- drivers/video/omap/lcd_palmtt.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
drivers/gpio/gpio-omap.c +1 -1
@@ -25,7 +25,7 @@#include <mach/hardware.h> #include <asm/irq.h> #include <mach/irqs.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <asm/mach/irq.h> struct gpio_bank {
drivers/input/keyboard/omap-keypad.c +1 -1
@@ -35,7 +35,7 @@#include <linux/mutex.h> #include <linux/errno.h> #include <linux/slab.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/keypad.h> #include <plat/menelaus.h> #include <asm/irq.h>
drivers/mfd/menelaus.c +1 -1
@@ -44,7 +44,7 @@#include <asm/mach/irq.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/menelaus.h> #define DRIVER_NAME "menelaus"
drivers/mmc/host/omap.c +1 -1
@@ -33,7 +33,7 @@#include <plat/board.h> #include <plat/mmc.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/dma.h> #include <plat/mux.h> #include <plat/fpga.h>
drivers/mtd/nand/ams-delta.c +1 -1
@@ -26,7 +26,7 @@#include <asm/io.h> #include <mach/hardware.h> #include <asm/sizes.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/board-ams-delta.h> /*
drivers/mtd/onenand/omap2.c +1 -1
@@ -40,7 +40,7 @@#include <asm/mach/flash.h> #include <plat/gpmc.h> #include <plat/onenand.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/dma.h>
drivers/video/omap/lcd_apollon.c +1 -1
@@ -24,7 +24,7 @@#include <linux/module.h> #include <linux/platform_device.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include "omapfb.h"
drivers/video/omap/lcd_h3.c +1 -1
@@ -23,7 +23,7 @@#include <linux/platform_device.h> #include <linux/i2c/tps65010.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include "omapfb.h" #define MODULE_NAME "omapfb-lcd_h3"
drivers/video/omap/lcd_inn1610.c +1 -1
@@ -22,7 +22,7 @@#include <linux/module.h> #include <linux/platform_device.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include "omapfb.h" #define MODULE_NAME "omapfb-lcd_h3"
drivers/video/omap/lcd_ldp.c +1 -1
@@ -26,7 +26,7 @@#include <linux/delay.h> #include <linux/i2c/twl.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/mux.h> #include <asm/mach-types.h>
drivers/video/omap/lcd_osk.c +1 -1
@@ -23,7 +23,7 @@#include <linux/module.h> #include <linux/platform_device.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/mux.h> #include "omapfb.h"
drivers/video/omap/lcd_overo.c +1 -1
@@ -23,7 +23,7 @@#include <linux/platform_device.h> #include <linux/i2c/twl.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/mux.h> #include <asm/mach-types.h>
drivers/video/omap/lcd_palmtt.c +1 -1
@@ -29,7 +29,7 @@ GPIO13 - screen blanking#include <linux/module.h> #include <linux/io.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include "omapfb.h" static int palmtt_panel_init(struct lcd_panel *panel,
Signature · 1 line
1.7.4.4
PATCH 3/13 ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h
Quoted 1 line · Russell King - ARM Linux
Signed-off-by Russell King <[email protected]>
Acked-by Kevin Hilman <[email protected]>
PATCH 4/13 ARM: gpio: at91: convert drivers to use asm/gpio.h rather than mach/gpio.h
In reply to Russell King - ARM LinuxSigned-off-by Russell King <[email protected]>
--- drivers/ata/pata_at91.c | 2 +- drivers/ide/at91_ide.c | 2 +- drivers/net/arm/at91_ether.c | 2 +- drivers/spi/spi-atmel.c | 2 +- drivers/tty/serial/atmel_serial.c | 2 +- drivers/video/atmel_lcdfb.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
drivers/ata/pata_at91.c +1 -1
@@ -30,7 +30,7 @@#include <mach/at91sam9_smc.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #define DRV_NAME "pata_at91"#define DRV_VERSION "0.3"
drivers/ide/at91_ide.c +1 -1
@@ -28,7 +28,7 @@#include <linux/platform_device.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <mach/at91sam9_smc.h> #define DRV_NAME "at91_ide"
drivers/net/arm/at91_ether.c +1 -1
@@ -35,7 +35,7 @@#include <asm/mach-types.h> #include <mach/at91rm9200_emac.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <mach/board.h> #include "at91_ether.h"
drivers/spi/spi-atmel.c +1 -1
@@ -22,7 +22,7 @@#include <asm/io.h> #include <mach/board.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <mach/cpu.h> /* SPI register offsets */
drivers/tty/serial/atmel_serial.c +1 -1
@@ -46,7 +46,7 @@#ifdef CONFIG_ARM #include <mach/cpu.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #endif #define PDC_BUFFER_SIZE 512
drivers/video/atmel_lcdfb.c +1 -1
@@ -21,7 +21,7 @@#include <mach/board.h> #include <mach/cpu.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <video/atmel_lcdc.h>
Signature · 1 line
1.7.4.4
PATCH 5/13 ARM: gpio: nomadik: convert drivers to use asm/gpio.h rather than mach/gpio.h
In reply to Russell King - ARM LinuxSigned-off-by Russell King <[email protected]>
--- drivers/gpio/gpio-nomadik.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/gpio/gpio-nomadik.c +1 -1
@@ -28,7 +28,7 @@#include <plat/pincfg.h> #include <mach/hardware.h> -#include <mach/gpio.h> +#include <asm/gpio.h> /* * The GPIO module in the Nomadik family of Systems-on-Chip is an
Signature · 1 line
1.7.4.4
PATCH 6/13 ARM: gpio: davinci: convert drivers to use asm/gpio.h rather than mach/gpio.h
In reply to Russell King - ARM LinuxSigned-off-by Russell King <[email protected]>
--- drivers/usb/musb/davinci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/musb/davinci.c +1 -1
@@ -35,7 +35,7 @@#include <mach/hardware.h> #include <mach/memory.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <mach/cputype.h> #include <asm/mach-types.h>
Signature · 1 line
1.7.4.4
PATCH 6/13 ARM: gpio: davinci: convert drivers to use asm/gpio.h rather than mach/gpio.h
Hello.
On 09-08-2011 12:06, Russell King - ARM Linux wrote:
CCing linux-usb and Felipe...
Quoted 10 lines
Signed-off-by Russell King<[email protected]>--- drivers/usb/musb/davinci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/usb/musb/davinci.c +0
-0
drivers/usb/musb/davinci.c line 38
Quoted 5 lines
drivers/usb/musb/davinci.c +1
-1@@ -35,7 +35,7 @@#include <mach/hardware.h> #include <mach/memory.h> -#include <mach/gpio.h> +#include <asm/gpio.h>
Shouldn't this now be moved to the below #include group?
drivers/usb/musb/davinci.c line 41
Quoted 3 lines
drivers/usb/musb/davinci.c +0
-0#include <mach/cputype.h> #include <asm/mach-types.h>
WBR, Sergei
PATCH 6/13 ARM: gpio: davinci: convert drivers to use asm/gpio.h rather than mach/gpio.h
Quoted 17 lines · Sergei Shtylyov
Hello.
On 09-08-2011 12:06, Russell King - ARM Linux wrote:
CCing linux-usb and Felipe...
Quoted 11 lines
Signed-off-by Russell King<[email protected]>--- drivers/usb/musb/davinci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/usb/musb/davinci.c +0
-0@@ -35,7 +35,7 @@
Quoted 6 lines
drivers/usb/musb/davinci.c line 38
Quoted 4 lines
drivers/usb/musb/davinci.c +1
-1#include <mach/hardware.h> #include <mach/memory.h> -#include <mach/gpio.h> +#include <asm/gpio.h> Shouldn't this now be moved to the below #include group?
When doing this kind of work with sed -i, that doesn't happen. There's too much of this crap (and I've been telling people about this for at least a year) that I don't think there's that luxury anymore.
If maintainers would have paid more attention, then most of these changes would not be necessary. My view is that if maintainers do care about this stuff _they_ should have been the ones to pick up on it long ago. In other words, they've lost the right to complain about petty crap like the ordering of includes through their own inaction on this point.
PATCH 7/13 ARM: gpio: pnx4008: convert drivers to use asm/gpio.h rather than mach/gpio.h
In reply to Russell King - ARM LinuxSigned-off-by Russell King <[email protected]>
--- drivers/usb/host/ohci-pnx4008.c | 2 +- drivers/video/pnx4008/sdum.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/ohci-pnx4008.c +1 -1
@@ -26,7 +26,7 @@#include <mach/platform.h> #include <mach/irqs.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #define USB_CTRL IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64)
drivers/video/pnx4008/sdum.c +1 -1
@@ -30,7 +30,7 @@#include <linux/clk.h> #include <linux/gfp.h> #include <asm/uaccess.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include "sdum.h" #include "fbcommon.h"
Signature · 1 line
1.7.4.4
PATCH 8/13 ARM: gpio: ixp2000: convert drivers to use asm/gpio.h rather than mach/gpio.h
In reply to Russell King - ARM LinuxSigned-off-by Russell King <[email protected]>
--- drivers/i2c/busses/i2c-ixp2000.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/i2c/busses/i2c-ixp2000.c +1 -1
@@ -35,7 +35,7 @@#include <linux/slab.h> #include <mach/hardware.h> /* Pick up IXP2000-specific bits */ -#include <mach/gpio.h> +#include <asm/gpio.h> static inline int ixp2000_scl_pin (void *data) {
Signature · 1 line
1.7.4.4
PATCH 9/13 ARM: gpio: tegra: convert drivers to use asm/gpio.h rather than mach/gpio.h
In reply to Russell King - ARM LinuxSigned-off-by Russell King <[email protected]>
--- drivers/mmc/host/sdhci-tegra.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mmc/host/sdhci-tegra.c +1 -1
@@ -21,7 +21,7 @@#include <linux/mmc/card.h> #include <linux/mmc/host.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <mach/sdhci.h> #include "sdhci-pltfm.h"
Signature · 1 line
1.7.4.4
PATCH 10/13 ARM: gpio: pxa: convert drivers to use asm/gpio.h rather than mach/gpio.h
In reply to Russell King - ARM LinuxSigned-off-by Russell King <[email protected]>
--- drivers/pcmcia/pxa2xx_vpac270.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pcmcia/pxa2xx_vpac270.c +1 -1
@@ -17,7 +17,7 @@#include <asm/mach-types.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <mach/vpac270.h> #include "soc_common.h"
Signature · 1 line
1.7.4.4
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM LinuxConsolidate 24 trivial gpiolib implementions out of mach/gpio.h into asm/gpio.h. This is basically the include of asm-generic/gpio.h and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep as described in Documentation/gpio.txt
Signed-off-by Russell King <[email protected]>
--- arch/arm/include/asm/gpio.h | 10 ++++++++++ arch/arm/mach-at91/include/mach/gpio.h | 5 +---- arch/arm/mach-ep93xx/include/mach/gpio.h | 7 +------ arch/arm/mach-exynos4/include/mach/gpio.h | 5 +---- arch/arm/mach-gemini/include/mach/gpio.h | 5 +---- arch/arm/mach-ks8695/include/mach/gpio.h | 11 ++--------- arch/arm/mach-lpc32xx/include/mach/gpio.h | 17 +---------------- arch/arm/mach-msm/include/mach/gpio.h | 5 +---- arch/arm/mach-mxs/include/mach/gpio.h | 6 +----- arch/arm/mach-realview/include/mach/gpio.h | 6 +----- arch/arm/mach-s3c2410/include/mach/gpio.h | 5 +---- arch/arm/mach-s3c64xx/include/mach/gpio.h | 6 +----- arch/arm/mach-s5p64x0/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pc100/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pv210/include/mach/gpio.h | 6 +----- arch/arm/mach-shmobile/include/mach/gpio.h | 15 +-------------- arch/arm/mach-tegra/include/mach/gpio.h | 6 +----- arch/arm/mach-versatile/include/mach/gpio.h | 6 +----- arch/arm/mach-vt8500/include/mach/gpio.h | 6 +----- arch/arm/mach-w90x900/include/mach/gpio.h | 5 +---- arch/arm/plat-mxc/include/mach/gpio.h | 5 +---- arch/arm/plat-nomadik/include/plat/gpio.h | 11 +---------- arch/arm/plat-omap/include/plat/gpio.h | 15 +-------------- arch/arm/plat-orion/include/plat/gpio.h | 6 ++---- arch/arm/plat-spear/include/plat/gpio.h | 6 +----- 25 files changed, 36 insertions(+), 151 deletions(-)
arch/arm/include/asm/gpio.h +10 -0
@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> +#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ +#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif +#endif /* _ARCH_ARM_GPIO_H */
arch/arm/mach-at91/include/mach/gpio.h +1 -4
@@ -214,11 +214,8 @@ extern void at91_gpio_resume(void);*/ #include <asm/errno.h> -#include <asm-generic/gpio.h> /* cansleep wrappers */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq (gpio) (gpio)#define irq_to_gpio (irq) (irq)
arch/arm/mach-ep93xx/include/mach/gpio.h +1 -6
@@ -100,12 +100,7 @@#define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7)/* new generic GPIO API - see Documentation/gpio.txt */ - -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL/* * Map GPIO A0..A7 (0..7) to irq 64..71,
arch/arm/mach-exynos4/include/mach/gpio.h +1 -4
@@ -13,9 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep#define gpio_to_irq __gpio_to_irq/* Practically, GPIO banks up to GPZ are the configurable gpio banks */
@@ -151,6 +148,6 @@ enum s5p_gpio_number {#define ARCH_NR_GPIOS (EXYNOS4_GPZ(EXYNOS4_GPIO_Z_NR) + \ CONFIG_SAMSUNG_GPIO_EXTRA + 1) -#include <asm-generic/gpio.h> +#define __ARM_GPIOLIB_TRIVIAL#endif /* __ASM_ARCH_GPIO_H */
arch/arm/mach-gemini/include/mach/gpio.h +1 -4
@@ -13,11 +13,8 @@#define __MACH_GPIO_H__#include <mach/irqs.h> -#include <asm-generic/gpio.h> -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq (x) ((x) + GPIO_IRQ_BASE)#define irq_to_gpio (x) ((x) - GPIO_IRQ_BASE)
arch/arm/mach-ks8695/include/mach/gpio.h +2 -9
@@ -40,17 +40,10 @@ extern int ks8695_gpio_interrupt(unsigned int pin, unsigned int type);*/ extern int irq_to_gpio (unsigned int irq); -#include <asm-generic/gpio.h> - -/* If it turns out that we need to optimise GPIO access for the -* Micrel's GPIOs, then these can be changed to check their argument -* directly as static inlines. However for now it's probably not -* worthwhile. -*/ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value#define gpio_to_irq __gpio_to_irq +#define __ARM_GPIOLIB_TRIVIAL +/* Register the GPIOs */ extern void ks8695_register_gpios (void );
arch/arm/mach-lpc32xx/include/mach/gpio.h +1 -16
@@ -19,8 +19,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H -#include <asm-generic/gpio.h> -/* * Note! * Muxed GP pins need to be setup to the GP state in the board level
@@ -51,20 +49,7 @@*/ #define LPC32XX_GPIO (x, y) ((x) + (y)) -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); -} +#define __ARM_GPIOLIB_TRIVIALstatic inline int gpio_to_irq (unsigned gpio) {
arch/arm/mach-msm/include/mach/gpio.h +1 -4
@@ -16,11 +16,8 @@#ifndef __ASM_ARCH_MSM_GPIO_H#define __ASM_ARCH_MSM_GPIO_H -#include <asm-generic/gpio.h> +#define __ARM_GPIOLIB_TRIVIAL -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep#define gpio_to_irq __gpio_to_irq#endif /* __ASM_ARCH_MSM_GPIO_H */
arch/arm/mach-mxs/include/mach/gpio.h +1 -5
@@ -20,14 +20,10 @@#ifndef __MACH_MXS_GPIO_H__#define __MACH_MXS_GPIO_H__ -#include <asm-generic/gpio.h> -#define MXS_GPIO_NR (bank, nr) ((bank) * 32 + (nr))/* use gpiolib dispatchers */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq#define irq_to_gpio (irq) ((irq) - MXS_GPIO_IRQ_START)
arch/arm/mach-realview/include/mach/gpio.h +1 -5
@@ -1,6 +1,2 @@ -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq
arch/arm/mach-s3c2410/include/mach/gpio.h +1 -4
@@ -11,9 +11,7 @@* published by the Free Software Foundation. */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* some boards require extra gpio capacity to support external
@@ -28,7 +26,6 @@#define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA)#endif -#include <asm-generic/gpio.h> #include <mach/gpio-nrs.h> #include <mach/gpio-fns.h>
arch/arm/mach-s3c64xx/include/mach/gpio.h +1 -5
@@ -12,9 +12,7 @@* published by the Free Software Foundation. */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */
@@ -96,5 +94,3 @@ enum s3c_gpio_number {#define BOARD_NR_GPIOS 16#define ARCH_NR_GPIOS (GPIO_BOARD_START + BOARD_NR_GPIOS) - -#include <asm-generic/gpio.h>
arch/arm/mach-s5p64x0/include/mach/gpio.h +1 -5
@@ -13,9 +13,7 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */
@@ -134,6 +132,4 @@ enum s5p6450_gpio_number {#define ARCH_NR_GPIOS (S5P64X0_GPIO_END + CONFIG_SAMSUNG_GPIO_EXTRA) -#include <asm-generic/gpio.h> -#endif /* __ASM_ARCH_GPIO_H */
arch/arm/mach-s5pc100/include/mach/gpio.h +1 -5
@@ -15,9 +15,7 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */
@@ -146,6 +144,4 @@ enum s5p_gpio_number {/* define the number of gpios we need to the one after the MP04() range */ #define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1) -#include <asm-generic/gpio.h> -#endif /* __ASM_ARCH_GPIO_H */
arch/arm/mach-s5pv210/include/mach/gpio.h +1 -5
@@ -13,9 +13,7 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* Practically, GPIO banks up to MP03 are the configurable gpio banks */
@@ -142,6 +140,4 @@ enum s5p_gpio_number {#define ARCH_NR_GPIOS (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + \ CONFIG_SAMSUNG_GPIO_EXTRA + 1) -#include <asm-generic/gpio.h> -#endif /* __ASM_ARCH_GPIO_H */
arch/arm/mach-shmobile/include/mach/gpio.h +1 -14
@@ -18,20 +18,7 @@#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); -} +#define __ARM_GPIOLIB_TRIVIALstatic inline int gpio_to_irq (unsigned gpio) {
arch/arm/mach-tegra/include/mach/gpio.h +1 -5
@@ -25,11 +25,7 @@#define TEGRA_NR_GPIOS INT_GPIO_NR -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define TEGRA_GPIO_TO_IRQ (gpio) (INT_GPIO_BASE + (gpio))#define TEGRA_IRQ_TO_GPIO (irq) ((irq) - INT_GPIO_BASE)
arch/arm/mach-versatile/include/mach/gpio.h +1 -5
@@ -1,6 +1,2 @@ -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq
arch/arm/mach-vt8500/include/mach/gpio.h +1 -5
@@ -1,6 +1,2 @@ -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq
arch/arm/mach-w90x900/include/mach/gpio.h +1 -4
@@ -15,11 +15,8 @@#include <mach/hardware.h> #include <asm/irq.h> -#include <asm-generic/gpio.h> -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIALstatic inline int gpio_to_irq (unsigned gpio) {
arch/arm/plat-mxc/include/mach/gpio.h +1 -4
@@ -21,7 +21,6 @@#include <linux/spinlock.h> #include <mach/hardware.h> -#include <asm-generic/gpio.h> /* There's a off-by-one betweem the gpio bank number and the gpiochip */
@@ -29,9 +28,7 @@#define IMX_GPIO_NR (bank, nr) (((bank) - 1) * 32 + (nr))/* use gpiolib dispatchers */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq (gpio) (MXC_GPIO_IRQ_START + (gpio))#define irq_to_gpio (irq) ((irq) - MXC_GPIO_IRQ_START)
arch/arm/plat-nomadik/include/plat/gpio.h +1 -10
@@ -12,16 +12,7 @@#ifndef __ASM_PLAT_GPIO_H#define __ASM_PLAT_GPIO_H -#include <asm-generic/gpio.h> - -/* -* These currently cause a function call to happen, they may be optimized -* if needed by adding cpu-specific defines to identify blocks -* (see mach-pxa/include/mach/gpio.h as an example using GPLR etc) -*/ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/*
arch/arm/plat-omap/include/plat/gpio.h +1 -14
@@ -222,20 +222,7 @@ extern void omap_gpio_restore_context(void);#include <linux/errno.h> #include <asm-generic/gpio.h> -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); -} +#define __ARM_GPIOLIB_TRIVIALstatic inline int gpio_to_irq (unsigned gpio) {
arch/arm/plat-orion/include/plat/gpio.h +2 -4
@@ -12,14 +12,12 @@#define __PLAT_GPIO_H#include <linux/init.h> -#include <asm-generic/gpio.h> + +#define __ARM_GPIOLIB_TRIVIAL/* * GENERIC_GPIO primitives. */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep#define gpio_to_irq __gpio_to_irq/*
arch/arm/plat-spear/include/plat/gpio.h +1 -5
@@ -14,11 +14,7 @@#ifndef __PLAT_GPIO_H#define __PLAT_GPIO_H -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq#endif /* __PLAT_GPIO_H */
Signature · 1 line
1.7.4.4
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
Quoted 38 lines · Russell King
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 10 ++++++++++ arch/arm/mach-ep93xx/include/mach/gpio.h | 7 +------arch/arm/include/asm/gpio.h +10
-0@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> +#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ +#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif +#endif /* _ARCH_ARM_GPIO_H */ arch/arm/mach-ep93xx/include/mach/gpio.h +0
-0@@ -100,12 +100,7 @@#define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7)/* new generic GPIO API - see Documentation/gpio.txt */
arch/arm/mach-ep93xx/include/mach/gpio.h line 106
Quoted 10 lines
arch/arm/mach-ep93xx/include/mach/gpio.h +1
-6- -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL/* * Map GPIO A0..A7 (0..7) to irq 64..71,
For ep93xx:
Thanks!
RE: [PATCH 11/13] ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM LinuxQuoted 38 lines · Russell King
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 10 ++++++++++ arch/arm/mach-ep93xx/include/mach/gpio.h | 7 +------arch/arm/include/asm/gpio.h +10
-0@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> +#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ +#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif +#endif /* _ARCH_ARM_GPIO_H */ arch/arm/mach-ep93xx/include/mach/gpio.h +0
-0@@ -100,12 +100,7 @@#define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7)/* new generic GPIO API - see Documentation/gpio.txt */
arch/arm/mach-ep93xx/include/mach/gpio.h line 106
Quoted 10 lines
arch/arm/mach-ep93xx/include/mach/gpio.h +1
-6- -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL/* * Map GPIO A0..A7 (0..7) to irq 64..71,
For ep93xx:
Thanks!
RE: [PATCH 11/13] ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM LinuxQuoted 38 lines · Russell King
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 10 ++++++++++ arch/arm/mach-ep93xx/include/mach/gpio.h | 7 +------arch/arm/include/asm/gpio.h +10
-0@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> +#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ +#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif +#endif /* _ARCH_ARM_GPIO_H */ arch/arm/mach-ep93xx/include/mach/gpio.h +0
-0@@ -100,12 +100,7 @@#define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7)/* new generic GPIO API - see Documentation/gpio.txt */
arch/arm/mach-ep93xx/include/mach/gpio.h line 106
Quoted 10 lines
arch/arm/mach-ep93xx/include/mach/gpio.h +1
-6- -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL/* * Map GPIO A0..A7 (0..7) to irq 64..71,
For ep93xx:
Thanks!
RE: [PATCH 11/13] ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM LinuxQuoted 38 lines · Russell King
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 10 ++++++++++ arch/arm/mach-ep93xx/include/mach/gpio.h | 7 +------arch/arm/include/asm/gpio.h +10
-0@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> +#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ +#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif +#endif /* _ARCH_ARM_GPIO_H */ arch/arm/mach-ep93xx/include/mach/gpio.h +0
-0@@ -100,12 +100,7 @@#define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7)/* new generic GPIO API - see Documentation/gpio.txt */
arch/arm/mach-ep93xx/include/mach/gpio.h line 106
Quoted 10 lines
arch/arm/mach-ep93xx/include/mach/gpio.h +1
-6- -#include <asm-generic/gpio.h> - -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL/* * Map GPIO A0..A7 (0..7) to irq 64..71,
For ep93xx:
Thanks!
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM LinuxQuoted 8 lines · Russell King - ARM Linux
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>--- arch/arm/mach-msm/include/mach/gpio.h | 5 +----
For msm (msm8660):
Tested-by David Brown <[email protected]>
Acked-by David Brown <[email protected]>
Signature · 2 lines
Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM Linux2011/8/9 Russell King - ARM Linux <[email protected]>:
Quoted 6 lines
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. ?This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>
reaks compile of plat-nomadik due to missing u32, feel free to fold in the below fix. With that it's
Tested-by Linus Walleij <[email protected]>
for Nomadik, U300 and Ux500.
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM LinuxQuoted 7 lines · Russell King - ARM Linux
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>
Acked-by Kukjin Kim <[email protected]>
on following Samsung stuff...
As a note, there were duplicated e-mail address Grant and Nicolas in Cc ;) I just pushed 'reply all' :)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 2 lines
--- arch/arm/include/asm/gpio.h | 10 ++++++++++
...
Quoted 1 line
arch/arm/mach-exynos4/include/mach/gpio.h | 5 +----
...
Quoted 11 lines
arch/arm/mach-s3c2410/include/mach/gpio.h | 5 +---- arch/arm/mach-s3c64xx/include/mach/gpio.h | 6 +----- arch/arm/mach-s5p64x0/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pc100/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pv210/include/mach/gpio.h | 6 +-----arch/arm/include/asm/gpio.h +0
-0
arch/arm/include/asm/gpio.h line 8
Quoted 5 lines
arch/arm/include/asm/gpio.h +2
-0@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> +#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h
*/
Quoted 121 lines
arch/arm/include/asm/gpio.h +8
-0+#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif +#endif /* _ARCH_ARM_GPIO_H */ arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/gpio.h +0
-0
exynos4/include/mach/gpio.h
index be9266b..b2e3595 100644arch/arm/mach-exynos4/include/mach/gpio.h +1
-4@@ -13,9 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep#define gpio_to_irq __gpio_to_irq/* Practically, GPIO banks up to GPZ are the configurable gpio banks */ @@ -151,6 +148,6 @@ enum s5p_gpio_number {#define ARCH_NR_GPIOS (EXYNOS4_GPZ (EXYNOS4_GPIO_Z_NR ) + \ CONFIG_SAMSUNG_GPIO_EXTRA + 1) -#include <asm-generic/gpio.h> +#define __ARM_GPIOLIB_TRIVIAL#endif /*
__ASM_ARCH_GPIO_H*/arch/arm/mach- renamed from arch/arm/mach-s3c2410/include/mach/gpio.h +0
-0
s3c2410/include/mach/gpio.h
index f7f6b07..998ef4c 100644arch/arm/mach-s3c2410/include/mach/gpio.h +1
-4@@ -11,9 +11,7 @@* published by the Free Software Foundation. */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* some boards require extra gpio capacity to support external @@ -28,7 +26,6 @@#define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA)#endif -#include <asm-generic/gpio.h> #include <mach/gpio-nrs.h> #include <mach/gpio-fns.h> arch/arm/mach- renamed from arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-0
s3c64xx/include/mach/gpio.h
index 0d46e99..6958b3f 100644arch/arm/mach-s3c64xx/include/mach/gpio.h +1
-5@@ -12,9 +12,7 @@* published by the Free Software Foundation. */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ @@ -96,5 +94,3 @@ enum s3c_gpio_number {#define BOARD_NR_GPIOS 16#define ARCH_NR_GPIOS (GPIO_BOARD_START + BOARD_NR_GPIOS) - -#include <asm-generic/gpio.h> arch/arm/mach- renamed from arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-0
s5p64x0/include/mach/gpio.h
index adb5f29..a25160b 100644arch/arm/mach-s5p64x0/include/mach/gpio.h +1
-5@@ -13,9 +13,7 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ @@ -134,6 +132,4 @@ enum s5p6450_gpio_number {#define ARCH_NR_GPIOS (S5P64X0_GPIO_END + CONFIG_SAMSUNG_GPIO_EXTRA) -#include <asm-generic/gpio.h> -#endif /*
__ASM_ARCH_GPIO_H*/arch/arm/mach- renamed from arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
s5pc100/include/mach/gpio.h
index 29a8a12..f515bfb 100644arch/arm/mach-s5pc100/include/mach/gpio.h +1
-3@@ -15,9 +15,7 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */
arch/arm/mach-s5pc100/include/mach/gpio.h enum s5p_gpio_number { · line 144
Quoted 1 line
arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0@@ -146,6 +144,4 @@ enum s5p_gpio_number {/* define the number of gpios we need to the one after the MP04() range
*/
Quoted 29 lines
arch/arm/mach-s5pc100/include/mach/gpio.h +0
-2#define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1) -#include <asm-generic/gpio.h> -#endif /* __ASM_ARCH_GPIO_H */ arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/gpio.h +0
-0
s5pv210/include/mach/gpio.h
index a5a1e33..27f2139 100644arch/arm/mach-s5pv210/include/mach/gpio.h +1
-5@@ -13,9 +13,7 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* Practically, GPIO banks up to MP03 are the configurable gpio banks */ @@ -142,6 +140,4 @@ enum s5p_gpio_number {#define ARCH_NR_GPIOS (S5PV210_MP05 (S5PV210_GPIO_MP05_NR ) + \CONFIG_SAMSUNG_GPIO_EXTRA +1 ) -#include <asm-generic/gpio.h> -#endif /*
__ASM_ARCH_GPIO_H*/
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
Quoted 11 lines · Kukjin Kim
Quoted 7 lines · Russell King - ARM Linux
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>Acked-by Kukjin Kim <[email protected]>on following Samsung stuff...
Thanks.
Quoted 2 lines
As a note, there were duplicated e-mail address Grant and Nicolas in Cc ;) I just pushed 'reply all' :)
That's not in the original email, and isn't in any one elses replies....
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
Quoted 4 lines · Russell King - ARM Linux
Quoted 2 lines
As a note, there were duplicated e-mail address Grant and Nicolas in Cc ;) I just pushed 'reply all' :)
That's not in the original email, and isn't in any one elses replies....
The original patches have a doubled CC line. I think most mailers eliminate the duplicates, though.
David
Signature · 2 lines
Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
A message that is not in the archive (sent off-list or not yet received): E1QqhM1-0003af-U5-eh5Bv4kxaXIANfyc6IWni62ZND6+EDdj@public.gmane.org
Kukjin Kim
Acked-byRE: [PATCH 11/13] ARM: gpio: consolidate trivial gpiolib implementations
Quoted 7 lines · Russell King - ARM Linux
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <rmk+kernel-lFZ/[email protected]>
Acked-by Kukjin Kim <[email protected]>
on following Samsung stuff...
As a note, there were duplicated e-mail address Grant and Nicolas in Cc ;) I just pushed 'reply all' :)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 2 lines
--- arch/arm/include/asm/gpio.h | 10 ++++++++++
...
Quoted 1 line
arch/arm/mach-exynos4/include/mach/gpio.h | 5 +----
...
Quoted 11 lines
arch/arm/mach-s3c2410/include/mach/gpio.h | 5 +---- arch/arm/mach-s3c64xx/include/mach/gpio.h | 6 +----- arch/arm/mach-s5p64x0/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pc100/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pv210/include/mach/gpio.h | 6 +-----arch/arm/include/asm/gpio.h +0
-0
arch/arm/include/asm/gpio.h line 8
Quoted 5 lines
arch/arm/include/asm/gpio.h +2
-0@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> +#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h
*/
Quoted 121 lines
arch/arm/include/asm/gpio.h +8
-0+#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif +#endif /* _ARCH_ARM_GPIO_H */ arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/gpio.h +0
-0
exynos4/include/mach/gpio.h
index be9266b..b2e3595 100644arch/arm/mach-exynos4/include/mach/gpio.h +1
-4@@ -13,9 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep#define gpio_to_irq __gpio_to_irq/* Practically, GPIO banks up to GPZ are the configurable gpio banks */ @@ -151,6 +148,6 @@ enum s5p_gpio_number {#define ARCH_NR_GPIOS (EXYNOS4_GPZ (EXYNOS4_GPIO_Z_NR ) + \ CONFIG_SAMSUNG_GPIO_EXTRA + 1) -#include <asm-generic/gpio.h> +#define __ARM_GPIOLIB_TRIVIAL#endif /*
__ASM_ARCH_GPIO_H*/arch/arm/mach- renamed from arch/arm/mach-s3c2410/include/mach/gpio.h +0
-0
s3c2410/include/mach/gpio.h
index f7f6b07..998ef4c 100644arch/arm/mach-s3c2410/include/mach/gpio.h +1
-4@@ -11,9 +11,7 @@* published by the Free Software Foundation. */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* some boards require extra gpio capacity to support external @@ -28,7 +26,6 @@#define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA)#endif -#include <asm-generic/gpio.h> #include <mach/gpio-nrs.h> #include <mach/gpio-fns.h> arch/arm/mach- renamed from arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-0
s3c64xx/include/mach/gpio.h
index 0d46e99..6958b3f 100644arch/arm/mach-s3c64xx/include/mach/gpio.h +1
-5@@ -12,9 +12,7 @@* published by the Free Software Foundation. */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ @@ -96,5 +94,3 @@ enum s3c_gpio_number {#define BOARD_NR_GPIOS 16#define ARCH_NR_GPIOS (GPIO_BOARD_START + BOARD_NR_GPIOS) - -#include <asm-generic/gpio.h> arch/arm/mach- renamed from arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-0
s5p64x0/include/mach/gpio.h
index adb5f29..a25160b 100644arch/arm/mach-s5p64x0/include/mach/gpio.h +1
-5@@ -13,9 +13,7 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ @@ -134,6 +132,4 @@ enum s5p6450_gpio_number {#define ARCH_NR_GPIOS (S5P64X0_GPIO_END + CONFIG_SAMSUNG_GPIO_EXTRA) -#include <asm-generic/gpio.h> -#endif /*
__ASM_ARCH_GPIO_H*/arch/arm/mach- renamed from arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
s5pc100/include/mach/gpio.h
index 29a8a12..f515bfb 100644arch/arm/mach-s5pc100/include/mach/gpio.h +1
-3@@ -15,9 +15,7 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */
arch/arm/mach-s5pc100/include/mach/gpio.h enum s5p_gpio_number { · line 144
Quoted 1 line
arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0@@ -146,6 +144,4 @@ enum s5p_gpio_number {/* define the number of gpios we need to the one after the MP04() range
*/
Quoted 29 lines
arch/arm/mach-s5pc100/include/mach/gpio.h +0
-2#define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1) -#include <asm-generic/gpio.h> -#endif /* __ASM_ARCH_GPIO_H */ arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/gpio.h +0
-0
s5pv210/include/mach/gpio.h
index a5a1e33..27f2139 100644arch/arm/mach-s5pv210/include/mach/gpio.h +1
-5@@ -13,9 +13,7 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL#define gpio_to_irq __gpio_to_irq/* Practically, GPIO banks up to MP03 are the configurable gpio banks */ @@ -142,6 +140,4 @@ enum s5p_gpio_number {#define ARCH_NR_GPIOS (S5PV210_MP05 (S5PV210_GPIO_MP05_NR ) + \CONFIG_SAMSUNG_GPIO_EXTRA +1 ) -#include <asm-generic/gpio.h> -#endif /*
__ASM_ARCH_GPIO_H*/
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM LinuxQuoted 41 lines · Russell King - ARM Linux
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 10 ++++++++++ arch/arm/mach-at91/include/mach/gpio.h | 5 +---- arch/arm/mach-ep93xx/include/mach/gpio.h | 7 +------ arch/arm/mach-exynos4/include/mach/gpio.h | 5 +---- arch/arm/mach-gemini/include/mach/gpio.h | 5 +---- arch/arm/mach-ks8695/include/mach/gpio.h | 11 ++--------- arch/arm/mach-lpc32xx/include/mach/gpio.h | 17 +---------------- arch/arm/mach-msm/include/mach/gpio.h | 5 +---- arch/arm/mach-mxs/include/mach/gpio.h | 6 +----- arch/arm/mach-realview/include/mach/gpio.h | 6 +----- arch/arm/mach-s3c2410/include/mach/gpio.h | 5 +---- arch/arm/mach-s3c64xx/include/mach/gpio.h | 6 +----- arch/arm/mach-s5p64x0/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pc100/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pv210/include/mach/gpio.h | 6 +----- arch/arm/mach-shmobile/include/mach/gpio.h | 15 +-------------- arch/arm/mach-tegra/include/mach/gpio.h | 6 +----- arch/arm/mach-versatile/include/mach/gpio.h | 6 +----- arch/arm/mach-vt8500/include/mach/gpio.h | 6 +----- arch/arm/mach-w90x900/include/mach/gpio.h | 5 +---- arch/arm/plat-mxc/include/mach/gpio.h | 5 +---- arch/arm/plat-nomadik/include/plat/gpio.h | 11 +---------- arch/arm/plat-omap/include/plat/gpio.h | 15 +-------------- arch/arm/plat-orion/include/plat/gpio.h | 6 ++---- arch/arm/plat-spear/include/plat/gpio.h | 6 +----- 25 files changed, 36 insertions(+), 151 deletions(-)arch/arm/include/asm/gpio.h +0
-0@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h>
arch/arm/include/asm/gpio.h line 15
Quoted 10 lines
arch/arm/include/asm/gpio.h +9
-0+#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ +#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif
could that be a selectable symbol ? Something like:
CONFIG_HAS_ARM_TRIVIAL_GPIO
then on Kconfig you just:
select HAS_ARM_TIVIAL_GPIO or something ?
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 490 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110811/69b04482/attachment.sig>
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
Quoted 21 lines · Felipe Balbi
Quoted 7 lines · Russell King - ARM Linux
arch/arm/include/asm/gpio.h +0
-0@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> arch/arm/include/asm/gpio.h line 15
Quoted 10 lines
arch/arm/include/asm/gpio.h +9
-0+#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ +#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif could that be a selectable symbol ? Something like:
Quoted 5 lines
CONFIG_HAS_ARM_TRIVIAL_GPIOthen on
Kconfigyou just:select
HAS_ARM_TIVIAL_GPIOor something ?
That makes things more complicated, because that involves digging through a lot of platform code in a couple of places to work out exactly when we need this - and it crosses the boundary to arch/sh too.
So I'd prefer to keep this simple.
The long-term goal is to remove that symbol entirely, but in order to do that we need to kill of the "optimized" on-board SoC stuff in those (few) gpio.h which don't have the symbol selected. This is rather necessary to progress towards the consolidated kernel. (Re-inventing gpiolib by moving them out of line isn't a good idea...)
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
Hi,
Quoted 32 lines · Russell King - ARM Linux
Quoted 21 lines · Felipe Balbi
Quoted 7 lines · Russell King - ARM Linux
arch/arm/include/asm/gpio.h +0
-0@@ -4,4 +4,14 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> arch/arm/include/asm/gpio.h line 15
Quoted 10 lines
arch/arm/include/asm/gpio.h +9
-0+#ifdef __ARM_GPIOLIB_TRIVIAL +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ +#include <asm-generic/gpio.h> + +/* The trivial gpiolib dispatchers */ +#define gpio_get_value __gpio_get_value +#define gpio_set_value __gpio_set_value +#define gpio_cansleep __gpio_cansleep +#endif could that be a selectable symbol ? Something like:
Quoted 5 lines
CONFIG_HAS_ARM_TRIVIAL_GPIOthen on
Kconfigyou just:select
HAS_ARM_TIVIAL_GPIOor something ?That makes things more complicated, because that involves digging through a lot of platform code in a couple of places to work out exactly when we need this - and it crosses the boundary to
arch/shtoo.
Quoted 7 lines
So I'd prefer to keep this simple.
The long-term goal is to remove that symbol entirely, but in order to do that we need to kill of the "optimized" on-board SoC stuff in those (few)
gpio.hwhich don't have the symbol selected. This is rather necessary to progress towards the consolidated kernel. (Re-inventing gpiolib by moving them out of line isn't a good idea...)
Ok, I understand.
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 490 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110811/e3ddd6ae/attachment.sig>
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM LinuxQuoted 25 lines · Russell King - ARM Linux
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 10 ++++++++++ arch/arm/mach-at91/include/mach/gpio.h | 5 +---- arch/arm/mach-ep93xx/include/mach/gpio.h | 7 +------ arch/arm/mach-exynos4/include/mach/gpio.h | 5 +---- arch/arm/mach-gemini/include/mach/gpio.h | 5 +---- arch/arm/mach-ks8695/include/mach/gpio.h | 11 ++--------- arch/arm/mach-lpc32xx/include/mach/gpio.h | 17 +---------------- arch/arm/mach-msm/include/mach/gpio.h | 5 +---- arch/arm/mach-mxs/include/mach/gpio.h | 6 +----- arch/arm/mach-realview/include/mach/gpio.h | 6 +----- arch/arm/mach-s3c2410/include/mach/gpio.h | 5 +---- arch/arm/mach-s3c64xx/include/mach/gpio.h | 6 +----- arch/arm/mach-s5p64x0/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pc100/include/mach/gpio.h | 6 +----- arch/arm/mach-s5pv210/include/mach/gpio.h | 6 +----- arch/arm/mach-shmobile/include/mach/gpio.h | 15 +-------------- arch/arm/mach-tegra/include/mach/gpio.h | 6 +----- arch/arm/mach-versatile/include/mach/gpio.h | 6 +-----
Quoted 9 lines
arch/arm/mach-vt8500/include/mach/gpio.h | 6 +----- arch/arm/mach-w90x900/include/mach/gpio.h | 5 +---- arch/arm/plat-mxc/include/mach/gpio.h | 5 +---- arch/arm/plat-nomadik/include/plat/gpio.h | 11 +---------- arch/arm/plat-omap/include/plat/gpio.h | 15 +-------------- arch/arm/plat-orion/include/plat/gpio.h | 6 ++---- arch/arm/plat-spear/include/plat/gpio.h | 6 +----- 25 files changed, 36 insertions(+), 151 deletions(-)
For mxs and mxc:
Tested-by Shawn Guo <[email protected]>
Signature · 2 lines
Regards, Shawn
PATCH 11/13 ARM: gpio: consolidate trivial gpiolib implementations
In reply to Russell King - ARM LinuxQuoted 6 lines · Russell King - ARM Linux
Consolidate 24 trivial gpiolib implementions out of
mach/gpio.hintoasm/gpio.h. This is basically the include ofasm-generic/gpio.hand the definition ofgpio_get_value,gpio_set_value, andgpio_cansleepas described inDocumentation/gpio.txtSigned-off-by Russell King <[email protected]>
For OMAP:
Tested-by Kevin Hilman <[email protected]>
Acked-by Kevin Hilman <[email protected]>
Also goes for patches 12 & 13 also.
Kevin
PATCH 12/13 ARM: gpio: consolidate gpio_to_irq
In reply to Russell King - ARM LinuxMany of the gpio_to_irq implementations use the gpiolib version of this function. Provide the standard gpiolib gpio_to_irq() for everyone, but allow platforms to override it if they wish. Add the neccessary overrides for those platforms which do not use the standard definition.
Signed-off-by Russell King <[email protected]>
--- arch/arm/include/asm/gpio.h | 9 +++++++++ arch/arm/mach-davinci/include/mach/gpio.h | 5 ----- arch/arm/mach-exynos4/include/mach/gpio.h | 2 -- arch/arm/mach-ixp4xx/include/mach/gpio.h | 1 + arch/arm/mach-ks8695/include/mach/gpio.h | 2 -- arch/arm/mach-lpc32xx/include/mach/gpio.h | 5 ----- arch/arm/mach-msm/include/mach/gpio.h | 2 -- arch/arm/mach-mxs/include/mach/gpio.h | 1 - arch/arm/mach-realview/include/mach/gpio.h | 1 - arch/arm/mach-s3c2410/include/mach/gpio.h | 1 - arch/arm/mach-s3c64xx/include/mach/gpio.h | 1 - arch/arm/mach-s5p64x0/include/mach/gpio.h | 1 - arch/arm/mach-s5pc100/include/mach/gpio.h | 1 - arch/arm/mach-s5pv210/include/mach/gpio.h | 1 - arch/arm/mach-shmobile/include/mach/gpio.h | 5 ----- arch/arm/mach-tegra/include/mach/gpio.h | 1 + arch/arm/mach-u300/include/mach/gpio.h | 1 + arch/arm/mach-versatile/include/mach/gpio.h | 1 - arch/arm/mach-vt8500/include/mach/gpio.h | 1 - arch/arm/mach-w90x900/include/mach/gpio.h | 1 + arch/arm/plat-nomadik/include/plat/gpio.h | 1 - arch/arm/plat-omap/include/plat/gpio.h | 5 ----- arch/arm/plat-orion/include/plat/gpio.h | 5 ----- arch/arm/plat-spear/include/plat/gpio.h | 1 - 24 files changed, 13 insertions(+), 42 deletions(-)
arch/arm/include/asm/gpio.h +9 -0
@@ -14,4 +14,13 @@#define gpio_cansleep __gpio_cansleep#endif +/* +* Provide a default gpio_to_irq() which should satisfy every case. +* However, some platforms want to do this differently, so allow them +* to override it. +*/ +#ifndef gpio_to_irq +#define gpio_to_irq __gpio_to_irq +#endif +#endif /* _ARCH_ARM_GPIO_H */
arch/arm/mach-davinci/include/mach/gpio.h +0 -5
@@ -147,11 +147,6 @@ static inline int gpio_cansleep(unsigned gpio)return __gpio_cansleep (gpio); } -static inline int gpio_to_irq (unsigned gpio) -{ -return __gpio_to_irq (gpio); -} -static inline int irq_to_gpio (unsigned irq) {/* don't support the reverse mapping */
arch/arm/mach-exynos4/include/mach/gpio.h +0 -2
@@ -13,8 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_to_irq __gpio_to_irq -/* Practically, GPIO banks up to GPZ are the configurable gpio banks */ /* GPIO bank sizes */
arch/arm/mach-ixp4xx/include/mach/gpio.h +1 -0
@@ -70,6 +70,7 @@ static inline void gpio_set_value(unsigned gpio, int value)#include <asm-generic/gpio.h> /* cansleep wrappers */ extern int gpio_to_irq (int gpio); +#define gpio_to_irq gpio_to_irqextern int irq_to_gpio (unsigned int irq);#endif
arch/arm/mach-ks8695/include/mach/gpio.h +0 -2
@@ -40,8 +40,6 @@ extern int ks8695_gpio_interrupt(unsigned int pin, unsigned int type);*/ extern int irq_to_gpio (unsigned int irq); -#define gpio_to_irq __gpio_to_irq -#define __ARM_GPIOLIB_TRIVIAL/* Register the GPIOs */
arch/arm/mach-lpc32xx/include/mach/gpio.h +0 -5
@@ -51,9 +51,4 @@#define __ARM_GPIOLIB_TRIVIAL -static inline int gpio_to_irq (unsigned gpio) -{ -return __gpio_to_irq (gpio); -} -#endif
arch/arm/mach-msm/include/mach/gpio.h +0 -2
@@ -18,6 +18,4 @@#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq -#endif /* __ASM_ARCH_MSM_GPIO_H */
arch/arm/mach-mxs/include/mach/gpio.h +0 -1
@@ -24,7 +24,6 @@/* use gpiolib dispatchers */ #define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq#define irq_to_gpio (irq) ((irq) - MXS_GPIO_IRQ_START)
arch/arm/mach-realview/include/mach/gpio.h +0 -1
@@ -1,2 +1 @@#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq
arch/arm/mach-s3c2410/include/mach/gpio.h +0 -1
@@ -12,7 +12,6 @@*/ #define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* some boards require extra gpio capacity to support external * devices that need GPIO.
arch/arm/mach-s3c64xx/include/mach/gpio.h +0 -1
@@ -13,7 +13,6 @@*/ #define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ #define S3C64XX_GPIO_A_NR (8)
arch/arm/mach-s5p64x0/include/mach/gpio.h +0 -1
@@ -14,7 +14,6 @@#define __ASM_ARCH_GPIO_H __FILE__#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */
arch/arm/mach-s5pc100/include/mach/gpio.h +0 -1
@@ -16,7 +16,6 @@#define __ASM_ARCH_GPIO_H __FILE__#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ #define S5PC100_GPIO_A0_NR (8)
arch/arm/mach-s5pv210/include/mach/gpio.h +0 -1
@@ -14,7 +14,6 @@#define __ASM_ARCH_GPIO_H __FILE__#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* Practically, GPIO banks up to MP03 are the configurable gpio banks */
arch/arm/mach-shmobile/include/mach/gpio.h +0 -5
@@ -20,11 +20,6 @@#define __ARM_GPIOLIB_TRIVIAL -static inline int gpio_to_irq (unsigned gpio) -{ -return __gpio_to_irq (gpio); -} -static inline int irq_to_gpio (unsigned int irq) {return -ENOSYS ;
arch/arm/mach-tegra/include/mach/gpio.h +1 -0
@@ -36,6 +36,7 @@ static inline int gpio_to_irq(unsigned int gpio)return INT_GPIO_BASE + gpio;return -EINVAL ; } +#define gpio_to_irq gpio_to_irqstatic inline int irq_to_gpio (unsigned int irq) {
arch/arm/mach-u300/include/mach/gpio.h +1 -0
@@ -281,6 +281,7 @@ static inline unsigned gpio_to_irq(unsigned gpio) {return PIN_TO_PORT (gpio) +IRQ_U300_GPIO_PORT0 ; } +#define gpio_to_irq gpio_to_irqstatic inline unsigned irq_to_gpio (unsigned irq) {
arch/arm/mach-versatile/include/mach/gpio.h +0 -1
@@ -1,2 +1 @@#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq
arch/arm/mach-vt8500/include/mach/gpio.h +0 -1
@@ -1,2 +1 @@#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq
arch/arm/mach-w90x900/include/mach/gpio.h +1 -0
@@ -22,6 +22,7 @@ static inline int gpio_to_irq(unsigned gpio) {return gpio; } +#define gpio_to_irq gpio_to_irqstatic inline int irq_to_gpio (unsigned irq) {
arch/arm/plat-nomadik/include/plat/gpio.h +0 -1
@@ -13,7 +13,6 @@#define __ASM_PLAT_GPIO_H#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* * "nmk_gpio" and "NMK_GPIO" stand for "Nomadik GPIO", leaving
arch/arm/plat-omap/include/plat/gpio.h +0 -5
@@ -224,11 +224,6 @@ extern void omap_gpio_restore_context(void);#define __ARM_GPIOLIB_TRIVIAL -static inline int gpio_to_irq (unsigned gpio) -{ -return __gpio_to_irq (gpio); -} -static inline int irq_to_gpio (unsigned irq) {int tmp;
arch/arm/plat-orion/include/plat/gpio.h +0 -5
@@ -16,11 +16,6 @@#define __ARM_GPIOLIB_TRIVIAL/* -* GENERIC_GPIO primitives. -*/ -#define gpio_to_irq __gpio_to_irq - -/* * Orion-specific GPIO API extensions. */ void orion_gpio_set_unused (unsigned pin);
arch/arm/plat-spear/include/plat/gpio.h +0 -1
@@ -15,6 +15,5 @@#define __PLAT_GPIO_H#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq#endif /* __PLAT_GPIO_H */
Signature · 1 line
1.7.4.4
PATCH 12/13 ARM: gpio: consolidate gpio_to_irq
Quoted 7 lines · Russell King - ARM Linux
Many of the
gpio_to_irqimplementations use the gpiolib version of this function. Provide the standard gpiolibgpio_to_irq()for everyone, but allow platforms to override it if they wish. Add the neccessary overrides for those platforms which do not use the standard definition.Signed-off-by Russell King <[email protected]>
Acked-by Kukjin Kim <[email protected]>
on following Samsung stuff :)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 110 lines
--- arch/arm/include/asm/gpio.h | 9 +++++++++arch/arm/mach-exynos4/include/mach/gpio.h | 2 --arch/arm/mach-s3c2410/include/mach/gpio.h | 1 - arch/arm/mach-s3c64xx/include/mach/gpio.h | 1 - arch/arm/mach-s5p64x0/include/mach/gpio.h | 1 - arch/arm/mach-s5pc100/include/mach/gpio.h | 1 - arch/arm/mach-s5pv210/include/mach/gpio.h | 1 -arch/arm/include/asm/gpio.h +9
-0@@ -14,4 +14,13 @@#define gpio_cansleep __gpio_cansleep#endif +/* +* Provide a default gpio_to_irq() which should satisfy every case. +* However, some platforms want to do this differently, so allow them +* to override it. +*/ +#ifndef gpio_to_irq +#define gpio_to_irq __gpio_to_irq +#endif +#endif /* _ARCH_ARM_GPIO_H */ arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/gpio.h +0
-0
exynos4/include/mach/gpio.h
index b2e3595..b91e8b2 100644arch/arm/mach-exynos4/include/mach/gpio.h +0
-2@@ -13,8 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_to_irq __gpio_to_irq -/* Practically, GPIO banks up to GPZ are the configurable gpio banks */ /* GPIO bank sizes */ arch/arm/mach- renamed from arch/arm/mach-s3c2410/include/mach/gpio.h +0
-0
s3c2410/include/mach/gpio.h
index 998ef4c..d502d17 100644arch/arm/mach-s3c2410/include/mach/gpio.h +0
-1@@ -12,7 +12,6 @@*/ #define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* some boards require extra gpio capacity to support external * devices that need GPIO. arch/arm/mach- renamed from arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-0
s3c64xx/include/mach/gpio.h
index 6958b3f..3a8857c 100644arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-1@@ -13,7 +13,6 @@*/ #define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ #define S3C64XX_GPIO_A_NR (8)arch/arm/mach- renamed from arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-0
s5p64x0/include/mach/gpio.h
index a25160b..c3a6aa0 100644arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-1@@ -14,7 +14,6 @@#define __ASM_ARCH_GPIO_H __FILE__#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ arch/arm/mach- renamed from arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
s5pc100/include/mach/gpio.h
index f515bfb..0e75641 100644arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1@@ -16,7 +16,6 @@#define __ASM_ARCH_GPIO_H __FILE__#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ #define S5PC100_GPIO_A0_NR (8)arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/gpio.h +0
-0
s5pv210/include/mach/gpio.h
index 27f2139..d348ee2 100644arch/arm/mach-s5pv210/include/mach/gpio.h +0
-1@@ -14,7 +14,6 @@#define __ASM_ARCH_GPIO_H __FILE__#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* Practically, GPIO banks up to MP03 are the configurable gpio banks */
A message that is not in the archive (sent off-list or not yet received): E1QqhMM-0003aj-C7-eh5Bv4kxaXIANfyc6IWni62ZND6+EDdj@public.gmane.org
Kukjin Kim
Acked-byRE: [PATCH 12/13] ARM: gpio: consolidate gpio_to_irq
Quoted 7 lines · Russell King - ARM Linux
Many of the
gpio_to_irqimplementations use the gpiolib version of this function. Provide the standard gpiolibgpio_to_irq()for everyone, but allow platforms to override it if they wish. Add the neccessary overrides for those platforms which do not use the standard definition.Signed-off-by Russell King <rmk+kernel-lFZ/[email protected]>
Acked-by Kukjin Kim <[email protected]>
on following Samsung stuff :)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 110 lines
--- arch/arm/include/asm/gpio.h | 9 +++++++++arch/arm/mach-exynos4/include/mach/gpio.h | 2 --arch/arm/mach-s3c2410/include/mach/gpio.h | 1 - arch/arm/mach-s3c64xx/include/mach/gpio.h | 1 - arch/arm/mach-s5p64x0/include/mach/gpio.h | 1 - arch/arm/mach-s5pc100/include/mach/gpio.h | 1 - arch/arm/mach-s5pv210/include/mach/gpio.h | 1 -arch/arm/include/asm/gpio.h +9
-0@@ -14,4 +14,13 @@#define gpio_cansleep __gpio_cansleep#endif +/* +* Provide a default gpio_to_irq() which should satisfy every case. +* However, some platforms want to do this differently, so allow them +* to override it. +*/ +#ifndef gpio_to_irq +#define gpio_to_irq __gpio_to_irq +#endif +#endif /* _ARCH_ARM_GPIO_H */ arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/gpio.h +0
-0
exynos4/include/mach/gpio.h
index b2e3595..b91e8b2 100644arch/arm/mach-exynos4/include/mach/gpio.h +0
-2@@ -13,8 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_to_irq __gpio_to_irq -/* Practically, GPIO banks up to GPZ are the configurable gpio banks */ /* GPIO bank sizes */ arch/arm/mach- renamed from arch/arm/mach-s3c2410/include/mach/gpio.h +0
-0
s3c2410/include/mach/gpio.h
index 998ef4c..d502d17 100644arch/arm/mach-s3c2410/include/mach/gpio.h +0
-1@@ -12,7 +12,6 @@*/ #define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* some boards require extra gpio capacity to support external * devices that need GPIO. arch/arm/mach- renamed from arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-0
s3c64xx/include/mach/gpio.h
index 6958b3f..3a8857c 100644arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-1@@ -13,7 +13,6 @@*/ #define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ #define S3C64XX_GPIO_A_NR (8)arch/arm/mach- renamed from arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-0
s5p64x0/include/mach/gpio.h
index a25160b..c3a6aa0 100644arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-1@@ -14,7 +14,6 @@#define __ASM_ARCH_GPIO_H __FILE__#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ arch/arm/mach- renamed from arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
s5pc100/include/mach/gpio.h
index f515bfb..0e75641 100644arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1@@ -16,7 +16,6 @@#define __ASM_ARCH_GPIO_H __FILE__#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* GPIO bank sizes */ #define S5PC100_GPIO_A0_NR (8)arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/gpio.h +0
-0
s5pv210/include/mach/gpio.h
index 27f2139..d348ee2 100644arch/arm/mach-s5pv210/include/mach/gpio.h +0
-1@@ -14,7 +14,6 @@#define __ASM_ARCH_GPIO_H __FILE__#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq __gpio_to_irq/* Practically, GPIO banks up to MP03 are the configurable gpio banks */
PATCH 13/13 ARM: gpio: make trivial GPIOLIB implementation the default
In reply to Russell King - ARM LinuxRather than marking the mach/gpio.h header files which want to use the trivial GPIOLIB implementation, mark those which do not want to use it instead. This means that by default, you get the trivial implementation and only have to do something extra if you need to. This should encourage the use of the trivial default implementation.
As an additional bonus, several gpio.h header files become empty.
Signed-off-by Russell King <[email protected]>
--- arch/arm/include/asm/gpio.h | 2 +- arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 ++ arch/arm/mach-at91/include/mach/gpio.h | 2 -- arch/arm/mach-davinci/include/mach/gpio.h | 2 ++ arch/arm/mach-ep93xx/include/mach/gpio.h | 3 --- arch/arm/mach-exynos4/include/mach/gpio.h | 2 -- arch/arm/mach-gemini/include/mach/gpio.h | 2 -- arch/arm/mach-ixp4xx/include/mach/gpio.h | 2 ++ arch/arm/mach-ks8695/include/mach/gpio.h | 2 -- arch/arm/mach-lpc32xx/include/mach/gpio.h | 2 -- arch/arm/mach-msm/include/mach/gpio.h | 22 +--------------------- arch/arm/mach-mxs/include/mach/gpio.h | 3 --- arch/arm/mach-realview/include/mach/gpio.h | 2 +- arch/arm/mach-s3c2410/include/mach/gpio.h | 2 -- arch/arm/mach-s3c64xx/include/mach/gpio.h | 2 -- arch/arm/mach-s5p64x0/include/mach/gpio.h | 2 -- arch/arm/mach-s5pc100/include/mach/gpio.h | 2 -- arch/arm/mach-s5pv210/include/mach/gpio.h | 2 -- arch/arm/mach-sa1100/include/mach/gpio.h | 2 ++ arch/arm/mach-shmobile/include/mach/gpio.h | 6 ++++-- arch/arm/mach-tegra/include/mach/gpio.h | 2 -- arch/arm/mach-u300/include/mach/gpio.h | 2 ++ arch/arm/mach-versatile/include/mach/gpio.h | 2 +- arch/arm/mach-vt8500/include/mach/gpio.h | 2 +- arch/arm/mach-w90x900/include/mach/gpio.h | 2 -- arch/arm/plat-mxc/include/mach/gpio.h | 3 --- arch/arm/plat-nomadik/include/plat/gpio.h | 2 -- arch/arm/plat-omap/include/plat/gpio.h | 2 -- arch/arm/plat-orion/include/plat/gpio.h | 2 -- arch/arm/plat-pxa/include/plat/gpio.h | 2 ++ arch/arm/plat-spear/include/plat/gpio.h | 20 +------------------- 31 files changed, 22 insertions(+), 85 deletions(-)
arch/arm/include/asm/gpio.h +1 -1
@@ -4,7 +4,7 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> -#ifdef __ARM_GPIOLIB_TRIVIAL +#ifndef __ARM_GPIOLIB_COMPLEX/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ #include <asm-generic/gpio.h>
arch/arm/include/asm/hardware/iop3xx-gpio.h +2 -0
@@ -28,6 +28,8 @@#include <mach/hardware.h> #include <asm-generic/gpio.h> +#define __ARM_GPIOLIB_COMPLEX +#define IOP3XX_N_GPIOS 8static inline int gpio_get_value (unsigned gpio)
arch/arm/mach-at91/include/mach/gpio.h +0 -2
@@ -215,8 +215,6 @@ extern void at91_gpio_resume(void);#include <asm/errno.h> -#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq (gpio) (gpio)#define irq_to_gpio (irq) (irq)
arch/arm/mach-davinci/include/mach/gpio.h +2 -0
@@ -21,6 +21,8 @@#include <mach/irqs.h> #include <mach/common.h> +#define __ARM_GPIOLIB_COMPLEX +#define DAVINCI_GPIO_BASE 0x01C67000enum davinci_gpio_type {
arch/arm/mach-ep93xx/include/mach/gpio.h +0 -3
@@ -99,9 +99,6 @@/* maximum value for irq capable line identifiers */ #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) -/* new generic GPIO API - see Documentation/gpio.txt */ -#define __ARM_GPIOLIB_TRIVIAL -/* * Map GPIO A0..A7 (0..7) to irq 64..71, * B0..B7 (7..15) to irq 72..79, and
arch/arm/mach-exynos4/include/mach/gpio.h +0 -2
@@ -146,6 +146,4 @@ enum s5p_gpio_number {#define ARCH_NR_GPIOS (EXYNOS4_GPZ(EXYNOS4_GPIO_Z_NR) + \ CONFIG_SAMSUNG_GPIO_EXTRA + 1) -#define __ARM_GPIOLIB_TRIVIAL -#endif /* __ASM_ARCH_GPIO_H */
arch/arm/mach-gemini/include/mach/gpio.h +0 -2
@@ -14,8 +14,6 @@#include <mach/irqs.h> -#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq (x) ((x) + GPIO_IRQ_BASE)#define irq_to_gpio (x) ((x) - GPIO_IRQ_BASE)
arch/arm/mach-ixp4xx/include/mach/gpio.h +2 -0
@@ -28,6 +28,8 @@#include <linux/kernel.h> #include <mach/hardware.h> +#define __ARM_GPIOLIB_COMPLEX +static inline int gpio_request (unsigned gpio,const char *label) {return 0 ;
arch/arm/mach-ks8695/include/mach/gpio.h +0 -2
@@ -40,8 +40,6 @@ extern int ks8695_gpio_interrupt(unsigned int pin, unsigned int type);*/ extern int irq_to_gpio (unsigned int irq); -#define __ARM_GPIOLIB_TRIVIAL -/* Register the GPIOs */ extern void ks8695_register_gpios (void );
arch/arm/mach-lpc32xx/include/mach/gpio.h +0 -2
@@ -49,6 +49,4 @@*/ #define LPC32XX_GPIO (x, y) ((x) + (y)) -#define __ARM_GPIOLIB_TRIVIAL -#endif
arch/arm/mach-msm/include/mach/gpio.h +1 -21
@@ -1,21 +1 @@ -/* -* Copyright (C) 2007 Google, Inc. -* Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved. -* Author: Mike Lockwood <[email protected]> -* -* This software is licensed under the terms of the GNU General Public -* License version 2, as published by the Free Software Foundation, and -* may be copied, distributed, and modified under those terms. -* -* 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_ARCH_MSM_GPIO_H -#define __ASM_ARCH_MSM_GPIO_H - -#define __ARM_GPIOLIB_TRIVIAL - -#endif /* __ASM_ARCH_MSM_GPIO_H */ +/* empty */
arch/arm/mach-mxs/include/mach/gpio.h +0 -3
@@ -22,9 +22,6 @@#define MXS_GPIO_NR (bank, nr) ((bank) * 32 + (nr)) -/* use gpiolib dispatchers */ -#define __ARM_GPIOLIB_TRIVIAL -#define irq_to_gpio (irq) ((irq) - MXS_GPIO_IRQ_START)#endif /* __MACH_MXS_GPIO_H__ */
arch/arm/mach-realview/include/mach/gpio.h +1 -1
@@ -1 +1 @@ -#define __ARM_GPIOLIB_TRIVIAL +/* empty */
arch/arm/mach-s3c2410/include/mach/gpio.h +0 -2
@@ -11,8 +11,6 @@* published by the Free Software Foundation. */ -#define __ARM_GPIOLIB_TRIVIAL -/* some boards require extra gpio capacity to support external * devices that need GPIO. */
arch/arm/mach-s3c64xx/include/mach/gpio.h +0 -2
@@ -12,8 +12,6 @@* published by the Free Software Foundation. */ -#define __ARM_GPIOLIB_TRIVIAL -/* GPIO bank sizes */ #define S3C64XX_GPIO_A_NR (8)#define S3C64XX_GPIO_B_NR (7)
arch/arm/mach-s5p64x0/include/mach/gpio.h +0 -2
@@ -13,8 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define __ARM_GPIOLIB_TRIVIAL -/* GPIO bank sizes */ #define S5P6440_GPIO_A_NR (6)
arch/arm/mach-s5pc100/include/mach/gpio.h +0 -2
@@ -15,8 +15,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define __ARM_GPIOLIB_TRIVIAL -/* GPIO bank sizes */ #define S5PC100_GPIO_A0_NR (8)#define S5PC100_GPIO_A1_NR (5)
arch/arm/mach-s5pv210/include/mach/gpio.h +0 -2
@@ -13,8 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define __ARM_GPIOLIB_TRIVIAL -/* Practically, GPIO banks up to MP03 are the configurable gpio banks */ /* GPIO bank sizes */
arch/arm/mach-sa1100/include/mach/gpio.h +2 -0
@@ -28,6 +28,8 @@#include <asm/irq.h> #include <asm-generic/gpio.h> +#define __ARM_GPIOLIB_COMPLEX +static inline int gpio_get_value (unsigned gpio) {if (__builtin_constant_p (gpio) && (gpio <=GPIO_MAX ))
arch/arm/mach-shmobile/include/mach/gpio.h +4 -2
@@ -18,13 +18,15 @@#ifdef CONFIG_GPIOLIB -#define __ARM_GPIOLIB_TRIVIAL -static inline int irq_to_gpio (unsigned int irq) {return -ENOSYS ; } +#else + +#define __ARM_GPIOLIB_COMPLEX +#endif /* CONFIG_GPIOLIB */ #endif /* __ASM_ARCH_GPIO_H */
arch/arm/mach-tegra/include/mach/gpio.h +0 -2
@@ -25,8 +25,6 @@#define TEGRA_NR_GPIOS INT_GPIO_NR -#define __ARM_GPIOLIB_TRIVIAL -#define TEGRA_GPIO_TO_IRQ (gpio) (INT_GPIO_BASE + (gpio))#define TEGRA_IRQ_TO_GPIO (irq) ((irq) - INT_GPIO_BASE)
arch/arm/mach-u300/include/mach/gpio.h +2 -0
@@ -18,6 +18,8 @@#include <mach/hardware.h> #include <asm/irq.h> +#define __ARM_GPIOLIB_COMPLEX +/* Switch type depending on platform/chip variant */ #if defined(CONFIG_MACH_U300_BS2X ) || defined(CONFIG_MACH_U300_BS330 )#define U300_COH901335
arch/arm/mach-versatile/include/mach/gpio.h +1 -1
@@ -1 +1 @@ -#define __ARM_GPIOLIB_TRIVIAL +/* empty */
arch/arm/mach-vt8500/include/mach/gpio.h +1 -1
@@ -1 +1 @@ -#define __ARM_GPIOLIB_TRIVIAL +/* empty */
arch/arm/mach-w90x900/include/mach/gpio.h +0 -2
@@ -16,8 +16,6 @@#include <mach/hardware.h> #include <asm/irq.h> -#define __ARM_GPIOLIB_TRIVIAL -static inline int gpio_to_irq (unsigned gpio) {return gpio;
arch/arm/plat-mxc/include/mach/gpio.h +0 -3
@@ -27,9 +27,6 @@/* range e.g. GPIO_1_5 is gpio 5 under linux */ #define IMX_GPIO_NR (bank, nr) (((bank) - 1) * 32 + (nr)) -/* use gpiolib dispatchers */ -#define __ARM_GPIOLIB_TRIVIAL -#define gpio_to_irq (gpio) (MXC_GPIO_IRQ_START + (gpio))#define irq_to_gpio (irq) ((irq) - MXC_GPIO_IRQ_START)
arch/arm/plat-nomadik/include/plat/gpio.h +0 -2
@@ -12,8 +12,6 @@#ifndef __ASM_PLAT_GPIO_H#define __ASM_PLAT_GPIO_H -#define __ARM_GPIOLIB_TRIVIAL -/* * "nmk_gpio" and "NMK_GPIO" stand for "Nomadik GPIO", leaving * the "gpio" namespace for generic and cross-machine functions
arch/arm/plat-omap/include/plat/gpio.h +0 -2
@@ -222,8 +222,6 @@ extern void omap_gpio_restore_context(void);#include <linux/errno.h> #include <asm-generic/gpio.h> -#define __ARM_GPIOLIB_TRIVIAL -static inline int irq_to_gpio (unsigned irq) {int tmp;
arch/arm/plat-orion/include/plat/gpio.h +0 -2
@@ -13,8 +13,6 @@#include <linux/init.h> -#define __ARM_GPIOLIB_TRIVIAL -/* * Orion-specific GPIO API extensions. */
arch/arm/plat-pxa/include/plat/gpio.h +2 -0
@@ -1,6 +1,8 @@#ifndef __PLAT_GPIO_H#define __PLAT_GPIO_H +#define __ARM_GPIOLIB_COMPLEX +struct irq_data ;/*
arch/arm/plat-spear/include/plat/gpio.h +1 -19
@@ -1,19 +1 @@ -/* -* arch/arm/plat-spear/include/plat/gpio.h -* -* GPIO macros for SPEAr platform -* -* Copyright (C) 2009 ST Microelectronics -* Viresh Kumar<[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __PLAT_GPIO_H -#define __PLAT_GPIO_H - -#define __ARM_GPIOLIB_TRIVIAL - -#endif /* __PLAT_GPIO_H */ +/* empty */
Signature · 1 line
1.7.4.4
PATCH 13/13 ARM: gpio: make trivial GPIOLIB implementation the default
Quoted 32 lines · Russell King
Rather than marking the
mach/gpio.hheader files which want to use the trivial GPIOLIB implementation, mark those which do not want to use it instead. This means that by default, you get the trivial implementation and only have to do something extra if you need to. This should encourage the use of the trivial default implementation.As an additional bonus, several
gpio.hheader files become empty.Signed-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 2 +- arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 ++arch/arm/include/asm/gpio.h +1
-1@@ -4,7 +4,7 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> -#ifdef __ARM_GPIOLIB_TRIVIAL +#ifndef __ARM_GPIOLIB_COMPLEX/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ #include <asm-generic/gpio.h> arch/arm/mach-ep93xx/include/mach/gpio.h +0
-0
arch/arm/mach-ep93xx/include/mach/gpio.h line 104
Quoted 9 lines
arch/arm/mach-ep93xx/include/mach/gpio.h +0
-3@@ -99,9 +99,6 @@/* maximum value for irq capable line identifiers */ #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) -/* new generic GPIO API - see Documentation/gpio.txt */ -#define __ARM_GPIOLIB_TRIVIAL -/* * Map GPIO A0..A7 (0..7) to irq 64..71, * B0..B7 (7..15) to irq 72..79, and
For ep93xx:
Thanks!
A message that is not in the archive (sent off-list or not yet received): E1QqhMg-0003an-GW-eh5Bv4kxaXIANfyc6IWni62ZND6+EDdj@public.gmane.org
H Hartley Sweeten
Acked-byRE: [PATCH 13/13] ARM: gpio: make trivial GPIOLIB implementation the default
Quoted 32 lines · Russell King
Rather than marking the
mach/gpio.hheader files which want to use the trivial GPIOLIB implementation, mark those which do not want to use it instead. This means that by default, you get the trivial implementation and only have to do something extra if you need to. This should encourage the use of the trivial default implementation.As an additional bonus, several
gpio.hheader files become empty.Signed-off-by Russell King <rmk+kernel-lFZ/[email protected]>--- arch/arm/include/asm/gpio.h | 2 +- arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 ++arch/arm/include/asm/gpio.h +1
-1@@ -4,7 +4,7 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> -#ifdef __ARM_GPIOLIB_TRIVIAL +#ifndef __ARM_GPIOLIB_COMPLEX/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ #include <asm-generic/gpio.h> arch/arm/mach-ep93xx/include/mach/gpio.h +0
-0
arch/arm/mach-ep93xx/include/mach/gpio.h line 104
Quoted 9 lines
arch/arm/mach-ep93xx/include/mach/gpio.h +0
-3@@ -99,9 +99,6 @@/* maximum value for irq capable line identifiers */ #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) -/* new generic GPIO API - see Documentation/gpio.txt */ -#define __ARM_GPIOLIB_TRIVIAL -/* * Map GPIO A0..A7 (0..7) to irq 64..71, * B0..B7 (7..15) to irq 72..79, and
For ep93xx:
Thanks!
Kukjin Kim
Acked-byRE: [PATCH 13/13] ARM: gpio: make trivial GPIOLIB implementation the default
In reply to a message not in the archiveQuoted 10 lines · Russell King - ARM Linux
Rather than marking the
mach/gpio.hheader files which want to use the trivial GPIOLIB implementation, mark those which do not want to use it instead. This means that by default, you get the trivial implementation and only have to do something extra if you need to. This should encourage the use of the trivial default implementation.As an additional bonus, several
gpio.hheader files become empty.Signed-off-by Russell King <rmk+kernel-lFZ/[email protected]>
Looks good to me :)
Acked-by Kukjin Kim <[email protected]>
on following Samsung stuff...
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 16 lines
--- arch/arm/include/asm/gpio.h | 2 +-arch/arm/mach-exynos4/include/mach/gpio.h | 2 --arch/arm/mach-s3c2410/include/mach/gpio.h | 2 -- arch/arm/mach-s3c64xx/include/mach/gpio.h | 2 -- arch/arm/mach-s5p64x0/include/mach/gpio.h | 2 -- arch/arm/mach-s5pc100/include/mach/gpio.h | 2 -- arch/arm/mach-s5pv210/include/mach/gpio.h | 2 --arch/arm/include/asm/gpio.h +0
-0
arch/arm/include/asm/gpio.h line 8
Quoted 6 lines
arch/arm/include/asm/gpio.h +1
-1@@ -4,7 +4,7 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> -#ifdef __ARM_GPIOLIB_TRIVIAL +#ifndef __ARM_GPIOLIB_COMPLEX/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h
*/
Quoted 87 lines
arch/arm/include/asm/gpio.h +0
-0#include <asm-generic/gpio.h> arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/gpio.h +0
-0
exynos4/include/mach/gpio.h
index b91e8b2..80523ca 100644arch/arm/mach-exynos4/include/mach/gpio.h +0
-2@@ -146,6 +146,4 @@ enum s5p_gpio_number {#define ARCH_NR_GPIOS (EXYNOS4_GPZ (EXYNOS4_GPIO_Z_NR ) + \CONFIG_SAMSUNG_GPIO_EXTRA +1 ) -#define __ARM_GPIOLIB_TRIVIAL -#endif /*
__ASM_ARCH_GPIO_H*/arch/arm/mach- renamed from arch/arm/mach-s3c2410/include/mach/gpio.h +0
-0
s3c2410/include/mach/gpio.h
index d502d17..6fac70f 100644arch/arm/mach-s3c2410/include/mach/gpio.h +0
-2@@ -11,8 +11,6 @@* published by the Free Software Foundation. */ -#define __ARM_GPIOLIB_TRIVIAL -/* some boards require extra gpio capacity to support external * devices that need GPIO. */ arch/arm/mach- renamed from arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-0
s3c64xx/include/mach/gpio.h
index 3a8857c..6e34c2f 100644arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-2@@ -12,8 +12,6 @@* published by the Free Software Foundation. */ -#define __ARM_GPIOLIB_TRIVIAL -/* GPIO bank sizes */ #define S3C64XX_GPIO_A_NR (8)#define S3C64XX_GPIO_B_NR (7)arch/arm/mach- renamed from arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-0
s5p64x0/include/mach/gpio.h
index c3a6aa0..06cd3c9 100644arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-2@@ -13,8 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define __ARM_GPIOLIB_TRIVIAL -/* GPIO bank sizes */ #define S5P6440_GPIO_A_NR (6)arch/arm/mach- renamed from arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
s5pc100/include/mach/gpio.h
index 0e75641..5e1a924 100644arch/arm/mach-s5pc100/include/mach/gpio.h +0
-2@@ -15,8 +15,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define __ARM_GPIOLIB_TRIVIAL -/* GPIO bank sizes */ #define S5PC100_GPIO_A0_NR (8)#define S5PC100_GPIO_A1_NR (5)arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/gpio.h +0
-0
s5pv210/include/mach/gpio.h
index d348ee2..6c8b903 100644arch/arm/mach-s5pv210/include/mach/gpio.h +0
-2@@ -13,8 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define __ARM_GPIOLIB_TRIVIAL -/* Practically, GPIO banks up to MP03 are the configurable gpio banks */ /* GPIO bank sizes */
RE: [PATCH 13/13] ARM: gpio: make trivial GPIOLIB implementation the default
In reply to Russell King - ARM LinuxQuoted 32 lines · Russell King
Rather than marking the
mach/gpio.hheader files which want to use the trivial GPIOLIB implementation, mark those which do not want to use it instead. This means that by default, you get the trivial implementation and only have to do something extra if you need to. This should encourage the use of the trivial default implementation.As an additional bonus, several
gpio.hheader files become empty.Signed-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 2 +- arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 ++arch/arm/include/asm/gpio.h +1
-1@@ -4,7 +4,7 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> -#ifdef __ARM_GPIOLIB_TRIVIAL +#ifndef __ARM_GPIOLIB_COMPLEX/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ #include <asm-generic/gpio.h> arch/arm/mach-ep93xx/include/mach/gpio.h +0
-0
arch/arm/mach-ep93xx/include/mach/gpio.h line 104
Quoted 9 lines
arch/arm/mach-ep93xx/include/mach/gpio.h +0
-3@@ -99,9 +99,6 @@/* maximum value for irq capable line identifiers */ #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) -/* new generic GPIO API - see Documentation/gpio.txt */ -#define __ARM_GPIOLIB_TRIVIAL -/* * Map GPIO A0..A7 (0..7) to irq 64..71, * B0..B7 (7..15) to irq 72..79, and
For ep93xx:
Thanks!
RE: [PATCH 13/13] ARM: gpio: make trivial GPIOLIB implementation the default
In reply to Russell King - ARM LinuxQuoted 32 lines · Russell King
Rather than marking the
mach/gpio.hheader files which want to use the trivial GPIOLIB implementation, mark those which do not want to use it instead. This means that by default, you get the trivial implementation and only have to do something extra if you need to. This should encourage the use of the trivial default implementation.As an additional bonus, several
gpio.hheader files become empty.Signed-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 2 +- arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 ++arch/arm/include/asm/gpio.h +1
-1@@ -4,7 +4,7 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> -#ifdef __ARM_GPIOLIB_TRIVIAL +#ifndef __ARM_GPIOLIB_COMPLEX/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ #include <asm-generic/gpio.h> arch/arm/mach-ep93xx/include/mach/gpio.h +0
-0
arch/arm/mach-ep93xx/include/mach/gpio.h line 104
Quoted 9 lines
arch/arm/mach-ep93xx/include/mach/gpio.h +0
-3@@ -99,9 +99,6 @@/* maximum value for irq capable line identifiers */ #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) -/* new generic GPIO API - see Documentation/gpio.txt */ -#define __ARM_GPIOLIB_TRIVIAL -/* * Map GPIO A0..A7 (0..7) to irq 64..71, * B0..B7 (7..15) to irq 72..79, and
For ep93xx:
Thanks!
RE: [PATCH 13/13] ARM: gpio: make trivial GPIOLIB implementation the default
In reply to Russell King - ARM LinuxQuoted 32 lines · Russell King
Rather than marking the
mach/gpio.hheader files which want to use the trivial GPIOLIB implementation, mark those which do not want to use it instead. This means that by default, you get the trivial implementation and only have to do something extra if you need to. This should encourage the use of the trivial default implementation.As an additional bonus, several
gpio.hheader files become empty.Signed-off-by Russell King <[email protected]>--- arch/arm/include/asm/gpio.h | 2 +- arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 ++arch/arm/include/asm/gpio.h +1
-1@@ -4,7 +4,7 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> -#ifdef __ARM_GPIOLIB_TRIVIAL +#ifndef __ARM_GPIOLIB_COMPLEX/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ #include <asm-generic/gpio.h> arch/arm/mach-ep93xx/include/mach/gpio.h +0
-0
arch/arm/mach-ep93xx/include/mach/gpio.h line 104
Quoted 9 lines
arch/arm/mach-ep93xx/include/mach/gpio.h +0
-3@@ -99,9 +99,6 @@/* maximum value for irq capable line identifiers */ #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) -/* new generic GPIO API - see Documentation/gpio.txt */ -#define __ARM_GPIOLIB_TRIVIAL -/* * Map GPIO A0..A7 (0..7) to irq 64..71, * B0..B7 (7..15) to irq 72..79, and
For ep93xx:
Thanks!
PATCH 13/13 ARM: gpio: make trivial GPIOLIB implementation the default
In reply to Russell King - ARM LinuxQuoted 10 lines · Russell King - ARM Linux
Rather than marking the
mach/gpio.hheader files which want to use the trivial GPIOLIB implementation, mark those which do not want to use it instead. This means that by default, you get the trivial implementation and only have to do something extra if you need to. This should encourage the use of the trivial default implementation.As an additional bonus, several
gpio.hheader files become empty.Signed-off-by Russell King <[email protected]>
Looks good to me :)
Acked-by Kukjin Kim <[email protected]>
on following Samsung stuff...
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 16 lines
--- arch/arm/include/asm/gpio.h | 2 +-arch/arm/mach-exynos4/include/mach/gpio.h | 2 --arch/arm/mach-s3c2410/include/mach/gpio.h | 2 -- arch/arm/mach-s3c64xx/include/mach/gpio.h | 2 -- arch/arm/mach-s5p64x0/include/mach/gpio.h | 2 -- arch/arm/mach-s5pc100/include/mach/gpio.h | 2 -- arch/arm/mach-s5pv210/include/mach/gpio.h | 2 --arch/arm/include/asm/gpio.h +0
-0
arch/arm/include/asm/gpio.h line 8
Quoted 6 lines
arch/arm/include/asm/gpio.h +1
-1@@ -4,7 +4,7 @@/* not all ARM platforms necessarily support this API ... */ #include <mach/gpio.h> -#ifdef __ARM_GPIOLIB_TRIVIAL +#ifndef __ARM_GPIOLIB_COMPLEX/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h
*/
Quoted 87 lines
arch/arm/include/asm/gpio.h +0
-0#include <asm-generic/gpio.h> arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/gpio.h +0
-0
exynos4/include/mach/gpio.h
index b91e8b2..80523ca 100644arch/arm/mach-exynos4/include/mach/gpio.h +0
-2@@ -146,6 +146,4 @@ enum s5p_gpio_number {#define ARCH_NR_GPIOS (EXYNOS4_GPZ (EXYNOS4_GPIO_Z_NR ) + \CONFIG_SAMSUNG_GPIO_EXTRA +1 ) -#define __ARM_GPIOLIB_TRIVIAL -#endif /*
__ASM_ARCH_GPIO_H*/arch/arm/mach- renamed from arch/arm/mach-s3c2410/include/mach/gpio.h +0
-0
s3c2410/include/mach/gpio.h
index d502d17..6fac70f 100644arch/arm/mach-s3c2410/include/mach/gpio.h +0
-2@@ -11,8 +11,6 @@* published by the Free Software Foundation. */ -#define __ARM_GPIOLIB_TRIVIAL -/* some boards require extra gpio capacity to support external * devices that need GPIO. */ arch/arm/mach- renamed from arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-0
s3c64xx/include/mach/gpio.h
index 3a8857c..6e34c2f 100644arch/arm/mach-s3c64xx/include/mach/gpio.h +0
-2@@ -12,8 +12,6 @@* published by the Free Software Foundation. */ -#define __ARM_GPIOLIB_TRIVIAL -/* GPIO bank sizes */ #define S3C64XX_GPIO_A_NR (8)#define S3C64XX_GPIO_B_NR (7)arch/arm/mach- renamed from arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-0
s5p64x0/include/mach/gpio.h
index c3a6aa0..06cd3c9 100644arch/arm/mach-s5p64x0/include/mach/gpio.h +0
-2@@ -13,8 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define __ARM_GPIOLIB_TRIVIAL -/* GPIO bank sizes */ #define S5P6440_GPIO_A_NR (6)arch/arm/mach- renamed from arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
s5pc100/include/mach/gpio.h
index 0e75641..5e1a924 100644arch/arm/mach-s5pc100/include/mach/gpio.h +0
-2@@ -15,8 +15,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define __ARM_GPIOLIB_TRIVIAL -/* GPIO bank sizes */ #define S5PC100_GPIO_A0_NR (8)#define S5PC100_GPIO_A1_NR (5)arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/gpio.h +0
-0
s5pv210/include/mach/gpio.h
index d348ee2..6c8b903 100644arch/arm/mach-s5pv210/include/mach/gpio.h +0
-2@@ -13,8 +13,6 @@#ifndef __ASM_ARCH_GPIO_H#define __ASM_ARCH_GPIO_H __FILE__ -#define __ARM_GPIOLIB_TRIVIAL -/* Practically, GPIO banks up to MP03 are the configurable gpio banks */ /* GPIO bank sizes */
cover Clean up mach/gpio.h headers
In reply to Russell King - ARM LinuxHi Russell,
Quoted 13 lines · Russell King - ARM Linux
This is a preliminary posting of my gpio patch set.
This patch series moves the trivial gpiolib implementations out of
mach/gpio.hand intoasm/gpio.h.As a side effect of that, most of this patch series is about fixing up direct includes of
mach/gpio.h- this is something I've been on at people over the last year or more about ensuring that they uselinux/gpio.hin preference. While I've blindly converted allarch/armto uselinux/gpio.h(with the exception of mach/ includes which are converted toasm/gpio.h), drivers were only converted toasm/gpio.h. These should be reviewed and changed tolinux/gpio.h.
Quoted 2 lines
As a result of this patch series, several
mach/gpio.hend up being empty.
Nice series! This gives me an empty gpio.h for picoxcell.
Tested-by Jamie Iles <[email protected]>
Jamie
cover Clean up mach/gpio.h headers
In reply to Russell King - ARM LinuxQuoted 22 lines · Russell King - ARM Linux
This is a preliminary posting of my gpio patch set.
This patch series moves the trivial gpiolib implementations out of
mach/gpio.hand intoasm/gpio.h.As a side effect of that, most of this patch series is about fixing up direct includes of
mach/gpio.h- this is something I've been on at people over the last year or more about ensuring that they uselinux/gpio.hin preference. While I've blindly converted allarch/armto uselinux/gpio.h(with the exception of mach/ includes which are converted toasm/gpio.h), drivers were only converted toasm/gpio.h. These should be reviewed and changed tolinux/gpio.h.As a result of this patch series, several
mach/gpio.hend up being empty.Many others just contain platform private GPIO APIs and definitions.
The last thing which
mach/gpio.his used for is to provide a definition forARCH_GPIO_NRtoasm-generic/gpio.h. I've not attempted to solve that issue yet.
Quoted 6 lines
A small number of platforms optimize the gpio accessors for on-SoC GPIOs. In the interests of consolidation, these will have to be killed but this patch set does not do that yet.
Lastly, several {
mach,plat}/gpio.hneeds to be looked at with a view to deleting the direct include ofasm-generic/gpio.h.
Looks good to me, though I haven't looked closely. I imagine this should get merged via a branch in the arm-soc tree?
g.
cover Clean up mach/gpio.h headers
Quoted 27 lines · Grant Likely
Quoted 26 lines · Russell King - ARM Linux
This is a preliminary posting of my gpio patch set.
This patch series moves the trivial gpiolib implementations out of
mach/gpio.hand intoasm/gpio.h.As a side effect of that, most of this patch series is about fixing up direct includes of
mach/gpio.h- this is something I've been on at people over the last year or more about ensuring that they uselinux/gpio.hin preference. While I've blindly converted allarch/armto uselinux/gpio.h(with the exception of mach/ includes which are converted toasm/gpio.h), drivers were only converted toasm/gpio.h. These should be reviewed and changed tolinux/gpio.h.As a result of this patch series, several
mach/gpio.hend up being empty.Many others just contain platform private GPIO APIs and definitions.
The last thing which
mach/gpio.his used for is to provide a definition forARCH_GPIO_NRtoasm-generic/gpio.h. I've not attempted to solve that issue yet.A small number of platforms optimize the gpio accessors for on-SoC GPIOs. In the interests of consolidation, these will have to be killed but this patch set does not do that yet.
Quoted 5 lines
Quoted 2 lines
Lastly, several {
mach,plat}/gpio.hneeds to be looked at with a view to deleting the direct include ofasm-generic/gpio.h.Looks good to me, though I haven't looked closely. I imagine this should get merged via a branch in the arm-soc tree?
And this is where the existence of the arm-soc tree makes things more difficult for me. I'd normally just keep it as a separate branch in my own tree. What I do now, I've no idea.
cover Clean up mach/gpio.h headers
Quoted 31 lines · Russell King - ARM Linux
Quoted 30 lines · Grant Likely
Quoted 28 lines · Russell King - ARM Linux
This is a preliminary posting of my gpio patch set.
This patch series moves the trivial gpiolib implementations out of
mach/gpio.hand intoasm/gpio.h.As a side effect of that, most of this patch series is about fixing up direct includes of
mach/gpio.h- this is something I've been on at people over the last year or more about ensuring that they uselinux/gpio.hin preference. While I've blindly converted allarch/armto uselinux/gpio.h(with the exception of mach/ includes which are converted toasm/gpio.h), drivers were only converted toasm/gpio.h. These should be reviewed and changed tolinux/gpio.h.As a result of this patch series, several
mach/gpio.hend up being empty.Many others just contain platform private GPIO APIs and definitions.
The last thing which
mach/gpio.his used for is to provide a definition forARCH_GPIO_NRtoasm-generic/gpio.h. I've not attempted to solve that issue yet.A small number of platforms optimize the gpio accessors for on-SoC GPIOs. In the interests of consolidation, these will have to be killed but this patch set does not do that yet.
Lastly, several {
mach,plat}/gpio.hneeds to be looked at with a view to deleting the direct include ofasm-generic/gpio.h.
Quoted 6 lines
Quoted 2 lines
Looks good to me, though I haven't looked closely. I imagine this should get merged via a branch in the arm-soc tree?
And this is where the existence of the arm-soc tree makes things more difficult for me. I'd normally just keep it as a separate branch in my own tree. What I do now, I've no idea.
A separate branch in your tree works too. It could even get pulled into the arm-soc tree so that it gets picked up by the daily integration test before going on to linux-next.
g.