iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Stephen Warren f2a4d8ae4d ARM: Tegra: Harmony: Fix conflicting GPIO numbering 
Currently, both the WM8903 and TPS6586x chips attempt to register with
gpiolib using the same GPIO numbers. This causes the audio driver to
fail to initialize.

To solve this, add a define to board-harmony.h for the TPS6586x, and make
board-harmony-power.c use this define, instead of directly referencing
TEGRA_NR_GPIOS.

This fixes a regression introduced by commit
6f168f2fa60f87e85e0df25e87e2372f22f5eb7c.
ARM: tegra: harmony: initialize the TPS65862 PMIC

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Colin Cross <ccross@android.com>
2011-06-04 15:51:52 -07:00
..
boot
Merge branch 'devel-stable' into for-linus
2011-05-23 19:28:04 +01:00
common
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
2011-05-25 21:47:48 +01:00
configs
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-05-27 19:51:32 -07:00
include/asm
Merge branch 'setns'
2011-05-28 10:51:01 -07:00
kernel
Merge branch 'setns'
2011-05-28 10:51:01 -07:00
lib
ARM: 6945/1: Add unwinding support for division functions
2011-05-27 22:56:53 +01:00
mach-at91
at91: drop at572d940hf support
2011-05-25 23:04:35 +08:00
mach-bcmring
ARM: bcmring: convert to use sp804 clockevents
2011-05-23 18:04:54 +01:00
mach-clps711x
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-cns3xxx
ARM: P2V: separate PHYS_OFFSET from platform definitions
2011-02-17 23:26:55 +00:00
mach-davinci
Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into devel-stable
2011-05-25 00:11:25 +01:00
mach-dove
ARM: dove: Consolidate mpp code with platform mpp.
2011-05-16 15:49:31 -04:00
mach-ebsa110
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-ep93xx
ARM: 6852/1: EP93xx: Remove ep93xx_gpio_dbg_show function
2011-05-11 12:37:18 +01:00
mach-exynos4
Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
2011-05-28 10:56:34 -07:00
mach-footbridge
clocksource: convert footbridge to generic i8253 clocksource
2011-05-14 10:29:48 +01:00
mach-gemini
Merge git://git.infradead.org/mtd-2.6
2011-05-27 20:06:53 -07:00
mach-h720x
ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS
2011-05-12 08:36:49 +01:00
mach-imx
ARM: imx: move mx3 support to mach-imx
2011-05-19 13:11:38 +02:00
mach-integrator
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
2011-05-23 18:05:10 +01:00
mach-iop13xx
Fix common misspellings
2011-03-31 11:26:23 -03:00
mach-iop32x
ARM: zImage: remove the static qualifier from global data variables
2011-05-07 00:08:02 -04:00
mach-iop33x
ARM: zImage: remove the static qualifier from global data variables
2011-05-07 00:08:02 -04:00
mach-ixp4xx
Merge git://git.infradead.org/mtd-2.6
2011-05-27 20:06:53 -07:00
mach-ixp23xx
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-ixp2000
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-kirkwood
ARM: orion: Refactor the MPP code common in the orion platform
2011-05-16 15:25:54 -04:00
mach-ks8695
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-l7200/include/mach
…
mach-loki
ARM: orion: Consolidate ethernet platform data
2011-05-16 15:06:01 -04:00
mach-lpc32xx
clocksource: convert ARM 32-bit up counting clocksources
2011-05-23 18:04:51 +01:00
mach-mmp
Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into devel-stable
2011-05-07 08:34:02 +01:00
mach-msm
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-05-23 15:15:27 -07:00
mach-mv78xx0
ARM: orion: Refactor the MPP code common in the orion platform
2011-05-16 15:25:54 -04:00
mach-mx5
ARM: mxc: don't allow to compile together i.MX51 and i.MX53
2011-05-19 13:11:30 +02:00
mach-mxs
Merge branch 'devel-stable' into for-linus
2011-05-23 19:28:04 +01:00
mach-netx
ARM: 6827/1: mach-netx: delete hardcoded periphid
2011-05-26 10:33:34 +01:00
mach-nomadik
gpio: move Nomadik GPIO driver to drivers/gpio
2011-05-26 17:30:03 -06:00
mach-nuc93x
ARM: zImage: remove the static qualifier from global data variables
2011-05-07 00:08:02 -04:00
mach-omap1
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
2011-05-23 18:05:10 +01:00
mach-omap2
Merge git://git.infradead.org/battery-2.6
2011-05-27 10:12:35 -07:00
mach-orion5x
ARM: orion5x: Refactor mpp code to use common orion platform mpp.
2011-05-16 15:42:59 -04:00
mach-pnx4008
arm: Cleanup the irq namespace
2011-03-29 14:47:57 +02:00
mach-pxa
Merge git://git.infradead.org/mtd-2.6
2011-05-27 20:06:53 -07:00
mach-realview
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
2011-05-23 18:05:10 +01:00
mach-rpc
ARM: zImage: remove the static qualifier from global data variables
2011-05-07 00:08:02 -04:00
mach-s3c24a0/include/mach
ARM: P2V: separate PHYS_OFFSET from platform definitions
2011-02-17 23:26:55 +00:00
mach-s3c64xx
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
2011-05-25 21:47:48 +01:00
mach-s3c2400
ARM: P2V: separate PHYS_OFFSET from platform definitions
2011-02-17 23:26:55 +00:00
mach-s3c2410
Merge git://git.infradead.org/mtd-2.6
2011-05-27 20:06:53 -07:00
mach-s3c2412
ARM / Samsung: Use struct syscore_ops for "core" power management
2011-04-24 19:16:10 +02:00
mach-s3c2416
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2011-05-23 12:33:02 -07:00
mach-s3c2440
ARM / Samsung: Use struct syscore_ops for "core" power management
2011-04-24 19:16:10 +02:00
mach-s3c2443
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-s5p64x0
ARM: zImage: remove the static qualifier from global data variables
2011-05-07 00:08:02 -04:00
mach-s5pc100
gpio: Move the s5pc100 GPIO to drivers/gpio
2011-05-26 17:33:41 -06:00
mach-s5pv210
gpio: Move the s5pv210 GPIO to drivers/gpio
2011-05-26 17:33:37 -06:00
mach-sa1100
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
2011-05-23 18:05:10 +01:00
mach-shark
ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes
2011-05-12 08:36:53 +01:00
mach-shmobile
ARM: mach-shmobile: mackerel: add renesas_usbhs support for USB1
2011-05-25 17:07:36 +09:00
mach-spear3xx
ARM: 6931/1: SPEAr3xx: Rework KConfig to allow all boards to be compiled in
2011-05-20 22:34:25 +01:00
mach-spear6xx
ARM: 6934/1: SPEAr6xx: Rework Kconfig for single image solution
2011-05-20 22:34:25 +01:00
mach-tcc8k
clocksource: convert ARM 32-bit up counting clocksources
2011-05-23 18:04:51 +01:00
mach-tegra
ARM: Tegra: Harmony: Fix conflicting GPIO numbering
2011-06-04 15:51:52 -07:00
mach-u300
gpio: move U300 GPIO driver to drivers/gpio
2011-05-26 17:29:33 -06:00
mach-ux500
Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
2011-05-28 10:56:34 -07:00
mach-versatile
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
2011-05-23 18:05:10 +01:00
mach-vexpress
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
2011-05-23 18:05:10 +01:00
mach-vt8500
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-w90x900
Merge branch 'devel-stable' into for-linus
2011-05-23 19:28:04 +01:00
mm
Merge branches 'devel', 'devel-stable' and 'fixes' into for-linus
2011-05-27 22:59:57 +01:00
nwfpe
…
oprofile
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-02-15 10:18:48 -08:00
plat-iop
ARM: Remove duplicate linux/sched.h include from arch/arm/plat-iop/time.c
2011-04-10 17:01:02 +02:00
plat-mxc
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-05-23 15:15:27 -07:00
plat-nomadik
gpio/nomadik: add function to read GPIO pull down status
2011-05-26 17:30:18 -06:00
plat-omap
Merge branch 'for_2.6.40/gpio-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
2011-05-27 23:52:58 -06:00
plat-orion
Merge branch 'devel-stable' into for-linus
2011-05-23 19:28:04 +01:00
plat-pxa
ARM / PXA: Use struct syscore_ops for "core" power management
2011-04-24 19:16:09 +02:00
plat-s3c24xx
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2011-05-23 12:33:02 -07:00
plat-s5p
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
2011-05-25 21:47:48 +01:00
plat-samsung
Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
2011-05-28 10:56:34 -07:00
plat-spear
Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus
2011-05-23 19:27:40 +01:00
plat-tcc
ARM: P2V: separate PHYS_OFFSET from platform definitions
2011-02-17 23:26:55 +00:00
plat-versatile
ARM: consolidate SMP cross call implementation
2011-05-23 16:53:17 +01:00
tools
ARM: Update mach-types
2011-05-14 21:36:55 +01:00
vfp
ARM: Use struct syscore_ops instead of sysdevs for PM in common code
2011-04-24 19:16:08 +02:00
Kconfig
Merge branches 'devel', 'devel-stable' and 'fixes' into for-linus
2011-05-27 22:59:57 +01:00
Kconfig-nommu
Fix common misspellings
2011-03-31 11:26:23 -03:00
Kconfig.debug
lib: consolidate DEBUG_STACK_USAGE option
2011-05-25 08:39:54 -07:00
Makefile
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
2011-05-25 21:47:48 +01:00