diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-08 16:18:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-08 16:18:38 -0500 |
| commit | 8bd1c8815fc23fa4db2376bf667ef885827b48c9 (patch) | |
| tree | bf59bf4636f741c8b5ce03c699cd01f89ea71f69 /arch/arm/mach-imx/mach-imx6q.c | |
| parent | 1418a3e5ad4d01b1d4abf2c479c50b0cedd59e3f (diff) | |
| parent | 073c460311662eff7beb429de21acdbf7d90a4cb (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
ARM: sa1100: fix build error
ARM: OMAP1: recalculate loops per jiffy after dpll1 reprogram
ARM: davinci: dm365 evm: align nand partition table to u-boot
ARM: davinci: da850 evm: change audio edma event queue to EVENTQ_0
ARM: davinci: dm646x evm: wrong register used in setup_vpif_input_channel_mode
ARM: davinci: dm646x does not have a DSP domain
ARM: davinci: psc: fix incorrect offsets
ARM: davinci: psc: fix incorrect mask
ARM: mx28: LRADC macro rename
arm: mx23: recognise stmp378x as mx23
ARM: mxs: fix machines' initializers order
ARM: mxs/tx28: add __initconst for fec pdata
ARM: S3C64XX: Staticise s3c6400_sysclass
ARM: S3C64XX: Add linux/export.h to dev-spi.c
ARM: S3C64XX: Remove extern from definition of framebuffer setup call
MAINTAINERS: Extend Samsung patterns to cover SPI and ASoC drivers
MAINTAINERS: Add linux-samsung-soc mailing list for Samsung
MAINTAINERS: Consolidate Samsung MAINTAINERS
ARM: CSR: PM: fix build error due to undeclared 'THIS_MODULE'
ARM: CSR: fix build error due to new mdesc->dma_zone_size
...
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 9cd860a27af5..8deb012189b5 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c | |||
| @@ -37,14 +37,15 @@ static void __init imx6q_map_io(void) | |||
| 37 | imx6q_clock_map_io(); | 37 | imx6q_clock_map_io(); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | static void __init imx6q_gpio_add_irq_domain(struct device_node *np, | 40 | static int __init imx6q_gpio_add_irq_domain(struct device_node *np, |
| 41 | struct device_node *interrupt_parent) | 41 | struct device_node *interrupt_parent) |
| 42 | { | 42 | { |
| 43 | static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS - | 43 | static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS; |
| 44 | 32 * 7; /* imx6q gets 7 gpio ports */ | ||
| 45 | 44 | ||
| 45 | gpio_irq_base -= 32; | ||
| 46 | irq_domain_add_simple(np, gpio_irq_base); | 46 | irq_domain_add_simple(np, gpio_irq_base); |
| 47 | gpio_irq_base += 32; | 47 | |
| 48 | return 0; | ||
| 48 | } | 49 | } |
| 49 | 50 | ||
| 50 | static const struct of_device_id imx6q_irq_match[] __initconst = { | 51 | static const struct of_device_id imx6q_irq_match[] __initconst = { |